Merge pull request #212 from petrepopescu21/feature/rbac-role-in-values

Make cluster role name configurable

charts/flux2/Chart.yaml

@@ -8,4 +8,4 @@ name: flux2
 sources:
 - https://github.com/fluxcd-community/helm-charts
 type: application
-version: 2.12.3
+version: 2.12.4

charts/flux2/README.md

@@ -1,6 +1,6 @@
 # flux2
 
-![Version: 2.12.3](https://img.shields.io/badge/Version-2.12.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
+![Version: 2.12.4](https://img.shields.io/badge/Version-2.12.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
 
 A Helm chart for flux2
 

charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml

@@ -15,7 +15,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: cluster-admin
+  name: {{ .Values.rbac.roleRef.name }}
 subjects:
 - kind: ServiceAccount
   name: kustomize-controller

charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
         control-plane: controller
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
         labeltestkey: labeltestvalue
         labeltestkey2: labeltestvalue2
       name: helm-controller

charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
         control-plane: controller
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
       name: image-automation-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
         control-plane: controller
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
       name: image-reflector-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
       name: test1
       namespace: NAMESPACE
     type: Opaque

charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
         control-plane: controller
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
       name: kustomize-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
         control-plane: controller
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
       name: notification-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap

@@ -12,7 +12,7 @@ should match snapshot of default values:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
       name: RELEASE-NAME-flux-check
     spec:
       backoffLimit: 1
@@ -23,7 +23,7 @@ should match snapshot of default values:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/part-of: flux
             app.kubernetes.io/version: 2.2.3
-            helm.sh/chart: flux2-2.12.3
+            helm.sh/chart: flux2-2.12.4
           name: RELEASE-NAME
         spec:
           automountServiceAccountToken: true

charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.2.3
         control-plane: controller
-        helm.sh/chart: flux2-2.12.3
+        helm.sh/chart: flux2-2.12.4
       name: source-controller
     spec:
       replicas: 1

charts/flux2/tests/cluster-reconciler-clusterrolebinding_test.yaml

@@ -37,4 +37,11 @@ tests:
       - equal:
           path: metadata.annotations
           value:
-            helm.sh/resource-policy: keep
+            helm.sh/resource-policy: keep
+  - it: should set clusterrole name
+    set:
+      rbac.roleRef.name: test-clusterrole
+    asserts:
+      - equal:
+          path: roleRef.name
+          value: test-clusterrole

charts/flux2/values.yaml

@@ -278,6 +278,8 @@ rbac:
   createAggregation: true
   # -- Add annotations to all RBAC resources, e.g. "helm.sh/resource-policy": keep
   annotations: {}
+  roleRef:
+    name: cluster-admin
 
 logLevel: info
 watchAllNamespaces: true