diff --git a/src/main/helm/templates/certificate.yaml b/src/main/helm/templates/certificate.yaml index 434f8b47e278f58b970c9f8a90d7a59fb9d2d2f7..c9decdacd74f2e770433606659a3bd70413b6f33 100644 --- a/src/main/helm/templates/certificate.yaml +++ b/src/main/helm/templates/certificate.yaml @@ -23,14 +23,13 @@ spec: passwordSecretRef: name: xta-test-server-default-secret key: keystorePassword - alias: xta-test-server pkcs12: create: true passwordSecretRef: name: xta-test-server-default-secret key: keystorePassword subject: - organisations: + organizations: - "XtaTestOrga" countries: - DE @@ -40,7 +39,7 @@ spec: - Kiel provinces: - Schleswig-Holstein - steetAddresses: + streetAddresses: - "Test-Str. 4" postalCodes: - "22222" diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index a1d4ea7f9a2d507be0da40c7af77965e5819b959..f4e84a072c2dfb109206fcddcc3b064df4103405 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -65,6 +65,8 @@ spec: value: /store/keystore.jks - name: server_ssl_trust-store value: /store/truststore.jks + - name: server_ssl_key-alias + value: certificate {{- with include "app.getCustomList" . }} {{ . | indent 10 }} {{- end }} @@ -125,7 +127,6 @@ spec: - name: xta-test-server-tls-store mountPath: "/store/" readOnly: true - volumes: - name: temp-dir emptyDir: {} diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml index 52c9484a7154051acfe08ac3002344b8ed8d6586..d9ac051287f5e0fe5ee8f64ad5cd621b891f9ada 100644 --- a/src/test/helm/deployment_env_test.yaml +++ b/src/test/helm/deployment_env_test.yaml @@ -51,6 +51,17 @@ tests: content: name: server_ssl_key-store value: /store/keystore.jks + - it: should set key alias + set: + ozgcloud: + environment: dev + imagePullSecret: image-pull-secret + asserts: + - contains: + path: spec.template.spec.containers[0].env + content: + name: server_ssl_key-alias + value: certificate - it: should set truststore set: ozgcloud: