From 5f17755ffe08bfa085e25b11b51ec9fb12e40e7c Mon Sep 17 00:00:00 2001 From: hussnain612 Date: Wed, 14 Dec 2022 15:56:01 +0500 Subject: [PATCH] Updated charts --- charts/konfigurator/templates/clusterrole.yaml | 2 +- charts/konfigurator/templates/clusterrolebinding.yaml | 6 +++--- charts/konfigurator/templates/operator.yaml | 2 +- charts/konfigurator/templates/role.yaml | 1 + charts/konfigurator/templates/rolebinding.yaml | 3 ++- charts/konfigurator/templates/serviceaccount.yaml | 1 + charts/konfigurator/values.yaml | 2 ++ 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/charts/konfigurator/templates/clusterrole.yaml b/charts/konfigurator/templates/clusterrole.yaml index 3a35af7..7071599 100644 --- a/charts/konfigurator/templates/clusterrole.yaml +++ b/charts/konfigurator/templates/clusterrole.yaml @@ -5,7 +5,7 @@ metadata: labels: {{- include "konfigurator.labels.stakater" . | nindent 4 }} {{- include "konfigurator.labels.chart" . | nindent 4 }} - name: {{ template "konfigurator.name" . }}-{{ .Release.Namespace }}-cluster-role + name: {{ template "konfigurator.name" . }}-{{ .Values.namespace | default .Release.Namespace }}-cluster-role rules: - apiGroups: - coordination.k8s.io diff --git a/charts/konfigurator/templates/clusterrolebinding.yaml b/charts/konfigurator/templates/clusterrolebinding.yaml index e262ef1..109eed0 100644 --- a/charts/konfigurator/templates/clusterrolebinding.yaml +++ b/charts/konfigurator/templates/clusterrolebinding.yaml @@ -5,12 +5,12 @@ metadata: labels: {{- include "konfigurator.labels.stakater" . | nindent 4 }} {{- include "konfigurator.labels.chart" . | nindent 4 }} - name: {{ template "konfigurator.name" . }}-{{ .Release.Namespace }}-cluster-role-binding + name: {{ template "konfigurator.name" . }}-{{ .Values.namespace | default .Release.Namespace }}-cluster-role-binding subjects: - kind: ServiceAccount name: {{ template "konfigurator.name" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ .Values.namespace | default .Release.Namespace }} roleRef: kind: ClusterRole - name: {{ template "konfigurator.name" . }}-{{ .Release.Namespace }}-cluster-role + name: {{ template "konfigurator.name" . }}-{{ .Values.namespace | default .Release.Namespace }}-cluster-role apiGroup: rbac.authorization.k8s.io diff --git a/charts/konfigurator/templates/operator.yaml b/charts/konfigurator/templates/operator.yaml index 96529db..ecd4b4e 100644 --- a/charts/konfigurator/templates/operator.yaml +++ b/charts/konfigurator/templates/operator.yaml @@ -5,7 +5,7 @@ metadata: {{- include "konfigurator.labels.stakater" . | nindent 4 }} {{- include "konfigurator.labels.chart" . | nindent 4 }} name: {{ template "konfigurator.name" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ .Values.namespace | default .Release.Namespace }} spec: replicas: {{ .Values.replicaCount }} selector: diff --git a/charts/konfigurator/templates/role.yaml b/charts/konfigurator/templates/role.yaml index d289e2d..5bf698d 100644 --- a/charts/konfigurator/templates/role.yaml +++ b/charts/konfigurator/templates/role.yaml @@ -6,6 +6,7 @@ metadata: {{- include "konfigurator.labels.stakater" . | nindent 4 }} {{- include "konfigurator.labels.chart" . | nindent 4 }} name: {{ template "konfigurator.name" . }}-role + namespace: {{ .Values.namespace | default .Release.Namespace }} rules: - apiGroups: - konfigurator.stakater.com diff --git a/charts/konfigurator/templates/rolebinding.yaml b/charts/konfigurator/templates/rolebinding.yaml index 6d3a13f..57a068d 100644 --- a/charts/konfigurator/templates/rolebinding.yaml +++ b/charts/konfigurator/templates/rolebinding.yaml @@ -6,10 +6,11 @@ metadata: {{- include "konfigurator.labels.stakater" . | nindent 4 }} {{- include "konfigurator.labels.chart" . | nindent 4 }} name: {{ template "konfigurator.name" . }}-role-binding + namespace: {{ .Values.namespace | default .Release.Namespace }} subjects: - kind: ServiceAccount name: {{ template "konfigurator.name" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ .Values.namespace | default .Release.Namespace }} roleRef: kind: Role name: {{ template "konfigurator.name" . }}-role diff --git a/charts/konfigurator/templates/serviceaccount.yaml b/charts/konfigurator/templates/serviceaccount.yaml index 0d32e36..3d511c0 100644 --- a/charts/konfigurator/templates/serviceaccount.yaml +++ b/charts/konfigurator/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "konfigurator.name" . }} + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: {{- include "konfigurator.labels.stakater" . | nindent 4 }} {{- include "konfigurator.labels.chart" . | nindent 4 }} diff --git a/charts/konfigurator/values.yaml b/charts/konfigurator/values.yaml index a3bfcd4..03e3e5d 100644 --- a/charts/konfigurator/values.yaml +++ b/charts/konfigurator/values.yaml @@ -1,5 +1,7 @@ deployCRD: false +namespace: dsadakdaskjhdkjashdh + labels: provider: stakater group: com.stakater.platform