From 029e95312f2597ee15152d6a596103a84d20579d Mon Sep 17 00:00:00 2001 From: Drew Wells Date: Wed, 20 Sep 2023 06:37:27 -0500 Subject: [PATCH 1/2] namespace bindings similar to k8s role aggregation fixes #188 Signed-off-by: Drew Wells --- .../templates/cluster-reconciler-clusterrolebinding.yaml | 4 ++-- .../cluster-reconciler-impersonator-clusterrolebinding.yaml | 2 +- charts/flux2/templates/crd-controller-clusterrolebinding.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml b/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml index b0a9138..c86fb0e 100644 --- a/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml +++ b/charts/flux2/templates/cluster-reconciler-clusterrolebinding.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/part-of: flux helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - name: cluster-reconciler + name: {{ .Release.Namespace }}:flux-cluster-reconciler roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -20,4 +20,4 @@ subjects: - kind: ServiceAccount name: helm-controller namespace: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml b/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml index 9b07043..6499bf5 100644 --- a/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml +++ b/charts/flux2/templates/cluster-reconciler-impersonator-clusterrolebinding.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/part-of: flux helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - name: cluster-reconciler-impersonator + name: {{ .Release.Namespace }}:flux-reconciler-impersonator roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/flux2/templates/crd-controller-clusterrolebinding.yaml b/charts/flux2/templates/crd-controller-clusterrolebinding.yaml index a9c7cbc..be3d400 100644 --- a/charts/flux2/templates/crd-controller-clusterrolebinding.yaml +++ b/charts/flux2/templates/crd-controller-clusterrolebinding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: crd-controller + name: {{ .Release.Namespace }}:flux-crd-controller labels: app.kubernetes.io/instance: {{ .Release.Namespace | quote }} app.kubernetes.io/managed-by: {{ .Release.Service | quote }} From c3f6c1d31685b3a0fd1fe719a6886a448da77b64 Mon Sep 17 00:00:00 2001 From: Drew Wells Date: Wed, 20 Sep 2023 06:39:21 -0500 Subject: [PATCH 2/2] bump chart Signed-off-by: Drew Wells --- charts/flux2/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/flux2/Chart.yaml b/charts/flux2/Chart.yaml index f5d9abe..31b4e6a 100644 --- a/charts/flux2/Chart.yaml +++ b/charts/flux2/Chart.yaml @@ -8,4 +8,4 @@ name: flux2 sources: - https://github.com/fluxcd-community/helm-charts type: application -version: 2.10.1 +version: 2.10.2