From 06e49b73039f9a9a1980b633b15dc37f581166a1 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 13 Jan 2023 13:25:17 +0100
Subject: [PATCH] OZG-3276 OZG-3318 disable user-manager-tls secret in seperate
 file; set fix name for issuer; rename secret to "user-manager-tls"

---
 src/main/helm/templates/deployment.yaml       | 20 +++----
 .../templates/usermanager_tls_secret.yaml     | 58 +++++++++----------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index a90b2e0b..61a5ff5f 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -24,11 +24,11 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: {{ include "app.kopBezeichner" . }}-ca-issuer
+  name: user-manager-ca-issuer
   namespace: {{ include "app.namespace" . }}
 spec:
   ca:
-    secretName: user-manager-ca-cert
+    secretName: user-manager-tls
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
@@ -36,9 +36,9 @@ metadata:
   name: user-manager-ca-cert
   namespace: {{ include "app.namespace" . }}
 spec:
-  secretName: user-manager-ca-cert
+  secretName: user-manager-tls
   issuerRef:
-    name: {{ include "app.kopBezeichner" . }}-ca-issuer
+    name: user-manager-ca-issuer
     kind: Issuer
   duration: 8760h0m0s
   renewBefore: 720h0m0s
@@ -158,18 +158,18 @@ spec:
         terminationMessagePolicy: File
         tty: true
         volumeMounts:
-          - name: user-manager-tls-ca
-            mountPath: "/user-manager-tls-ca/tls.crt"
+          - name: user-manager-tls
+            mountPath: "/user-manager-tls/tls.crt"
             subPath: tls.crt
             readOnly: true
-          - name: user-manager-tls-ca
-            mountPath: "/user-manager-tls-ca/tls.key"
+          - name: user-manager-tls
+            mountPath: "/user-manager-tls/tls.key"
             subPath: tls.key
             readOnly: true
       volumes:
-         - name: user-manager-tls-ca
+         - name: user-manager-tls
            secret:
-              secretName: user-manager-ca-cert
+              secretName: user-manager-tls
       dnsConfig: {}
       dnsPolicy: ClusterFirst
       imagePullSecrets:
diff --git a/src/main/helm/templates/usermanager_tls_secret.yaml b/src/main/helm/templates/usermanager_tls_secret.yaml
index 6b55047e..fd09afee 100644
--- a/src/main/helm/templates/usermanager_tls_secret.yaml
+++ b/src/main/helm/templates/usermanager_tls_secret.yaml
@@ -22,32 +22,32 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: {{ include "app.kopBezeichner" . }}-ca-issuer
-  namespace: {{ include "app.namespace" . }}
-spec:
-  ca:
-    secretName: user-manager-ca-cert
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: user-manager-ca-cert
-  namespace: {{ include "app.namespace" . }}
-spec:
-  secretName: user-manager-ca-cert
-  issuerRef:
-    name: {{ include "app.kopBezeichner" . }}-ca-issuer
-    kind: Issuer
-  duration: 8760h0m0s
-  renewBefore: 720h0m0s
-  commonName: "user-manager-svc"
-  dnsNames:
-    - "*.user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
-    - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
-    - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster"
-    - "user-manager-svc.{{ include "app.namespace" . }}.svc"
-    - "user-manager-svc.{{ include "app.namespace" . }}"
-    - "user-manager-svc"
\ No newline at end of file
+#apiVersion: cert-manager.io/v1
+#kind: Issuer
+#metadata:
+#  name: {{ include "app.kopBezeichner" . }}-ca-issuer
+#  namespace: {{ include "app.namespace" . }}
+#spec:
+#  ca:
+#    secretName: user-manager-ca-cert
+#---
+#apiVersion: cert-manager.io/v1
+#kind: Certificate
+#metadata:
+#  name: user-manager-ca-cert
+#  namespace: {{ include "app.namespace" . }}
+#spec:
+#  secretName: user-manager-ca-cert
+#  issuerRef:
+#    name: {{ include "app.kopBezeichner" . }}-ca-issuer
+#    kind: Issuer
+#  duration: 8760h0m0s
+#  renewBefore: 720h0m0s
+#  commonName: "user-manager-svc"
+#  dnsNames:
+#    - "*.user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
+#    - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
+#    - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster"
+#    - "user-manager-svc.{{ include "app.namespace" . }}.svc"
+#    - "user-manager-svc.{{ include "app.namespace" . }}"
+#    - "user-manager-svc"
\ No newline at end of file
-- 
GitLab