From 637fa55e740d4f96524f8da1fefada479d9054ec Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 12 Dec 2024 12:40:33 +0100
Subject: [PATCH] #2 OZG-7121 helm: Resolve helm install warnings
---
src/main/helm/templates/certificate.yaml | 5 ++---
src/main/helm/templates/deployment.yaml | 3 ++-
src/test/helm/deployment_env_test.yaml | 11 +++++++++++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/helm/templates/certificate.yaml b/src/main/helm/templates/certificate.yaml
index 434f8b4..c9decda 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 a1d4ea7..f4e84a0 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 52c9484..d9ac051 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:
--
GitLab