Implement RemoteNodeSet controllers

Makefile

@@ -51,6 +51,8 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	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_remotestoragenodesets.yaml deploy/ydb-operator/crds/remotestoragenodeset.yaml
+	cp config/crd/bases/ydb.tech_remotedatabasenodesets.yaml deploy/ydb-operator/crds/remotedatabasenodeset.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
 
@@ -75,9 +77,14 @@ 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
 
+unit-test: manifests generate fmt vet envtest ## Run unit tests
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -v -timeout 1800s -p 1 ./internal/controllers/... -ginkgo.vv -coverprofile cover.out
+
+e2e-test: docker-build kind-init kind-load ## Run e2e tests
+	go test -v -timeout 1800s -p 1 ./e2e/... -args -ginkgo.vv
+
 .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
+test: unit-test test ## Run all tests
 
 .PHONY: clean
 clean:

api/v1alpha1/common_types.go

@@ -34,3 +34,9 @@ type PodImage struct {
 	// +optional
 	PullSecret *string `json:"pullSecret,omitempty"`
 }
+
+type RemoteSpec struct {
+	// Remote cluster to deploy NodeSet into
+	// +required
+	Cluster string `json:"cluster"`
+}

api/v1alpha1/databasenodeset_types.go

@@ -19,9 +19,8 @@ type DatabaseNodeSetSpec struct {
 
 // DatabaseNodeSetStatus defines the observed state
 type DatabaseNodeSetStatus struct {
-	State                      constants.ClusterState `json:"state"`
-	Conditions                 []metav1.Condition     `json:"conditions,omitempty"`
-	ObservedDatabaseGeneration int64                  `json:"observedDatabaseGeneration,omitempty"`
+	State      constants.ClusterState `json:"state"`
+	Conditions []metav1.Condition     `json:"conditions,omitempty"`
 }
 
 // DatabaseNodeSetSpecInline describes an group nodes object inside parent object
@@ -32,7 +31,7 @@ type DatabaseNodeSetSpecInline struct {
 
 	// (Optional) Object should be reference to remote object
 	// +optional
-	Remote bool `json:"remote,omitempty"`
+	Remote *RemoteSpec `json:"remote,omitempty"`
 
 	DatabaseNodeSpec `json:",inline"`
 }

api/v1alpha1/remotedatabasenodeset_types.go

@@ -0,0 +1,35 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="The status of this RemoteDatabaseNodeSet"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+
+// RemoteDatabaseNodeSet declares NodeSet spec and status for objects in remote cluster
+type RemoteDatabaseNodeSet struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	// +optional
+	Spec DatabaseNodeSetSpec `json:"spec,omitempty"`
+	// +optional
+	// +kubebuilder:default:={state: "Pending"}
+	Status DatabaseNodeSetStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// RemoteDatabaseNodeSetList contains a list of RemoteDatabaseNodeSet
+type RemoteDatabaseNodeSetList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []RemoteDatabaseNodeSet `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&RemoteDatabaseNodeSet{}, &RemoteDatabaseNodeSetList{})
+}

api/v1alpha1/remotestoragenodeset_types.go

@@ -0,0 +1,35 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="The status of this RemoteStorageNodeSet"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+
+// RemoteStorageNodeSet declares NodeSet spec and status for objects in remote cluster
+type RemoteStorageNodeSet struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	// +optional
+	Spec StorageNodeSetSpec `json:"spec,omitempty"`
+	// +optional
+	// +kubebuilder:default:={state: "Pending"}
+	Status StorageNodeSetStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// RemoteStorageNodeSetList contains a list of RemoteStorageNodeSet
+type RemoteStorageNodeSetList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []RemoteStorageNodeSet `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&RemoteStorageNodeSet{}, &RemoteStorageNodeSetList{})
+}

api/v1alpha1/storagenodeset_types.go

@@ -19,9 +19,8 @@ type StorageNodeSetSpec struct {
 
 // StorageNodeSetStatus defines the observed state
 type StorageNodeSetStatus struct {
-	State                     constants.ClusterState `json:"state"`
-	Conditions                []metav1.Condition     `json:"conditions,omitempty"`
-	ObservedStorageGeneration int64                  `json:"observedStorageGeneration,omitempty"`
+	State      constants.ClusterState `json:"state"`
+	Conditions []metav1.Condition     `json:"conditions,omitempty"`
 }
 
 // StorageNodeSetSpecInline describes an group nodes object inside parent object
@@ -32,7 +31,7 @@ type StorageNodeSetSpecInline struct {
 
 	// (Optional) Object should be reference to remote object
 	// +optional
-	Remote bool `json:"remote,omitempty"`
+	Remote *RemoteSpec `json:"remote,omitempty"`
 
 	StorageNodeSpec `json:",inline"`
 }