issue-439, added support for batch of users for opensearch

instaclustr · Jul 14, 2023 · bde8496 · bde8496
1 parent 7de1b3d
commit bde8496
Show file tree

Hide file tree

Showing 13 changed files with 462 additions and 215 deletions.
diff --git a/apis/clusterresources/v1beta1/opensearchuser_types.go b/apis/clusterresources/v1beta1/opensearchuser_types.go
@@ -30,8 +30,7 @@ type OpenSearchUserSpec struct {
 
 // OpenSearchUserStatus defines the observed state of OpenSearchUser
 type OpenSearchUserStatus struct {
-	State     string `json:"state"`
-	ClusterID string `json:"clusterId"`
+	ClustersEvents map[string]string `json:"clustersEvents,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -70,6 +69,10 @@ func (u *OpenSearchUser) NewPatch() client.Patch {
 	return client.MergeFrom(old)
 }
 
+func (u *OpenSearchUser) GetDeletionFinalizer() string {
+	return models.DeletionFinalizer + "_" + u.Namespace + "_" + u.Name
+}
+
 func init() {
 	SchemeBuilder.Register(&OpenSearchUser{}, &OpenSearchUserList{})
 }
diff --git a/apis/clusterresources/v1beta1/zz_generated.deepcopy.go b/apis/clusterresources/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/clusters/v1beta1/opensearch_types.go b/apis/clusters/v1beta1/opensearch_types.go
@@ -52,7 +52,7 @@ type OpenSearchSpec struct {
 	IndexManagementPlugin    bool                    `json:"indexManagementPlugin,omitempty"`
 	AlertingPlugin           bool                    `json:"alertingPlugin,omitempty"`
 	BundledUseOnly           bool                    `json:"bundleUseOnly,omitempty"`
-	UserRef                  *UserReference          `json:"userRef,omitempty"`
+	UserRefs                 []*UserReference        `json:"userRefs,omitempty"`
 }
 
 type OpenSearchDataCentre struct {

diff --git a/apis/clusters/v1beta1/zz_generated.deepcopy.go b/apis/clusters/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/clusterresources.instaclustr.com_opensearchusers.yaml b/config/crd/bases/clusterresources.instaclustr.com_opensearchusers.yaml
@@ -51,13 +51,10 @@ spec:
           status:
             description: OpenSearchUserStatus defines the observed state of OpenSearchUser
             properties:
-              clusterId:
-                type: string
-              state:
-                type: string
-            required:
-            - clusterId
-            - state
+              clustersEvents:
+                additionalProperties:
+                  type: string
+                type: object
             type: object
         type: object
     served: true

diff --git a/config/crd/bases/clusters.instaclustr.com_opensearches.yaml b/config/crd/bases/clusters.instaclustr.com_opensearches.yaml
@@ -212,16 +212,18 @@ spec:
                   - email
                   type: object
                 type: array
-              userRef:
-                properties:
-                  name:
-                    type: string
-                  namespace:
-                    type: string
-                required:
-                - name
-                - namespace
-                type: object
+              userRefs:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                  - name
+                  - namespace
+                  type: object
+                type: array
               version:
                 type: string
             required:

diff --git a/config/crd/bases/clusters.instaclustr.com_redis.yaml b/config/crd/bases/clusters.instaclustr.com_redis.yaml
@@ -155,7 +155,7 @@ spec:
                   - email
                   type: object
                 type: array
-              userRef:
+              userRefs:
                 items:
                   properties:
                     name:

diff --git a/config/samples/clusterresources_v1beta1_opensearchuser.yaml b/config/samples/clusterresources_v1beta1_opensearchuser.yaml
@@ -13,4 +13,21 @@ metadata:
 spec:
   secretRef:
     name: "test-secret-1"
-    namespace: "default"
+    namespace: "default"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-secret-2
+data:
+  username: dGVzdC11c2VyLTIK # test-user-2
+  password: VGVzdFBhc3MxMjMhCg== # TestPass123!
+---
+apiVersion: clusterresources.instaclustr.com/v1beta1
+kind: OpenSearchUser
+metadata:
+  name: test-user-2
+spec:
+  secretRef:
+    name: "test-secret-2"
+    namespace: "default"
diff --git a/config/samples/clusters_v1beta1_opensearch.yaml b/config/samples/clusters_v1beta1_opensearch.yaml
@@ -14,9 +14,11 @@ spec:
   alertingPlugin: false
   anomalyDetectionPlugin: false
   asynchronousSearchPlugin: false
-#  userRef:
-#    name: "test-user-1"
-#    namespace: "default"
+#  userRefs:
+#    - name: "test-user-1"
+#      namespace: "default"
+#    - name: "test-user-2"
+#      namespace: "default"
   clusterManagerNodes:
     - dedicatedManager: false
       nodeSize: SRH-DEV-t4g.small-5
@@ -34,7 +36,7 @@ spec:
   indexManagementPlugin: true
   knnPlugin: false
   loadBalancer: false
-  name: bohdan-test
+  name: OpenSearch-example
   notificationsPlugin: false
   #  opensearchDashboards:
   #    - nodeSize: SRH-DEV-t4g.small-5

diff --git a/controllers/clusterresources/helpers.go b/controllers/clusterresources/helpers.go
@@ -75,3 +75,7 @@ func getUserCreds(secret *k8sCore.Secret) (username, password string, err error)
 
 	return username[:len(username)-1], password[:len(password)-1], nil
 }
+
+func getDeletionUserFinalizer(clusterID string) string {
+	return models.DeletionUserFinalizer + clusterID
+}