diff --git a/src/test/helm/deployment_defaults_containers_health_test.yaml b/src/test/helm/deployment_defaults_containers_health_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e57dbb709e5f53a16e359ad087ad54b3b76c7ee0
--- /dev/null
+++ b/src/test/helm/deployment_defaults_containers_health_test.yaml
@@ -0,0 +1,81 @@
+#
+# 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: test deployment health check
+release:
+ name: eingang-manager
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ ozgcloud.environment: test
+tests:
+ - it: should work
+ asserts:
+ - equal:
+ path: spec.template.spec.containers[0].readinessProbe.failureThreshold
+ value: 3
+ - equal:
+ path: spec.template.spec.containers[0].readinessProbe.httpGet.path
+ value: /actuator/health/readiness
+ - equal:
+ path: spec.template.spec.containers[0].readinessProbe.httpGet.port
+ value: 8081
+ - equal:
+ path: spec.template.spec.containers[0].readinessProbe.httpGet.scheme
+ value: HTTP
+ - equal:
+ path: spec.template.spec.containers[0].readinessProbe.periodSeconds
+ value: 10
+ - equal:
+ path: spec.template.spec.containers[0].readinessProbe.successThreshold
+ value: 1
+ - equal:
+ path: spec.template.spec.containers[0].readinessProbe.timeoutSeconds
+ value: 3
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.failureThreshold
+ value: 10
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.httpGet.path
+ value: /actuator/health/readiness
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.httpGet.port
+ value: 8081
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.httpGet.scheme
+ value: HTTP
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.initialDelaySeconds
+ value: 30
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.periodSeconds
+ value: 5
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.successThreshold
+ value: 1
+ - equal:
+ path: spec.template.spec.containers[0].startupProbe.timeoutSeconds
+ value: 5
+
\ No newline at end of file
diff --git a/xta-adapter/run_helm_test.sh b/xta-adapter/run_helm_test.sh
index 9a57c3aa8f89a760772338f83d79796e04c242cb..31d13d5b9e4162f68f627d2eb96c3b2b3a98828a 100755
--- a/xta-adapter/run_helm_test.sh
+++ b/xta-adapter/run_helm_test.sh
@@ -4,4 +4,4 @@ set -e
helm template ./src/main/helm/ -f src/test/helm-linter-values.yaml
helm lint -f src/test/helm-linter-values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest -f '../../test/helm/*.yaml' .
+cd src/main/helm && helm unittest -f '../../test/helm/**/*.yaml' .
diff --git a/xta-adapter/src/main/helm/templates/image-pull-secret.yaml b/xta-adapter/src/main/helm/templates/image_pull_secret.yaml
similarity index 100%
rename from xta-adapter/src/main/helm/templates/image-pull-secret.yaml
rename to xta-adapter/src/main/helm/templates/image_pull_secret.yaml
diff --git a/xta-adapter/src/test/helm/image_pull_secret_test.yaml b/xta-adapter/src/test/helm/image_pull_secret_test.yaml
index 7929ffb7291de4b35205fae39777dc14b3659c47..c01b6a4ba95a3c212713182fea2f870b11a434ff 100644
--- a/xta-adapter/src/test/helm/image_pull_secret_test.yaml
+++ b/xta-adapter/src/test/helm/image_pull_secret_test.yaml
@@ -24,7 +24,7 @@
suite: test image pull secret
templates:
- - templates/image-pull-secret.yaml
+ - templates/image_pull_secret.yaml
release:
name: xta-adapter
namespace: helm-test
diff --git a/xta-adapter/src/test/helm/service_account_test.yaml b/xta-adapter/src/test/helm/service_account_test.yaml
index e69fb10ec60f838348d3ab287f6d8eba19db67fb..1027bebb9e7062b7eff532148e3414810523f48f 100644
--- a/xta-adapter/src/test/helm/service_account_test.yaml
+++ b/xta-adapter/src/test/helm/service_account_test.yaml
@@ -36,6 +36,8 @@ tests:
asserts:
- isKind:
of: ServiceAccount
+ - isAPIVersion:
+ of: v1
- equal:
path: metadata.name
value: xta-adapter-service-account
@@ -50,6 +52,8 @@ tests:
asserts:
- isKind:
of: ServiceAccount
+ - isAPIVersion:
+ of: v1
- equal:
path: metadata.name
value: helm-service-account
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
index b17ff7452fb6022ce9d20bdfd58b5b28b538e393..74afdf5e3062843b7e8065117aee81837ff532ea 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
@@ -33,7 +33,6 @@ set:
tests:
- it: validate basic data
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
asserts:
@@ -56,7 +55,6 @@ tests:
path: spec.concurrencyPolicy
value: Forbid
- it: check set schedule
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
xta:
@@ -70,7 +68,6 @@ tests:
path: spec.schedule
value: "1 1 * * * *"
- it: check dev schedule
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
asserts:
@@ -78,7 +75,6 @@ tests:
path: spec.schedule
value: "*/15 * * * *"
- it: check container image
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
asserts:
@@ -87,7 +83,6 @@ tests:
value: "docker.ozg-sh.de/xta-adapter:9.9.99"
- it: check securityContext
- template: xta_adapter_cronjob.yaml
asserts:
- equal:
path: spec.jobTemplate.spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
@@ -124,7 +119,6 @@ tests:
path: spec.jobTemplate.spec.template.spec.containers[0].securityContext.runAsGroup
value: 1000
- it: check pod labels
- template: xta_adapter_cronjob.yaml
asserts:
- equal:
path: spec.jobTemplate.spec.template.metadata.labels
diff --git a/xta-adapter/src/test/helm/xta_adapter_bindings_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_bindings_test.yaml
similarity index 100%
rename from xta-adapter/src/test/helm/xta_adapter_bindings_test.yaml
rename to xta-adapter/src/test/helm/xta_adapter_cronjob_bindings_test.yaml
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml
index 93637305c8f873e3557b93817da786ea391e32aa..dc08c5ac61b85ac8b8570d4a2ba9e77c8679bf2a 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_dummy_probes_test.yaml
@@ -32,37 +32,31 @@ set:
ozgcloud.environment: test
tests:
- it: check dummy livenessProbe default disabled
- template: xta_adapter_cronjob.yaml
asserts:
- notExists:
path: spec.jobTemplate.spec.template.spec.containers[0].livenessProbe
- it: check dummy startupProbe default disabled
- template: xta_adapter_cronjob.yaml
asserts:
- notExists:
path: spec.jobTemplate.spec.template.spec.containers[0].startupProbe
- it: check dummy readynessProbe default disabled
- template: xta_adapter_cronjob.yaml
asserts:
- notExists:
path: spec.jobTemplate.spec.template.spec.containers[0].readinessProbe
- it: check dummy livenessProbe disabled
- template: xta_adapter_cronjob.yaml
set:
dummyProbesEnabled: false
asserts:
- notExists:
path: spec.jobTemplate.spec.template.spec.containers[0].livenessProbe
- it: check dummy startupProbe disabled
- template: xta_adapter_cronjob.yaml
set:
dummyProbesEnabled: false
asserts:
- notExists:
path: spec.jobTemplate.spec.template.spec.containers[0].startupProbe
- it: check dummy readynessProbe disabled
- template: xta_adapter_cronjob.yaml
set:
dummyProbesEnabled: false
asserts:
@@ -71,21 +65,18 @@ tests:
- it: check dummy livenessProbe enabled
- template: xta_adapter_cronjob.yaml
set:
dummyProbesEnabled: true
asserts:
- isNotEmpty:
path: spec.jobTemplate.spec.template.spec.containers[0].livenessProbe
- it: check dummy startupProbe enabled
- template: xta_adapter_cronjob.yaml
set:
dummyProbesEnabled: true
asserts:
- isNotEmpty:
path: spec.jobTemplate.spec.template.spec.containers[0].startupProbe
- it: check dummy readynessProbe enabled
- template: xta_adapter_cronjob.yaml
set:
dummyProbesEnabled: true
asserts:
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
index 45eb29fa69debf6962737e66509cc2c2c807ad29..294bf8fb9eb8fc902cce859c4b37a8394531fbe1 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
@@ -32,7 +32,6 @@ set:
ozgcloud.environment: test
tests:
- it: check default env
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
xta:
@@ -112,7 +111,6 @@ tests:
name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
value: "PLAINTEXT"
- it: check set env values
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
env.overrideSpringProfiles: local
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml
index 02efe39637d3eeb149ffa8322d8f0e5d2e149f20..b9b879cd39388a602af28bc18ce73e3378c25205 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_resources_test.yaml
@@ -32,7 +32,6 @@ set:
ozgcloud.environment: dev
tests:
- it: check resources
- template: xta_adapter_cronjob.yaml
set:
resources:
limits:
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
index 6acac9f4f2a7376cef9ca583eb3e82ae9cec76ec..bbddacc94a620d2cc03830d59c9af69bb326a91e 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
@@ -32,7 +32,6 @@ set:
ozgcloud.environment: dev
tests:
- it: check volume mounts
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
xta:
@@ -63,7 +62,6 @@ tests:
subPath: file
readOnly: true
- it: check volumes
- template: xta_adapter_cronjob.yaml
set:
image.name: xta-adapter
xta:
diff --git a/xta-adapter/src/test/helm/xta-bindings-type-test.yaml b/xta-adapter/src/test/helm/xta_bindings_type_test.yaml
similarity index 89%
rename from xta-adapter/src/test/helm/xta-bindings-type-test.yaml
rename to xta-adapter/src/test/helm/xta_bindings_type_test.yaml
index ff4858ff0bdc6cbddfccbaa81b5b8dbf9668e3af..ad3697998319f96038442aa30f873ea9a7b343a5 100644
--- a/xta-adapter/src/test/helm/xta-bindings-type-test.yaml
+++ b/xta-adapter/src/test/helm/xta_bindings_type_test.yaml
@@ -37,6 +37,8 @@ tests:
asserts:
- isKind:
of: ConfigMap
+ - isAPIVersion:
+ of: v1
- equal:
path: metadata.name
value: xta-adapter-bindings-type
@@ -45,4 +47,10 @@ tests:
value: helm-test
- equal:
path: data.type
- value: ca-certificates
\ No newline at end of file
+ value: ca-certificates
+ - it: should not create config map by default
+ asserts:
+ - hasDocuments:
+ count: 0
+
+
\ No newline at end of file
diff --git a/xta-adapter/src/test/helm/xta-keystore-secret-test.yaml b/xta-adapter/src/test/helm/xta_keystore_secret_test.yaml
similarity index 88%
rename from xta-adapter/src/test/helm/xta-keystore-secret-test.yaml
rename to xta-adapter/src/test/helm/xta_keystore_secret_test.yaml
index 83eafba7d57e7b0cfec063edb19878ccd35cab4f..fca872c103aee45ca3a2c8921abe48ad4a1bcd5d 100644
--- a/xta-adapter/src/test/helm/xta-keystore-secret-test.yaml
+++ b/xta-adapter/src/test/helm/xta_keystore_secret_test.yaml
@@ -39,6 +39,11 @@ tests:
asserts:
- isKind:
of: Secret
+ - isAPIVersion:
+ of: v1
+ - equal:
+ path: type
+ value: Opaque
- equal:
path: metadata.name
value: xta-keystore
@@ -51,4 +56,9 @@ tests:
- equal:
path: data.file
value: Z2VoZWltCg==
+
+ - it: should not create keystore by default
+ asserts:
+ - hasDocuments:
+ count: 0
diff --git a/xta-adapter/src/test/helm/xta-root-ca-secret-test.yaml b/xta-adapter/src/test/helm/xta_root_ca_secret_test.yaml
similarity index 88%
rename from xta-adapter/src/test/helm/xta-root-ca-secret-test.yaml
rename to xta-adapter/src/test/helm/xta_root_ca_secret_test.yaml
index c3861ba54d4cdbf807cfb5780090080d1290371e..f65bbcb9edc38e2fed6da3531eecaae8a69db205 100644
--- a/xta-adapter/src/test/helm/xta-root-ca-secret-test.yaml
+++ b/xta-adapter/src/test/helm/xta_root_ca_secret_test.yaml
@@ -37,9 +37,14 @@ tests:
asserts:
- isKind:
of: Secret
+ - isAPIVersion:
+ of: v1
- equal:
path: metadata.name
value: xta-root-ca
+ - equal:
+ path: type
+ value: Opaque
- equal:
path: metadata.namespace
value: helm-test
@@ -47,3 +52,7 @@ tests:
path: data["ca.crt"]
value: Z2VoZWltCg==
+ - it: should not create ca secret by default
+ asserts:
+ - hasDocuments:
+ count: 0
\ No newline at end of file