Merge pull request #28 from unai-ttxu/task/fix_capsule

Fix add option to exclude groups from capsule
Stratio · Oct 30, 2023 · 6f4fb2d · 6f4fb2d
2 parents e8223de + 3b194da
commit 6f4fb2d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/charts/capsule/crds/capsuleconfiguration-crd.yaml b/charts/capsule/crds/capsuleconfiguration-crd.yaml
@@ -43,11 +43,6 @@ spec:
             spec:
               description: CapsuleConfigurationSpec defines the Capsule configuration.
               properties:
-                excludeUserGroups:
-                  description: Names of the groups for Capsule users.
-                  items:
-                    type: string
-                  type: array
                 forceTenantPrefix:
                   default: false
                   description: Enforces the Tenant owner, during Namespace creation, to name it using the selected Tenant name as prefix, separated by a dash. This is useful to avoid Namespace name collision in a public CaaS environment.
@@ -62,6 +57,11 @@ spec:
                   items:
                     type: string
                   type: array
+                excludeUserGroups:
+                  description: Names of the groups for Capsule users to exclude.
+                  items:
+                    type: string
+                  type: array
               type: object
           type: object
       served: true
@@ -151,6 +151,11 @@ spec:
                   items:
                     type: string
                   type: array
+                excludeUserGroups:
+                  description: Names of the groups for Capsule users to exclude.
+                  items:
+                    type: string
+                  type: array
               required:
                 - enableTLSReconciler
               type: object

diff --git a/config/crd/bases/capsule.clastix.io_capsuleconfigurations.yaml b/config/crd/bases/capsule.clastix.io_capsuleconfigurations.yaml
@@ -36,11 +36,6 @@ spec:
           spec:
             description: CapsuleConfigurationSpec defines the Capsule configuration.
             properties:
-              excludeUserGroups:
-                description: Names of the groups for Capsule users.
-                items:
-                  type: string
-                type: array
               forceTenantPrefix:
                 default: false
                 description: Enforces the Tenant owner, during Namespace creation,
@@ -59,6 +54,11 @@ spec:
                 items:
                   type: string
                 type: array
+              excludeUserGroups:
+                description: Names of the groups for Capsule users to exclude.
+                items:
+                  type: string
+                type: array
             type: object
         type: object
     served: true
@@ -171,6 +171,11 @@ spec:
                 items:
                   type: string
                 type: array
+              excludeUserGroups:
+                description: Names of the groups for Capsule users to exclude.
+                items:
+                  type: string
+                type: array
             required:
             - enableTLSReconciler
             type: object