Merge pull request 'ozg-3879-mongodb-helmchart' (#178) from ozg-3879-mongodb-helmchart into master

Reviewed-on: https://git.ozg-sh.de/mgm/pluto/pulls/178


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

src/main/helm/templates/_helpers.tpl

@@ -60,10 +60,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- required "Environment muss angegeben sein" (.Values.kop).environment -}}
 {{- end -}}
 
-{{- define "app.kopBezeichner" -}}
-{{- required "kop.bezeichner muss angegeben sein" (.Values.kop).bezeichner -}}
-{{- end -}}
-
 {{- define "app.plutoDatabase" -}}
 {{- if (.Values.database).databaseName -}}
 {{  .Values.database.databaseName }}
@@ -92,7 +88,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- if ((.Values.database).tls).secretName -}}
 {{  .Values.database.tls.secretName }}
 {{- else -}}
-{{  printf "%s-database-tls-cert" (include "app.kopBezeichner" . ) }}
+{{  printf "ozg-mongodb-tls-cert" }}
 {{- end -}}
 {{- end -}}
 
@@ -100,6 +96,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- if (.Values.database).secretName -}}
 {{  .Values.database.secretName }}
 {{- else -}}
-{{  printf "%s-database-admin-pluto-user" (include "app.kopBezeichner" . ) }}
+{{  printf "ozg-mongodb-admin-pluto-user" }}
 {{- end -}}
 {{- end -}}
\ No newline at end of file

src/test/helm/deployment_mongodb_test.yaml

@@ -37,7 +37,7 @@ tests:
             name: spring_data_mongodb_uri
             valueFrom: 
               secretKeyRef:
-                name: helm-database-admin-pluto-user
+                name: ozg-mongodb-admin-pluto-user
                 key: connectionString.standardSrv
                 optional: false
       - contains:
@@ -50,7 +50,7 @@ tests:
           content:
             name: mongodb-root-ca
             secret:
-              secretName: helm-database-tls-cert
+              secretName: ozg-mongodb-tls-cert
               optional: true
 
   - it: check external mongodb
@@ -82,7 +82,7 @@ tests:
     release:
       name: pluto
     set:
-      database.secretName: ozg-mongodb-database-admin-pluto-user
+      database.secretName: secret-database-admin-pluto-user
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -90,7 +90,7 @@ tests:
             name: spring_data_mongodb_uri
             valueFrom: 
               secretKeyRef:
-                name: ozg-mongodb-database-admin-pluto-user
+                name: secret-database-admin-pluto-user
                 key: connectionString.standardSrv
                 optional: false
       - contains:
@@ -116,7 +116,7 @@ tests:
           content:
             name: mongodb-root-ca
             secret:
-              secretName: helm-database-tls-cert
+              secretName: ozg-mongodb-tls-cert
               optional: true
 
   - it: check mongodb tls set tls cert name
@@ -127,7 +127,7 @@ tests:
       database:
         tls:
           enabled: true
-          secretName: ozg-mongodb-tls-cert
+          secretName: secret-tls-cert
     asserts:
       - contains:
           path: spec.template.spec.containers[0].volumeMounts
@@ -141,5 +141,5 @@ tests:
           content:
             name: mongodb-root-ca
             secret:
-              secretName: ozg-mongodb-tls-cert
+              secretName: secret-tls-cert
               optional: true
\ No newline at end of file