Resources StorageNodeSet and DatabaseNodeSet

.github/workflows/check-pr.yml

@@ -1,5 +1,5 @@
 name: check-pr
-on: 
+on:
   pull_request_target:
     branches:
       - 'master'

.github/workflows/upload-artifacts.yml

@@ -7,7 +7,7 @@ on:
     branches:
       - master
 jobs:
-  tag-job: 
+  tag-job:
     runs-on: ubuntu-latest
     outputs:
       tagcreated: ${{steps.tag-step.outputs.tagcreated}}
@@ -60,7 +60,7 @@ jobs:
       env:
         SA_KEYS_FOR_PRIVATE_DOCKER_HELM_AND_PUBLIC_DOCKER: ${{ secrets.SA_KEYS_FOR_PRIVATE_DOCKER_HELM_AND_PUBLIC_DOCKER }}
     - name: parse-version-from-chart
-      run: | 
+      run: |
         VERSION=$(cat ./deploy/ydb-operator/Chart.yaml | sed -n 's/^version: //p')
         echo "VERSION=$VERSION" >> $GITHUB_ENV
     - name: login-to-registries

Makefile

@@ -49,6 +49,8 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	cp config/crd/bases/ydb.tech_storages.yaml deploy/ydb-operator/crds/storage.yaml
 	cp config/crd/bases/ydb.tech_databases.yaml deploy/ydb-operator/crds/database.yaml
+	cp config/crd/bases/ydb.tech_storagenodesets.yaml deploy/ydb-operator/crds/storagenodeset.yaml
+	cp config/crd/bases/ydb.tech_databasenodesets.yaml deploy/ydb-operator/crds/databasenodeset.yaml
 	cp config/crd/bases/ydb.tech_databasemonitorings.yaml deploy/ydb-operator/crds/databasemonitoring.yaml
 	cp config/crd/bases/ydb.tech_storagemonitorings.yaml deploy/ydb-operator/crds/storagemonitoring.yaml
 
@@ -61,13 +63,21 @@ fmt: ## Run go fmt against code.
 vet: ## Run go vet against code.
 	go vet ./...
 
-test: manifests generate fmt vet envtest docker-build ## Run tests.
-	kind create cluster --config e2e/kind-cluster-config.yaml --name kind-ydb-operator
+kind-init:
+	if kind get clusters | grep "kind-ydb-operator"; then exit 0; fi; \
+	kind create cluster --config e2e/kind-cluster-config.yaml --name kind-ydb-operator; \
+	docker pull k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0; \
+	kind load docker-image k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0 --name kind-ydb-operator; \
+	docker pull cr.yandex/crptqonuodf51kdj7a7d/ydb:22.4.44; \
+	kind load docker-image cr.yandex/crptqonuodf51kdj7a7d/ydb:22.4.44 --name kind-ydb-operator
+
+kind-load:
 	docker tag cr.yandex/yc/ydb-operator:latest kind/ydb-operator:current
 	kind load docker-image kind/ydb-operator:current --name kind-ydb-operator
-	docker pull cr.yandex/crptqonuodf51kdj7a7d/ydb:22.4.44
-	kind load docker-image cr.yandex/crptqonuodf51kdj7a7d/ydb:22.4.44 --name kind-ydb-operator
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -timeout 1800s -p 1 ./... -coverprofile cover.out
+
+.PHONY: test
+test: manifests generate fmt vet docker-build kind-init kind-load envtest ## Run tests.
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -timeout 1800s -p 1 ./... -ginkgo.v -coverprofile cover.out
 
 .PHONY: clean
 clean:

api/v1alpha1/common_types.go

@@ -1,5 +1,7 @@
 package v1alpha1
 
+import corev1 "k8s.io/api/core/v1"
+
 // NamespacedRef TODO: replace StorageRef
 type NamespacedRef struct {
 	// +kubebuilder:validation:Pattern:=[a-z0-9]([-a-z0-9]*[a-z0-9])?
@@ -12,3 +14,23 @@ type NamespacedRef struct {
 	// +optional
 	Namespace string `json:"namespace"`
 }
+
+// PodImage represents the image information for a container that is used
+// to build the StatefulSet.
+type PodImage struct {
+	// Container image with supported YDB version.
+	// This defaults to the version pinned to the operator and requires a full container and tag/sha name.
+	// For example: cr.yandex/crptqonuodf51kdj7a7d/ydb:22.2.22
+	// +optional
+	Name string `json:"name,omitempty"`
+
+	// (Optional) PullPolicy for the image, which defaults to IfNotPresent.
+	// Default: IfNotPresent
+	// +optional
+	PullPolicyName *corev1.PullPolicy `json:"pullPolicy,omitempty"`
+
+	// (Optional) Secret name containing the dockerconfig to use for a registry that requires authentication. The secret
+	// must be configured first by the user.
+	// +optional
+	PullSecret *string `json:"pullSecret,omitempty"`
+}

internal/configuration/configuration.go → api/v1alpha1/configuration.go

@@ -1,4 +1,4 @@
-package configuration
+package v1alpha1
 
 import (
 	"crypto/sha256"
@@ -8,7 +8,6 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
 	"github.com/ydb-platform/ydb-kubernetes-operator/internal/configuration/schema"
 )
 
@@ -25,20 +24,20 @@ func hash(text string) string {
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
 
-func generateSomeDefaults(cr *v1alpha1.Storage, crDB *v1alpha1.Database) schema.Configuration {
+func generateSomeDefaults(cr *Storage, crDB *Database) schema.Configuration {
 	var hosts []schema.Host
 
 	for i := 0; i < int(cr.Spec.Nodes); i++ {
 		datacenter := "az-1"
-		if cr.Spec.Erasure == v1alpha1.ErasureMirror3DC {
+		if cr.Spec.Erasure == ErasureMirror3DC {
 			datacenter = fmt.Sprintf("az-%d", i%3)
 		}
 
 		hosts = append(hosts, schema.Host{
 			Host:         fmt.Sprintf("%v-%d", cr.GetName(), i),
 			HostConfigID: 1, // TODO
 			NodeID:       i + 1,
-			Port:         v1alpha1.InterconnectPort,
+			Port:         InterconnectPort,
 			WalleLocation: schema.WalleLocation{
 				Body:       12340 + i,
 				DataCenter: datacenter,
@@ -47,6 +46,17 @@ func generateSomeDefaults(cr *v1alpha1.Storage, crDB *v1alpha1.Database) schema.
 		})
 	}
 
+	if cr.Spec.NodeSets != nil {
+		hostIndex := 0
+		for _, nodeSetSpec := range cr.Spec.NodeSets {
+			for podIndex := 0; podIndex < int(nodeSetSpec.Nodes); podIndex++ {
+				podName := cr.GetName() + "-" + nodeSetSpec.Name + "-" + strconv.Itoa(podIndex)
+				hosts[hostIndex].Host = podName
+				hostIndex++
+			}
+		}
+	}
+
 	var keyConfig *schema.KeyConfig
 	if crDB != nil && crDB.Spec.Encryption != nil && crDB.Spec.Encryption.Enabled {
 		keyConfig = &schema.KeyConfig{
@@ -79,7 +89,7 @@ func tryFillMissingSections(
 	}
 }
 
-func Build(cr *v1alpha1.Storage, crDB *v1alpha1.Database) (map[string]string, error) {
+func buildConfiguration(cr *Storage, crDB *Database) (string, error) {
 	config := make(map[string]interface{})
 
 	// If any kind of configuration exists on Database object, then
@@ -95,20 +105,16 @@ func Build(cr *v1alpha1.Storage, crDB *v1alpha1.Database) (map[string]string, er
 
 	err := yaml.Unmarshal([]byte(rawYamlConfiguration), &config)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
 	generatedConfig := generateSomeDefaults(cr, crDB)
 	tryFillMissingSections(config, generatedConfig)
 
 	data, err := yaml.Marshal(config)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	result := string(data)
-
-	return map[string]string{
-		v1alpha1.ConfigFileName: result,
-	}, nil
+	return string(data), nil
 }

api/v1alpha1/const.go

@@ -6,13 +6,15 @@ const (
 
 	ImagePathFormat = "%s:%s"
 
-	GRPCPort            = 2135
-	GRPCServicePortName = "grpc"
-	GRPCProto           = "grpc://"
-	GRPCSProto          = "grpcs://"
-
-	InterconnectPort            = 19001
-	InterconnectServicePortName = "interconnect"
+	GRPCPort              = 2135
+	GRPCServicePortName   = "grpc"
+	GRPCProto             = "grpc://"
+	GRPCSProto            = "grpcs://"
+	GRPCServiceFQDNFormat = "%s-grpc.%s.svc.cluster.local"
+
+	InterconnectPort              = 19001
+	InterconnectServicePortName   = "interconnect"
+	InterconnectServiceFQDNFormat = "%s-interconnect.%s.svc.cluster.local"
 
 	StatusPort            = 8765
 	StatusServicePortName = "status"