[greenhouse-ccloud] switch teamrolebinding to clusterSelector (#7047)

* [greenhouse-ccloud] switch teamrolebinding to clusterSelector * Update system/greenhouse-ccloud/templates/team-rolebindings.yaml Co-authored-by: IvoGoman <[email protected]> --------- Co-authored-by: IvoGoman <[email protected]>
sapcc · Sep 16, 2024 · 3b2291a · 3b2291a
1 parent 672c0e8
commit 3b2291a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/system/greenhouse-ccloud/Chart.yaml b/system/greenhouse-ccloud/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: ccloud
 description: A Helm chart for the CCloud organization in Greenhouse.
 type: application
-version: 1.4.4
+version: 1.4.5
diff --git a/system/greenhouse-ccloud/ci/test-values.yaml b/system/greenhouse-ccloud/ci/test-values.yaml
@@ -16,9 +16,10 @@ teams:
 teamRoleBindings:
   - teamRef: team1
     teamRoleRef: role1
-    clusterNames:
-      - cluster1
-      - cluster2
+    clusterSelector:
+      matchLabels:
+        cluster-type: compute
+        environment: production
 
 oidc:
   issuer: https://top.secret
@@ -52,7 +53,7 @@ kubeconfigGenerator:
     clientSecret: "TopSecret!"
   swift:
     username: "technical-user"
-    domainName: "my-domain"
+    domain: "my-domain"
     projectID: "1234-project-id"
     container: "container-one"
     region: "testing"

diff --git a/system/greenhouse-ccloud/templates/team-rolebindings.yaml b/system/greenhouse-ccloud/templates/team-rolebindings.yaml
@@ -1,19 +1,18 @@
 {{ $chartName := .Chart.Name }}
 {{ range $roleBinding := .Values.teamRoleBindings }}
-{{- if and $roleBinding.teamRef $roleBinding.teamRoleRef $roleBinding.clusterNames }}
-{{- range $clusterName := $roleBinding.clusterNames }}
+{{- if and $roleBinding.teamRef $roleBinding.teamRoleRef $roleBinding.clusterSelector }}
 ---
 apiVersion: greenhouse.sap/v1alpha1
 kind: TeamRoleBinding
 metadata:
-  name: {{ printf "%s-%s-%s" $roleBinding.teamRef $roleBinding.teamRoleRef $clusterName | trunc 63 | trimSuffix "-" }}
+  name: {{ printf "%s-%s" $roleBinding.teamRef $roleBinding.teamRoleRef | trunc 63 | trimSuffix "-" }}
   namespace: {{ $chartName }}
 spec:
   teamRef: {{ $roleBinding.teamRef }}
   teamRoleRef: {{ $roleBinding.teamRoleRef }}
-  clusterName: {{ $clusterName }}
+  clusterSelector:
+    {{- $roleBinding.clusterSelector | toYaml | nindent 4 }}
 {{- end }}
 {{- else }}
 {{- printf "Error: Missing teamRef, teamRoleRef, or clusterName in teamRoleBinding: %#v" $roleBinding | fail }}
 {{- end }}
-{{- end }}
diff --git a/system/greenhouse-ccloud/values.yaml b/system/greenhouse-ccloud/values.yaml
@@ -15,8 +15,10 @@ teams: {}
 teamRoleBindings: []
   # - teamRef: team1
   #   teamRoleRef: role1
-  #   clusterNames:
-  #     - cluster1
+  #   clusterSelector
+  #     matchLabels:
+  #       cluster-type: compute
+  #       environment: production
 
 oidc:
   issuer: