issue-607, crud of opensearch and redis users were moved to reconcile

instaclustr · Nov 15, 2023 · a4fd7f4 · a4fd7f4
1 parent 3357738
commit a4fd7f4
Show file tree

Hide file tree

Showing 12 changed files with 184 additions and 503 deletions.
diff --git a/apis/clusterresources/v1beta1/opensearchuser_types.go b/apis/clusterresources/v1beta1/opensearchuser_types.go
@@ -73,6 +73,14 @@ func (u *OpenSearchUser) GetDeletionFinalizer() string {
 	return models.DeletionFinalizer + "_" + u.Namespace + "_" + u.Name
 }
 
+func (u *OpenSearchUser) GetClusterEvents() map[string]string {
+	return u.Status.ClustersEvents
+}
+
+func (u *OpenSearchUser) SetClusterEvents(events map[string]string) {
+	u.Status.ClustersEvents = events
+}
+
 func init() {
 	SchemeBuilder.Register(&OpenSearchUser{}, &OpenSearchUserList{})
 }
diff --git a/apis/clusterresources/v1beta1/redisuser_types.go b/apis/clusterresources/v1beta1/redisuser_types.go
@@ -81,6 +81,14 @@ func (r *RedisUser) NewPatch() client.Patch {
 	return client.MergeFrom(old)
 }
 
+func (r *RedisUser) GetClusterEvents() map[string]string {
+	return r.Status.ClustersEvents
+}
+
+func (r *RedisUser) SetClusterEvents(events map[string]string) {
+	r.Status.ClustersEvents = events
+}
+
 func init() {
 	SchemeBuilder.Register(&RedisUser{}, &RedisUserList{})
 }
diff --git a/apis/clusters/v1beta1/opensearch_types.go b/apis/clusters/v1beta1/opensearch_types.go
@@ -53,7 +53,7 @@ type OpenSearchSpec struct {
 	IndexManagementPlugin    bool                    `json:"indexManagementPlugin,omitempty"`
 	AlertingPlugin           bool                    `json:"alertingPlugin,omitempty"`
 	BundledUseOnly           bool                    `json:"bundledUseOnly,omitempty"`
-	UserRefs                 []*Reference            `json:"userRefs,omitempty"`
+	UserRefs                 References              `json:"userRefs,omitempty"`
 	//+kubuilder:validation:MaxItems:=1
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 	//+kubuilder:validation:MaxItems:=1
@@ -531,7 +531,8 @@ type OpenSearchRestoreFrom struct {
 
 // OpenSearchStatus defines the observed state of OpenSearch
 type OpenSearchStatus struct {
-	ClusterStatus `json:",inline"`
+	ClusterStatus  `json:",inline"`
+	AvailableUsers References `json:"availableUsers,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -607,6 +608,30 @@ func (oss *OpenSearchSpec) validateResizeSettings(nodesNumber int) error {
 	return nil
 }
 
+func (oss *OpenSearch) GetUserRefs() References {
+	return oss.Spec.UserRefs
+}
+
+func (oss *OpenSearch) SetUserRefs(refs References) {
+	oss.Spec.UserRefs = refs
+}
+
+func (oss *OpenSearch) GetAvailableUsers() References {
+	return oss.Status.AvailableUsers
+}
+
+func (oss *OpenSearch) SetAvailableUsers(users References) {
+	oss.Status.AvailableUsers = users
+}
+
+func (oss *OpenSearch) GetClusterID() string {
+	return oss.Status.ID
+}
+
+func (oss *OpenSearch) SetClusterID(id string) {
+	oss.Status.ID = id
+}
+
 func init() {
 	SchemeBuilder.Register(&OpenSearch{}, &OpenSearchList{})
 }
diff --git a/apis/clusters/v1beta1/redis_types.go b/apis/clusters/v1beta1/redis_types.go
@@ -69,14 +69,15 @@ type RedisSpec struct {
 	//+kubebuilder:validation:MaxItems:=2
 	DataCentres []*RedisDataCentre `json:"dataCentres,omitempty"`
 
-	UserRefs []*Reference `json:"userRefs,omitempty"`
+	UserRefs References `json:"userRefs,omitempty"`
 	//+kubebuilder:validation:MaxItems:=1
 	ResizeSettings []*ResizeSettings `json:"resizeSettings,omitempty"`
 }
 
 // RedisStatus defines the observed state of Redis
 type RedisStatus struct {
-	ClusterStatus `json:",inline"`
+	ClusterStatus  `json:",inline"`
+	AvailableUsers References `json:"availableUsers,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -297,7 +298,7 @@ func (rs *RedisSpec) DCsFromInstAPI(iDCs []*models.RedisDataCentre) (dcs []*Redi
 
 func (rs *RedisStatus) FromInstAPI(iRedis *models.RedisCluster) RedisStatus {
 	return RedisStatus{
-		ClusterStatus{
+		ClusterStatus: ClusterStatus{
 			ID:                            iRedis.ID,
 			State:                         iRedis.Status,
 			DataCentres:                   rs.DCsFromInstAPI(iRedis.DataCentres),
@@ -464,6 +465,30 @@ func (rs *RedisSpec) ValidatePrivateLink() error {
 	return nil
 }
 
+func (r *Redis) GetUserRefs() References {
+	return r.Spec.UserRefs
+}
+
+func (r *Redis) SetUserRefs(refs References) {
+	r.Spec.UserRefs = refs
+}
+
+func (r *Redis) GetAvailableUsers() References {
+	return r.Status.AvailableUsers
+}
+
+func (r *Redis) SetAvailableUsers(users References) {
+	r.Status.AvailableUsers = users
+}
+
+func (r *Redis) GetClusterID() string {
+	return r.Status.ID
+}
+
+func (r *Redis) SetClusterID(id string) {
+	r.Status.ID = id
+}
+
 func init() {
 	SchemeBuilder.Register(&Redis{}, &RedisList{})
 }
diff --git a/apis/clusters/v1beta1/zz_generated.deepcopy.go b/apis/clusters/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/clusters.instaclustr.com_opensearches.yaml b/config/crd/bases/clusters.instaclustr.com_opensearches.yaml
@@ -266,6 +266,18 @@ spec:
           status:
             description: OpenSearchStatus defines the observed state of OpenSearch
             properties:
+              availableUsers:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                type: array
               cdcid:
                 type: string
               currentClusterOperationStatus:

diff --git a/config/crd/bases/clusters.instaclustr.com_redis.yaml b/config/crd/bases/clusters.instaclustr.com_redis.yaml
@@ -218,6 +218,18 @@ spec:
           status:
             description: RedisStatus defines the observed state of Redis
             properties:
+              availableUsers:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                type: array
               cdcid:
                 type: string
               currentClusterOperationStatus:

diff --git a/config/samples/clusters_v1beta1_opensearch.yaml b/config/samples/clusters_v1beta1_opensearch.yaml
@@ -22,18 +22,18 @@ spec:
 #      namespace: "default"
   clusterManagerNodes:
     - dedicatedManager: false
-      nodeSize: SRH-DEV-t4g.small-30
+      nodeSize: SRH-DEV-t4g.small-5
   dataCentres:
     - cloudProvider: AWS_VPC
       name: AWS_VPC_US_EAST_1
       network: 10.0.0.0/16
       replicationFactor: 3
       privateLink: false
       region: US_EAST_1
-  ingestNodes:
-#    - nodeSize: SRH-DI-PRD-m6g.large-10
-    - nodeSize: SRH-DI-PRD-m6g.xlarge-10
-      nodeCount: 3
+#  ingestNodes:
+##   - nodeSize: SRH-DI-PRD-m6g.large-10
+#    - nodeSize: SRH-DI-PRD-m6g.xlarge-10
+#      nodeCount: 3
   #  dataNodes:
   #    - nodeNumber: 3
   #      nodeSize: SRH-DEV-t4g.small-5

diff --git a/config/samples/clusters_v1beta1_redis.yaml b/config/samples/clusters_v1beta1_redis.yaml
@@ -16,12 +16,12 @@ spec:
   passwordAndUserAuth: true
   privateNetworkCluster: false
   userRefs:
-#      - name: redisuser-sample-1
-#        namespace: default
-#      - name: redisuser-sample-2
-#        namespace: default
-#      - name: redisuser-sample-3
-#        namespace: default
+      - name: redisuser-sample-1
+        namespace: default
+      - name: redisuser-sample-2
+        namespace: default
+      - name: redisuser-sample-3
+        namespace: default
   #  twoFactorDelete:
   #    - email: "[email protected]"
   dataCentres: