Merge pull request #10 from appuio/used-forked-groupsync

Use forked operator with subgroup support
appuio · Nov 4, 2021 · ba58ea8 · ba58ea8
2 parents c3499a2 + 3f0d9f1
commit ba58ea8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -5,11 +5,11 @@ parameters:
     images:
       operator:
         registry: quay.io
-        repository: redhat-cop/group-sync-operator
-        tag: v0.0.14
+        repository: appuio/group-sync-operator
+        tag: v0.1.0
 
     manifest_version: ${group_sync_operator:images:operator:tag}
-    manifest_url: https://raw.githubusercontent.com/redhat-cop/group-sync-operator/${group_sync_operator:manifest_version}/config
+    manifest_url: https://raw.githubusercontent.com/appuio/group-sync-operator/${group_sync_operator:manifest_version}/config
 
     sync: {}
     secrets: {}
diff --git a/...aults/group-sync-operator/group-sync-operator/00_crds/redhatcop.redhat.io_groupsyncs.yaml b/...aults/group-sync-operator/group-sync-operator/00_crds/redhatcop.redhat.io_groupsyncs.yaml
@@ -245,6 +245,15 @@ spec:
                               - one
                               - sub
                             type: string
+                          subGroupJoinSeparator:
+                            description: SubGroupJoinSeparator represents the separator to join group names if subGroupProcessing is set to join
+                            type: string
+                          subGroupProcessing:
+                            description: SubGroupProcessing controls how sub groups are processed. Flat flattens the groups and is the default. Groups "hidden-fox" with child "staff" and "purple-bat" with child "staff" become "hidden-fox", "purple-bat", "staff". Join joins the group names with a configurable separator. Groups "hidden-fox" with child "staff" and "purple-bat" with child "staff" become "hidden-fox", "hidden-fox/staff", "purple-bat", "purple-bat/staff".
+                            enum:
+                              - flat
+                              - join
+                            type: string
                           url:
                             description: URL is the location of the Keycloak server
                             type: string

diff --git a/.../group-sync-operator/group-sync-operator/20_deployment_group-sync-controller-manager.yaml b/.../group-sync-operator/group-sync-operator/20_deployment_group-sync-controller-manager.yaml
@@ -27,7 +27,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/redhat-cop/group-sync-operator:v0.0.14
+          image: quay.io/appuio/group-sync-operator:v0.1.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/...empty/group-sync-operator/group-sync-operator/00_crds/redhatcop.redhat.io_groupsyncs.yaml b/...empty/group-sync-operator/group-sync-operator/00_crds/redhatcop.redhat.io_groupsyncs.yaml
@@ -245,6 +245,15 @@ spec:
                               - one
                               - sub
                             type: string
+                          subGroupJoinSeparator:
+                            description: SubGroupJoinSeparator represents the separator to join group names if subGroupProcessing is set to join
+                            type: string
+                          subGroupProcessing:
+                            description: SubGroupProcessing controls how sub groups are processed. Flat flattens the groups and is the default. Groups "hidden-fox" with child "staff" and "purple-bat" with child "staff" become "hidden-fox", "purple-bat", "staff". Join joins the group names with a configurable separator. Groups "hidden-fox" with child "staff" and "purple-bat" with child "staff" become "hidden-fox", "hidden-fox/staff", "purple-bat", "purple-bat/staff".
+                            enum:
+                              - flat
+                              - join
+                            type: string
                           url:
                             description: URL is the location of the Keycloak server
                             type: string

diff --git a/.../group-sync-operator/group-sync-operator/20_deployment_group-sync-controller-manager.yaml b/.../group-sync-operator/group-sync-operator/20_deployment_group-sync-controller-manager.yaml
@@ -27,7 +27,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/redhat-cop/group-sync-operator:v0.0.14
+          image: quay.io/appuio/group-sync-operator:v0.1.0
           livenessProbe:
             httpGet:
               path: /healthz