From d4a902463077581973f0f9bd4e8cbd65e7751ae6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 29 Feb 2024 14:40:56 +0100
Subject: [PATCH] OZG-4939 Substituted .Release.Namesapce
---
src/main/helm/templates/_helpers.tpl | 4 ++--
src/main/helm/templates/configmap_bindings_type.yaml | 2 +-
src/main/helm/templates/deployment.yaml | 4 ++--
src/main/helm/templates/ingress.yaml | 2 +-
src/main/helm/templates/keycloak_user_crd.yaml | 2 +-
src/main/helm/templates/network_policy.yaml | 2 +-
.../ozgcloud_keycloak_operator_secrets_read_role.yaml | 2 +-
.../ozgcloud_keycloak_operator_secrets_read_role_binding.yaml | 2 +-
.../ozgcloud_keycloak_operator_secrets_write_role.yaml | 2 +-
...ozgcloud_keycloak_operator_secrets_write_role_binding.yaml | 2 +-
src/main/helm/templates/service.yaml | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 20467d77..d59b652e 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -13,13 +13,13 @@
app.kubernetes.io/instance: administration
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/name: {{ .Release.Name }}
-app.kubernetes.io/namespace: {{ .Release.Namespace }}
+app.kubernetes.io/namespace: {{ include "app.namespace" . }}
helm.sh/chart: {{ printf "%s-%s" .Chart.Name .Chart.Version }}
{{- end -}}
{{- define "app.matchLabels" }}
app.kubernetes.io/name: {{ .Release.Name }}
-app.kubernetes.io/namespace: {{ .Release.Namespace }}
+app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- define "app.imagePullSecret" }}
diff --git a/src/main/helm/templates/configmap_bindings_type.yaml b/src/main/helm/templates/configmap_bindings_type.yaml
index b31800e0..87ce9927 100644
--- a/src/main/helm/templates/configmap_bindings_type.yaml
+++ b/src/main/helm/templates/configmap_bindings_type.yaml
@@ -23,7 +23,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: administration-bindings-type
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
data:
type: |
ca-certificates
\ No newline at end of file
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 5c2d3b22..c5c0cf74 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -26,7 +26,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
labels:
{{- include "app.defaultLabels" . | indent 4 }}
spec:
@@ -36,7 +36,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: {{ .Release.Name }}
- app.kubernetes.io/namespace: {{ .Release.Namespace }}
+ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
strategy:
rollingUpdate:
maxSurge: 1
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index 9efd05ed..d1afb90b 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -37,7 +37,7 @@ metadata:
{{- end }}
nginx.ingress.kubernetes.io/proxy-body-size: 42m
name: {{ .Release.Name }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
spec:
{{- if and (.Values.ingress).className (ne (.Values).cluster_env "dataport") }}
ingressClassName: {{ .Values.ingress.className }}
diff --git a/src/main/helm/templates/keycloak_user_crd.yaml b/src/main/helm/templates/keycloak_user_crd.yaml
index 8dc497fa..0144559d 100644
--- a/src/main/helm/templates/keycloak_user_crd.yaml
+++ b/src/main/helm/templates/keycloak_user_crd.yaml
@@ -5,7 +5,7 @@ apiVersion: operator.ozgcloud.de/v1
kind: OzgCloudKeycloakUser
metadata:
name: {{ include "app.nameToIdentifier" $user.name }}-keycloak-user
- namespace: {{ $.Release.Namespace }}
+ namespace: {{ include "app.namespace" $ }}
spec:
keep_after_delete: {{ $.Values.sso.keep_after_delete | default false }}
update_user: {{ $user.update_user | default false }}
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index aea305bd..0b04539f 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: network-policy-administration
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
spec:
podSelector:
matchLabels:
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
index 45514b61..9d8961c6 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: ozgcloud-keycloak-operator-secrets-read-role-administration
- namespace: {{ $.Release.Namespace }}
+ namespace: {{ include "app.namespace" $ }}
rules:
- apiGroups:
- "*"
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
index 813ed63e..1250afd3 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: ozgcloud-keycloak-operator-secrets-read-role-binding-administration
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
subjects:
- kind: ServiceAccount
name: ozgcloud-keycloak-operator-serviceaccount
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
index f8a60900..0072fe3e 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: ozgcloud-keycloak-operator-secrets-write-role-administration
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
rules:
- apiGroups:
- "*"
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
index 2a1e624f..ef069bf2 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: ozgcloud-keycloak-operator-secrets-write-role-binding-administration
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
subjects:
- kind: ServiceAccount
name: ozgcloud-keycloak-operator-serviceaccount
diff --git a/src/main/helm/templates/service.yaml b/src/main/helm/templates/service.yaml
index a6837725..37c04166 100644
--- a/src/main/helm/templates/service.yaml
+++ b/src/main/helm/templates/service.yaml
@@ -25,7 +25,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Release.Name }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
labels:
{{- include "app.defaultLabels" . | indent 4 }}
component: administration-service
--
GitLab