diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index cbb3ae56d5105372f34de651e87da7b08d689402..c46a1c3532d369c915a8c038b2cbbb5fc24b60ca 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -201,11 +201,13 @@ spec: - name: ozgcloud_antragraum_url value: {{ quote (required "ozgcloud.antragraum.url must be set if ozgcloud.antragraum is enabled" ((.Values.ozgcloud).antragraum).url) }} - name: ozgcloud_antragraum_metadataUri - value: {{ quote (required "ozgcloud.antragraum.metadataUri must be set if ozgcloud.antragraum is enabled" ((.Values.ozgcloud).antragraum).metadataUri) }} + value: "file:/keystore/bayernid/metadata.xml" - name: ozgcloud_antragraum_decryptionPrivateKey value: "file:/keystore/bayernid/bayern-id.key" - name: ozgcloud_antragraum_decryptionCertificate value: "file:/keystore/bayernid/bayern-id.crt" + - name: ozgcloud_antragraum_entityId + value: {{ quote (required "ozgcloud.antragraum.entityId must be set if ozgcloud.antragraum is enabled" ((.Values.ozgcloud).antragraum).entityId) }} {{- end }} {{- if (((.Values.ozgcloud).feature).bescheid).enableDummyDocumentProcessor }} - name: ozgcloud_feature_bescheid_enableDummyDocumentProcessor diff --git a/src/test/helm/deployment_antragraum_test.yaml b/src/test/helm/deployment_antragraum_test.yaml index 7905ec79487182bc1e11c667a1a85528bad162af..0def5958d58429a5889774f8dc0c3cd49daff8cd 100644 --- a/src/test/helm/deployment_antragraum_test.yaml +++ b/src/test/helm/deployment_antragraum_test.yaml @@ -33,13 +33,13 @@ set: ozgcloud: environment: dev tests: - - it: should set antragraum values + - it: should set antragsraum values set: ozgcloud: antragraum: enabled: true url: https://antragraum.address - metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" + entityId: https://sso.dev.de/realms/by-antragsraum-idp asserts: - contains: path: spec.template.spec.containers[0].env @@ -55,7 +55,7 @@ tests: path: spec.template.spec.containers[0].env content: name: ozgcloud_antragraum_metadataUri - value: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" + value: "file:/keystore/bayernid/metadata.xml" - contains: path: spec.template.spec.containers[0].env content: @@ -82,12 +82,12 @@ tests: ozgcloud: antragraum: enabled: true - metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" + entityId: https://sso.dev.de/realms/by-antragsraum-idp asserts: - failedTemplate: errorMessage: "ozgcloud.antragraum.url must be set if ozgcloud.antragraum is enabled" - - it: should fail if metadataUri is not set + - it: should fail if entityId is not set set: ozgcloud: antragraum: @@ -95,7 +95,7 @@ tests: url: https://antragraum.address asserts: - failedTemplate: - errorMessage: "ozgcloud.antragraum.metadataUri must be set if ozgcloud.antragraum is enabled" + errorMessage: "ozgcloud.antragraum.entityId must be set if ozgcloud.antragraum is enabled" - it: should set volumeMounts @@ -104,7 +104,7 @@ tests: antragraum: enabled: true url: https://antragraum.address - metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" + entityId: https://sso.dev.de/realms/by-antragsraum-idp asserts: - contains: path: spec.template.spec.containers[0].volumeMounts @@ -129,7 +129,7 @@ tests: antragraum: enabled: true url: https://antragraum.address - metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml" + entityId: https://sso.dev.de/realms/by-antragsraum-idp asserts: - contains: path: spec.template.spec.volumes