From 9df8be36e687588425456687ebe9167108450c3e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 25 Apr 2024 13:52:09 +0200
Subject: [PATCH] =?UTF-8?q?OZG-5453-Set=20Beh=C3=B6rdenschl=C3=BCsselUri?=
=?UTF-8?q?=20and=20version=20in=20helm=20charts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/helm/templates/deployment.yaml | 4 +
src/test/helm-linter-values.yaml | 2 +
src/test/helm/deployment_63_char_test.yaml | 2 +
src/test/helm/deployment_bindings_test.yaml | 2 +
.../helm/deployment_customList_env_test.yaml | 2 +
.../deployment_defaults_affinity_test.yaml | 2 +
.../helm/deployment_defaults_env_test.yaml | 2 +
.../helm/deployment_defaults_labels_test.yaml | 2 +
..._defaults_spec_containers_health_test.yaml | 122 +++++++++---------
..._spec_containers_securityContext_test.yaml | 2 +
...loyment_defaults_spec_containers_test.yaml | 2 +
.../deployment_defaults_sso_env_test.yaml | 2 +
...faults_topologySpreadConstraints_test.yaml | 2 +
.../helm/deployment_host_aliases_test.yaml | 2 +
src/test/helm/deployment_imageTag_test.yaml | 2 +
.../deployment_imagepull_secret_test.yaml | 2 +
.../helm/deployment_liveness_probe_test.yaml | 2 +
...ployment_pod_default_spec_values_test.yaml | 2 +
src/test/helm/deployment_resources_test.yaml | 2 +
.../helm/deployment_service_account_test.yaml | 2 +
.../deployment_springProfile_env_test.yaml | 2 +
...ployment_usermanager_address_env_test.yaml | 2 +
...ment_vorgang_manager_address_env_test.yaml | 2 +
src/test/helm/deployment_xdomea_env_test.yaml | 51 ++++++++
...t_general_value_and_default_spec_test.yaml | 2 +
25 files changed, 161 insertions(+), 60 deletions(-)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 2a2ab932cd..1aabf05903 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -103,6 +103,10 @@ spec:
{{- end}}
- name: ozgcloud_xdomea_behoerdenschluessel
value: {{ required "ozgcloud.xdomea.behoerdenschluessel muss angegeben sein" ((.Values.ozgcloud).xdomea).behoerdenschluessel | quote }}
+ - name: ozgcloud_xdomea_behoerdenschluesselUri
+ value: {{ required "ozgcloud.xdomea.behoerdenschluesselUri muss angegeben sein" ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}}
+ - name: ozgcloud_xdomea_behoerdenschluesselVersion
+ value: {{ required "ozgcloud.xdomea.behoerdenschluesselVersion muss angegeben sein" ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
imagePullPolicy: Always
diff --git a/src/test/helm-linter-values.yaml b/src/test/helm-linter-values.yaml
index 0f9a95a2de..7eb04a7cbd 100644
--- a/src/test/helm-linter-values.yaml
+++ b/src/test/helm-linter-values.yaml
@@ -30,6 +30,8 @@ ozgcloud:
environment: test
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
networkPolicy:
ssoPublicIp: 51.89.117.53/32
diff --git a/src/test/helm/deployment_63_char_test.yaml b/src/test/helm/deployment_63_char_test.yaml
index 7afb217969..56f935559c 100644
--- a/src/test/helm/deployment_63_char_test.yaml
+++ b/src/test/helm/deployment_63_char_test.yaml
@@ -39,6 +39,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
baseUrl: test.company.local
diff --git a/src/test/helm/deployment_bindings_test.yaml b/src/test/helm/deployment_bindings_test.yaml
index d813adb075..a42e08b93f 100644
--- a/src/test/helm/deployment_bindings_test.yaml
+++ b/src/test/helm/deployment_bindings_test.yaml
@@ -35,6 +35,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
baseUrl: test.company.local
diff --git a/src/test/helm/deployment_customList_env_test.yaml b/src/test/helm/deployment_customList_env_test.yaml
index 00b6f82b67..688ff738fe 100644
--- a/src/test/helm/deployment_customList_env_test.yaml
+++ b/src/test/helm/deployment_customList_env_test.yaml
@@ -33,6 +33,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_affinity_test.yaml b/src/test/helm/deployment_defaults_affinity_test.yaml
index 37bbe61c24..30d186a2b5 100644
--- a/src/test/helm/deployment_defaults_affinity_test.yaml
+++ b/src/test/helm/deployment_defaults_affinity_test.yaml
@@ -35,6 +35,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
baseUrl: test.company.local
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index d762ac1070..2e5e68b527 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index c377e8bb7a..93e3dc8520 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -37,6 +37,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
index b5c99deac8..a216743645 100644
--- a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
@@ -24,66 +24,68 @@
suite: test deployment health check
release:
- name: alfa
- namespace: sh-helm-test
+ name: alfa
+ namespace: sh-helm-test
templates:
- - templates/deployment.yaml
+ - templates/deployment.yaml
set:
- baseUrl: test.company.local
- ozgcloud:
- environment: test
- bundesland: sh
- bezeichner: helm
- xdomea:
- behoerdenschluessel: "123456"
- sso:
- serverUrl: https://sso.company.local
- imagePullSecret: image-pull-secret
+ baseUrl: test.company.local
+ ozgcloud:
+ environment: test
+ bundesland: sh
+ bezeichner: helm
+ xdomea:
+ behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
+ sso:
+ serverUrl: https://sso.company.local
+ imagePullSecret: image-pull-secret
tests:
- - it: should have correct valaues for health check
- 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
+ - it: should have correct valaues for health check
+ 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
diff --git a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
index 07dec2bec4..db495d1e81 100644
--- a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_spec_containers_test.yaml b/src/test/helm/deployment_defaults_spec_containers_test.yaml
index 4b3291e5b2..d6fa262f48 100644
--- a/src/test/helm/deployment_defaults_spec_containers_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_sso_env_test.yaml b/src/test/helm/deployment_defaults_sso_env_test.yaml
index 441f2346b3..0b8017066f 100644
--- a/src/test/helm/deployment_defaults_sso_env_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_env_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
index fdeb46b7ff..a319bba88c 100644
--- a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
+++ b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_host_aliases_test.yaml b/src/test/helm/deployment_host_aliases_test.yaml
index f16df24bd1..579000d7c6 100644
--- a/src/test/helm/deployment_host_aliases_test.yaml
+++ b/src/test/helm/deployment_host_aliases_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_imageTag_test.yaml b/src/test/helm/deployment_imageTag_test.yaml
index 1188cc2c38..e3973e2644 100644
--- a/src/test/helm/deployment_imageTag_test.yaml
+++ b/src/test/helm/deployment_imageTag_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_imagepull_secret_test.yaml b/src/test/helm/deployment_imagepull_secret_test.yaml
index 32df80f7df..e0fbf9fe89 100644
--- a/src/test/helm/deployment_imagepull_secret_test.yaml
+++ b/src/test/helm/deployment_imagepull_secret_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
tests:
diff --git a/src/test/helm/deployment_liveness_probe_test.yaml b/src/test/helm/deployment_liveness_probe_test.yaml
index f29e3c5fb3..688d736258 100644
--- a/src/test/helm/deployment_liveness_probe_test.yaml
+++ b/src/test/helm/deployment_liveness_probe_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_pod_default_spec_values_test.yaml b/src/test/helm/deployment_pod_default_spec_values_test.yaml
index 75bfe6fdb3..fe479d789b 100644
--- a/src/test/helm/deployment_pod_default_spec_values_test.yaml
+++ b/src/test/helm/deployment_pod_default_spec_values_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index ea5f3069a2..ae938d4025 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -35,6 +35,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_service_account_test.yaml b/src/test/helm/deployment_service_account_test.yaml
index 407599c7ef..a57bc628ff 100644
--- a/src/test/helm/deployment_service_account_test.yaml
+++ b/src/test/helm/deployment_service_account_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_springProfile_env_test.yaml b/src/test/helm/deployment_springProfile_env_test.yaml
index bd56a89008..c950724039 100644
--- a/src/test/helm/deployment_springProfile_env_test.yaml
+++ b/src/test/helm/deployment_springProfile_env_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_usermanager_address_env_test.yaml b/src/test/helm/deployment_usermanager_address_env_test.yaml
index 1bff3e7408..58c7cb58e5 100644
--- a/src/test/helm/deployment_usermanager_address_env_test.yaml
+++ b/src/test/helm/deployment_usermanager_address_env_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_vorgang_manager_address_env_test.yaml b/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
index 61b133456a..5ad441a04a 100644
--- a/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_xdomea_env_test.yaml b/src/test/helm/deployment_xdomea_env_test.yaml
index c8f852f08b..7656d2d0ea 100644
--- a/src/test/helm/deployment_xdomea_env_test.yaml
+++ b/src/test/helm/deployment_xdomea_env_test.yaml
@@ -15,6 +15,11 @@ set:
imagePullSecret: image-pull-secret
tests:
- it: should fail on missing behoerdenschlüssel
+ set:
+ ozgcloud:
+ xdomea:
+ behoerdenschluesselUri: "uri.uri:uri"
+ behoerdenschluesselVersion: "version 1"
asserts:
- failedTemplate:
errorMessage: "ozgcloud.xdomea.behoerdenschluessel muss angegeben sein"
@@ -23,9 +28,55 @@ tests:
ozgcloud:
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: "uri.uri:uri"
+ behoerdenschluesselVersion: "version 1"
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_xdomea_behoerdenschluessel
value: "123456"
+ - it: should fail on missing behoerdenschlüsselUri
+ set:
+ ozgcloud:
+ xdomea:
+ behoerdenschluessel: "123456"
+ behoerdenschluesselVersion: "version 1"
+ asserts:
+ - failedTemplate:
+ errorMessage: "ozgcloud.xdomea.behoerdenschluesselUri muss angegeben sein"
+ - it: should set behoerdenschlüsselUri
+ set:
+ ozgcloud:
+ xdomea:
+ behoerdenschluessel: "123456"
+ behoerdenschluesselUri: "uri.uri:uri"
+ behoerdenschluesselVersion: "version 1"
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_xdomea_behoerdenschluesselUri
+ value: "uri.uri:uri"
+ - it: should fail on missing behoerdenschlüsselVersion
+ set:
+ ozgcloud:
+ xdomea:
+ behoerdenschluessel: "123456"
+ behoerdenschluesselUri: "uri.uri:uri"
+ asserts:
+ - failedTemplate:
+ errorMessage: "ozgcloud.xdomea.behoerdenschluesselVersion muss angegeben sein"
+ - it: should set behoerdenschlüsselVersion
+ set:
+ ozgcloud:
+ xdomea:
+ behoerdenschluessel: "123456"
+ behoerdenschluesselUri: "uri.uri:uri"
+ behoerdenschluesselVersion: "version 1"
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_xdomea_behoerdenschluesselVersion
+ value: "version 1"
diff --git a/src/test/helm/deyploment_general_value_and_default_spec_test.yaml b/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
index 57f3348910..3700163347 100644
--- a/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
+++ b/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
@@ -36,6 +36,8 @@ set:
bezeichner: helm
xdomea:
behoerdenschluessel: "123456"
+ behoerdenschluesselUri: uri.uri:uri
+ behoerdenschluesselVersion: "Version 1"
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
--
GitLab