Include optional namespace in keycloak-operator templates

adfinis · Jun 14, 2024 · d5737e6 · d5737e6
1 parent 9bc692d
commit d5737e6
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 78 deletions.
diff --git a/README.md b/README.md
diff --git a/charts/keycloak-operator/Chart.yaml b/charts/keycloak-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: keycloak-operator
 description: Deploy Keycloak Operator and Keycloak
 type: application
-version: 1.2.0
+version: 1.3.0
 appVersion: "24.0.4"
 icon: https://www.keycloak.org/resources/images/logo-stacked.svg
 home: https://www.keycloak.org
@@ -16,7 +16,7 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: "New feature: disable Operator templates generation"
+      description: "New feature: customise namespace"
       links:
-        - name: "Issue 1270"
-          url: https://github.com/adfinis/helm-charts/issues/1270
+        - name: "Issue 1273"
+          url: https://github.com/adfinis/helm-charts/issues/1273
diff --git a/charts/keycloak-operator/README.md b/charts/keycloak-operator/README.md
diff --git a/charts/keycloak-operator/templates/keycloak/keycloak.yaml b/charts/keycloak-operator/templates/keycloak/keycloak.yaml
@@ -3,6 +3,9 @@ apiVersion: k8s.keycloak.org/v2alpha1
 kind: Keycloak
 metadata:
   name: {{ default (include "keycloak-operator.fullname" .) .Values.keycloak.name }}
+  {{- with .Values.keycloak.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.labels" . | nindent 4 }}
     app.kubernetes.io/component: keycloak

diff --git a/charts/keycloak-operator/templates/keycloak/keycloakrealmimport.yaml b/charts/keycloak-operator/templates/keycloak/keycloakrealmimport.yaml
@@ -7,6 +7,9 @@ apiVersion: k8s.keycloak.org/v2alpha1
 kind: KeycloakRealmImport
 metadata:
   name: {{ $fullname }}-{{ .realm }}
+  {{- with .Values.keycloak.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- $labels | nindent 4 }}
 spec:

diff --git a/charts/keycloak-operator/templates/operator/clusterrole.yaml b/charts/keycloak-operator/templates/operator/clusterrole.yaml
@@ -3,6 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: keycloakcontroller-cluster-role
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 rules:
@@ -25,6 +28,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: keycloakrealmimportcontroller-cluster-role
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 rules:

diff --git a/charts/keycloak-operator/templates/operator/deployment.yaml b/charts/keycloak-operator/templates/operator/deployment.yaml
@@ -3,6 +3,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "keycloak-operator.operator.fullname" . }}
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 spec:

diff --git a/charts/keycloak-operator/templates/operator/rolebinding.yaml b/charts/keycloak-operator/templates/operator/rolebinding.yaml
@@ -3,6 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: keycloak-operator-role-binding
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 roleRef:
@@ -17,6 +20,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: keycloak-operator-view
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 roleRef:
@@ -31,6 +37,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: keycloakcontroller-role-binding
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 roleRef:
@@ -45,6 +54,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: keycloakrealmimportcontroller-role-binding
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 roleRef:

diff --git a/charts/keycloak-operator/templates/operator/roles.yaml b/charts/keycloak-operator/templates/operator/roles.yaml
@@ -4,6 +4,9 @@ kind: Role
 metadata:
   # TODO: figure out how to replace rolename with {{ include "keycloak-operator.operator.fullname" . }}
   name: keycloak-operator-role
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 rules:

diff --git a/charts/keycloak-operator/templates/operator/service.yaml b/charts/keycloak-operator/templates/operator/service.yaml
@@ -4,6 +4,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name:  {{ include "keycloak-operator.operator.fullname" . }}
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
 spec:

diff --git a/charts/keycloak-operator/templates/operator/serviceaccount.yaml b/charts/keycloak-operator/templates/operator/serviceaccount.yaml
@@ -4,6 +4,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "keycloak-operator.operator.serviceAccountName" . }}
+  {{- with .Values.operator.namespace }}
+  namespace: {{ . }}
+  {{- end }}
   labels:
     {{- include "keycloak-operator.operator.labels" . | nindent 4 }}
   {{- with .Values.operator.serviceAccount.annotations }}

diff --git a/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap b/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap
@@ -9,7 +9,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: keycloakcontroller-cluster-role
     rules:
       - apiGroups:
@@ -36,7 +36,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: keycloakrealmimportcontroller-cluster-role
     rules:
       - apiGroups:
@@ -63,7 +63,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: RELEASE-NAME-keycloak-operator-operator
     spec:
       replicas: 1
@@ -128,7 +128,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: keycloak-operator-role-binding
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -147,7 +147,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: keycloak-operator-view
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -166,7 +166,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: keycloakcontroller-role-binding
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -185,7 +185,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: keycloakrealmimportcontroller-role-binding
     roleRef:
       apiGroup: rbac.authorization.k8s.io
@@ -204,7 +204,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: keycloak-operator-role
     rules:
       - apiGroups:
@@ -267,7 +267,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: RELEASE-NAME-keycloak-operator-operator
     spec:
       ports:
@@ -290,5 +290,5 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: keycloak-operator
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: RELEASE-NAME-keycloak-operator
diff --git a/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap b/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap
@@ -35,7 +35,7 @@ should match snapshot:
       labels:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/version: 24.0.4
-        helm.sh/chart: keycloak-operator-1.2.0
+        helm.sh/chart: keycloak-operator-1.3.0
       name: RELEASE-NAME-keycloak-operator-test
     spec:
       keycloakCRName: keycloak