OZG-3276 OZG-3318 seperate charts in files; adjust path

src/main/helm/templates/usermanager_tls_secret.yaml → src/main/helm/templates/certmanager-certificate.yaml

@@ -22,14 +22,6 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: user-manager-issuer
-  namespace: {{ include "app.namespace" . }}
-spec:
-  selfSigned: {}
----
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -50,4 +42,3 @@ spec:
     - "user-manager-svc.{{ include "app.namespace" . }}.svc"
     - "user-manager-svc.{{ include "app.namespace" . }}"
     - "user-manager-svc"
\ No newline at end of file
----
\ No newline at end of file

src/test/helm/usermanager_tls_secret_issuer.yaml → src/main/helm/templates/certmanager.yaml

@@ -22,30 +22,10 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-#suite: usermanager_tls_secret issuer
-#release:
-#  name: user-manager
-#  namespace: sh-helm-test
-#templates:
-#  - templates/usermanager_tls_secret.yaml
-#tests:
-#  - it: should contains header data
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: user-manager-issuer
+  namespace: {{ include "app.namespace" . }}
+spec:
+  selfSigned: {}
\ No newline at end of file
-#    asserts:
-#      - isAPIVersion:
-#          of: cert-manager.io/v1
-#      - isKind:
-#          of: Issuer
-#  - it: should have metadata
-#    asserts:
-#      - equal:
-#          path: metadata.name
-#          
-#          value: helm-ca-issuer
-#      - equal:
-#          path: metadata.namespace
-#          value: sh-helm-test
-#  - it: should have ca
-#    asserts:
-#      - equal:
-#          path: spec.ca.secretName
-#          value: helm-ca-cert
\ No newline at end of file

src/test/helm/usermanager_tls_secret_certificate.yaml → src/test/helm/certmanager.yaml

@@ -22,77 +22,29 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-#suite: usermanager_tls_secret certificate
-#release:
-#  name: user-manager
-#  namespace: sh-helm-test
-#templates:
-#  - templates/usermanager_tls_secret.yaml
-#tests:
-#  - it: should contains header data
-#    asserts:
-#      - isAPIVersion:
-#          of: cert-manager.io/v1
-#      - isKind:
-#          of: Certificate
-#  - it: should have metadata
-#    asserts:
-#      - equal:
-#          path: metadata.name
-#          value: user-manager-tls-certificate
-#      - equal:
-#          path: metadata.namespace
-#          value: sh-helm-test
-#  - it: should have secretName
-#    asserts:
-#      - equal:
-#          path: spec.secretName
-#          value: user-manager-tls-cert
-#  - it: should have issuerRef
+suite: certmanager
+release:
+  name: user-manager
+  namespace: sh-helm-test
+templates:
+  - templates/certmanager.yaml
+tests:
+  - it: should contains header data
+    asserts:
+      - isAPIVersion:
+          of: cert-manager.io/v1
+      - isKind:
+          of: Issuer
+  - it: should have metadata
+    asserts:
+      - equal:
+          path: metadata.name
+          value: user-manager-issuer
+      - equal:
+          path: metadata.namespace
+          value: sh-helm-test
+  - it: should be selfSigned
+    asserts:
+      - equal:
+          path: spec.selfSigned
+          value: {}
\ No newline at end of file
-#    asserts:
-#      - equal:
-#          path: spec.issuerRef.name
-#          value: helm-ca-issuer
-#      - equal:
-#          path: spec.issuerRef.kind
-#          value: Issuer
-#  - it: should have duration
-#    asserts:
-#      - equal:
-#          path: spec.duration
-#          value: 8760h0m0s
-#  - it: should have renewBefore
-#    asserts:
-#      - equal:
-#          path: spec.renewBefore
-#          value: 720h0m0s
-#  - it: should have commonName
-#    asserts:
-#      - equal:
-#          path: spec.commonName
-#          value: "user-manager-svc"
-#  - it: should have commonName
-#    asserts:
-#      - equal:
-#          path: spec.issuerRef.name
-#          value: helm-ca-issuer
-#  - it: should have dnsNames
-#    asserts:
-#     - equal:
-#          path: spec.dnsNames[0]
-#          value: "*.user-manager-svc.sh-helm-test.svc.cluster.local"
-#     - equal:
-#          path: spec.dnsNames[1]
-#          value: "user-manager-svc.sh-helm-test.svc.cluster.local"
-#     - equal:
-#          path: spec.dnsNames[2]
-#          value: "user-manager-svc.sh-helm-test.svc.cluster"
-#     - equal:
-#          path: spec.dnsNames[3]
-#          value: "user-manager-svc.sh-helm-test.svc"
-#     - equal:
-#          path: spec.dnsNames[4]
-#          value: "user-manager-svc.sh-helm-test"
-#     - equal:
-#          path: spec.dnsNames[5]
-#          value: "user-manager-svc"
\ No newline at end of file

src/test/helm/certmanager_certificate.yaml

+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: certmanager certificate
+release:
+  name: user-manager
+  namespace: sh-helm-test
+templates:
+  - templates/certmanager-certificate.yaml
+tests:
+  - it: should contains header data
+    asserts:
+      - isAPIVersion:
+          of: cert-manager.io/v1
+      - isKind:
+          of: Certificate
+  - it: should have metadata
+    asserts:
+      - equal:
+          path: metadata.name
+          value: user-manager-tls-certificate
+      - equal:
+          path: metadata.namespace
+          value: sh-helm-test
+  - it: should have secretName
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: user-manager-tls-cert
+  - it: should have issuerRef
+    asserts:
+      - equal:
+          path: spec.issuerRef.name
+          value: user-manager-issuer
+      - equal:
+          path: spec.issuerRef.kind
+          value: Issuer
+  - it: should have duration
+    asserts:
+      - equal:
+          path: spec.duration
+          value: 8760h0m0s
+  - it: should have renewBefore
+    asserts:
+      - equal:
+          path: spec.renewBefore
+          value: 720h0m0s
+  - it: should have commonName
+    asserts:
+      - equal:
+          path: spec.commonName
+          value: "user-manager-svc"
+  - it: should have dnsNames
+    asserts:
+     - equal:
+          path: spec.dnsNames[0]
+          value: "*.user-manager-svc.sh-helm-test.svc.cluster.local"
+     - equal:
+          path: spec.dnsNames[1]
+          value: "user-manager-svc.sh-helm-test.svc.cluster.local"
+     - equal:
+          path: spec.dnsNames[2]
+          value: "user-manager-svc.sh-helm-test.svc.cluster"
+     - equal:
+          path: spec.dnsNames[3]
+          value: "user-manager-svc.sh-helm-test.svc"
+     - equal:
+          path: spec.dnsNames[4]
+          value: "user-manager-svc.sh-helm-test"
+     - equal:
+          path: spec.dnsNames[5]
+          value: "user-manager-svc"
\ No newline at end of file

src/test/helm/deplyoment_cert_bindings.yaml

@@ -36,15 +36,15 @@ tests:
        - contains:
            path: spec.template.spec.containers[0].volumeMounts
            content:
-             name: user-manager-tls-ca
-             mountPath: "/user-manager-tls-ca/tls.crt"
+             name: user-manager-tls-certificate
+             mountPath: "/user-manager-tls-certificate/tls.crt"
              subPath: tls.crt
              readOnly: true
        - contains:
            path: spec.template.spec.containers[0].volumeMounts
            content:
-             name: user-manager-tls-ca
-             mountPath: "/user-manager-tls-ca/tls.key"
+             name: user-manager-tls-certificate
+             mountPath: "/user-manager-tls-certificate/tls.key"
              subPath: tls.key
              readOnly: true
              

user-manager-server/src/main/resources/application-dev.yaml

@@ -2,8 +2,8 @@ quarkus:
   grpc:
     server:
       ssl:
-        certificate: /user-manager-tls-ca/tls.crt
-        key: /user-manager-tls-ca/tls.key
+        certificate: /user-manager-tls-certificate/tls.crt
+        key: /user-manager-tls-certificate/tls.key
   mongodb:
     database: usermanager
   oidc: