From 9df305ee5cf5e3bd00ec4dcfa087b6d8108c71d8 Mon Sep 17 00:00:00 2001
From: zhenzhen <zhenzhen.liu@mgm-tp.com>
Date: Mon, 16 Dec 2024 12:09:13 +0100
Subject: [PATCH] OZG-6716 resolve comment
---
.../helm/templates/configmap_bindings_type.yaml | 2 +-
src/main/helm/templates/deployment.yaml | 2 +-
src/main/helm/templates/grpc_certificate.yaml | 14 +++++++-------
src/main/helm/templates/network_policy.yaml | 2 +-
src/main/helm/templates/service.yaml | 2 +-
src/main/helm/templates/service_account.yaml | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/helm/templates/configmap_bindings_type.yaml b/src/main/helm/templates/configmap_bindings_type.yaml
index d56b250..6e64b9a 100644
--- a/src/main/helm/templates/configmap_bindings_type.yaml
+++ b/src/main/helm/templates/configmap_bindings_type.yaml
@@ -26,7 +26,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: 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 b4923f2..adabc84 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 }}
component: bayernid-proxy
diff --git a/src/main/helm/templates/grpc_certificate.yaml b/src/main/helm/templates/grpc_certificate.yaml
index 94943b0..4f294c9 100644
--- a/src/main/helm/templates/grpc_certificate.yaml
+++ b/src/main/helm/templates/grpc_certificate.yaml
@@ -27,11 +27,11 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: bayernid-proxy-grpc-tls-certificate
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
spec:
secretName: bayernid-proxy-grpc-tls-cert
issuerRef:
- name: {{ .Release.Namespace }}-ca-issuer
+ name: {{ include "app.namespace" . }}-ca-issuer
kind: Issuer
duration: 8760h0m0s # 1 Jahr
renewBefore: 5840h0m0s # 8 Monate
@@ -40,10 +40,10 @@ spec:
algorithm: RSA
encoding: PKCS8
dnsNames:
- - "*.{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local"
- - "{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local"
- - "{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster"
- - "{{ .Release.Name }}.{{ .Release.Namespace }}.svc"
- - "{{ .Release.Name }}.{{ .Release.Namespace }}"
+ - "*.{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster.local"
+ - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster.local"
+ - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster"
+ - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc"
+ - "{{ .Release.Name }}.{{ include "app.namespace" . }}"
- "{{ .Release.Name }}"
{{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 839faec..4e6bce2 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -27,7 +27,7 @@ apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: network-policy-bayernid-proxy
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
spec:
podSelector:
matchLabels:
diff --git a/src/main/helm/templates/service.yaml b/src/main/helm/templates/service.yaml
index 02ce38d..532b76c 100644
--- a/src/main/helm/templates/service.yaml
+++ b/src/main/helm/templates/service.yaml
@@ -26,7 +26,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{.Release.Name }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
labels:
{{- include "app.defaultLabels" . | indent 4 }}
component: bayernid-proxy
diff --git a/src/main/helm/templates/service_account.yaml b/src/main/helm/templates/service_account.yaml
index 231d53f..3bac8e2 100644
--- a/src/main/helm/templates/service_account.yaml
+++ b/src/main/helm/templates/service_account.yaml
@@ -27,5 +27,5 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "app.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
+ namespace: {{ include "app.namespace" . }}
{{- end }}
\ No newline at end of file
--
GitLab