diff --git a/alfa-server/src/main/resources/application-dev.yml b/alfa-server/src/main/resources/application-dev.yml index 6f11904235f17602539afaca47cd695e69deee8b..ec9f40e322dac00e4bc6dd3f274cfb6d481610da 100644 --- a/alfa-server/src/main/resources/application-dev.yml +++ b/alfa-server/src/main/resources/application-dev.yml @@ -14,7 +14,3 @@ ozgcloud: production: false stage: production: false - xdomea: - behoerdenschluessel: "DUMMY-SCHLUESSEL" - behoerdenschluessel-uri: "DUMMY-URI" - behoerdenschluessel-version: "DUMMY-VERSION" \ No newline at end of file diff --git a/alfa-server/src/main/resources/application-e2e.yml b/alfa-server/src/main/resources/application-e2e.yml index fd8c68442dd1afef3e6dc9f76d2932e0d7b2fc58..1f162b5430da5727476ee84d73e8cdc8dfa51e63 100644 --- a/alfa-server/src/main/resources/application-e2e.yml +++ b/alfa-server/src/main/resources/application-e2e.yml @@ -13,7 +13,3 @@ ozgcloud: url: /assets/benutzerleitfaden/benutzerleitfaden.pdf user-manager: url: http://localhost:9092 - xdomea: - behoerdenschluessel: "DUMMY-SCHLUESSEL-E2E" - behoerdenschluessel-uri: "DUMMY-URI-E2E" - behoerdenschluessel-version: "DUMMY-VERSION-E2E" \ No newline at end of file diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml index aaf3f0290c0eb6de18d5e6e208c4b7886e463486..38c43bdefbee0c9befc41ed5a8f12cafc11a8aae 100644 --- a/alfa-server/src/main/resources/application.yml +++ b/alfa-server/src/main/resources/application.yml @@ -100,7 +100,3 @@ ozgcloud: user-manager: profile-template: /api/userProfiles/%s search-template: /api/userProfiles/?searchBy={searchBy} - xdomea: - behoerdenschluessel: - behoerdenschluessel-uri: - behoerdenschluessel-version: diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index 91335d88865df4177cdc971a2585193d9811cf61..dee4ff11986a60ffd249b81196fb6991df707d12 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -107,12 +107,6 @@ spec: value: {{ $bescheid.formEngineName }} {{- end }} {{- end}} - - name: ozgcloud_xdomea_behoerdenschluessel - value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluessel | quote }} - - name: ozgcloud_xdomea_behoerdenschluesselUri - value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}} - - name: ozgcloud_xdomea_behoerdenschluesselVersion - value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }} - name: ozgcloud_administration_address value: {{ include "app.spring_cloud_config_administration_address" . }} - name: grpc_client_zufi-manager_address diff --git a/src/test/helm/deployment_xdomea_env_test.yaml b/src/test/helm/deployment_xdomea_env_test.yaml deleted file mode 100644 index 351acfe65758cf0fda278e66a28e7b7eed3085e1..0000000000000000000000000000000000000000 --- a/src/test/helm/deployment_xdomea_env_test.yaml +++ /dev/null @@ -1,55 +0,0 @@ -suite: deployment xdomea env -release: - name: alfa - namespace: sh-helm-test -templates: - - templates/deployment.yaml -set: - baseUrl: test.company.local - ozgcloud: - environment: test - bundesland: sh - bezeichner: helm - sso: - serverUrl: https://sso.company.local - imagePullSecret: image-pull-secret -tests: - - it: should not require on behoerdenschlüssel properties - set: - # note: explicitly non-set behoerdenschlüssel properties - asserts: - - notContains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_xdomea_behoerdenschluessel - - notContains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_xdomea_behoerdenschluesselUri - - notContains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_xdomea_behoerdenschluesselVersion - - it: should set (optional) behoerdenschlüssel properties - 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_behoerdenschluessel - value: "123456" - - contains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_xdomea_behoerdenschluesselUri - value: "uri.uri:uri" - - contains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_xdomea_behoerdenschluesselVersion - value: "version 1" \ No newline at end of file