diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index 2a2ab932cd61440e2a0759fcd690dc20d4f2985c..1aabf05903d1c0b2e15f6b686e9945f5c943f757 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 0f9a95a2de66067e8af6716c31d654dcff3a3b9a..7eb04a7cbd54b8dbc684a2801d67bf86f48beab6 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 7afb21796952fd8d88aa2f8e0845e2abb9108d9b..56f935559c21ba44f1d895bdccc6f614649be9c5 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 d813adb0750d5d1c4fb0c2ca8391ccd29bf8cb9f..a42e08b93f1e55ace76e0f928514ac4744d5a32a 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 00b6f82b670df25463d29864a8a3a5f63a437746..688ff738fed603778050d6875fbac57b72d0a039 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 37bbe61c24f5696fece395bd21fef23bf08412ec..30d186a2b5f90146d41b4d9268db11399a6e82b3 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 d762ac1070576c5990e7ef097d1da139dbdf07a3..2e5e68b5275e27c9c755cc71cc6a80366834ed51 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 c377e8bb7ac5849d60b711f6f1eaca720deec19f..93e3dc85202ef0dd11f8465f13de5a9ac322833a 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 b5c99deac81da383353839ce061ee37e61b2b8de..a216743645f6f9b105815166fd2fff59b9837db7 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 07dec2bec42668e7e7caa8f1f232aa0c72f6e6d3..db495d1e81c7f9b105260ba621c1241b23365437 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 4b3291e5b2b8f63ff3364ef2ba49af01bad3941c..d6fa262f48d0e455f791bdd3c559c512813379f6 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 441f2346b3410974787400a2b7c22e7e06a2ee70..0b8017066f12fb6fa88c5a5bf930df8979df054b 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 fdeb46b7ff8a369f619e07d1aebce8b8c5da012c..a319bba88c827ee006de7735576d16dd74152e78 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 f16df24bd16dceb55b0ccfd20933dfe496f7b8c9..579000d7c63681b7bd4f4d772183693e5e54062c 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 1188cc2c38c550b588d5fb9640fa33b289077fb6..e3973e264491fed4a3b0e6970a0585a27ef56907 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 32df80f7dfdc858720596b7f1593a1b1d836e3f9..e0fbf9fe891c1402f864c965e4cf4d6e2eb87da1 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 f29e3c5fb38face4abcd37a368517fe8bdc35e13..688d7362586c481e7fd64b16ebd7a28cc729580a 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 75bfe6fdb3e23be7b9ca9055b4d6ac4c82f8fba1..fe479d789bf85d6d7196fde97b17b77371adf3b3 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 ea5f3069a25e8f979b1c25268f99e2ec4ed7ac44..ae938d402582e9a87963775eeab6a0077d1b277a 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 407599c7ef7270af44692baeeb30fc52e2d9b883..a57bc628ff6b7c1cd4f290efb45740b24a22bb18 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 bd56a89008cca0619b7af99f3b817c58962def86..c9507240396ac72e74db4dd34147d3d4df8b9825 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 1bff3e7408b51f5835e1e7368b015d76f8a39576..58c7cb58e5b4c4c4223c0451fc64728724abcc20 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 61b133456a83d5a966bd92897dbe6e5a3ff242bc..5ad441a04a40b50098c7567829e2010d3853e38f 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 c8f852f08b2f147461c2ad9c4fe8c174d9b74836..7656d2d0ea2d8a7295222ed701c908f6cfdc1760 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 57f3348910d26b8720b58b6f67c2ddf61ae157e1..37001633477f2064777c9ceede85bbe9af9dfff5 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