diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index 717d5163f9f96a1c1210f623bfead5832f4e4b99..da5afb45286767cacd8a9b7d41c9e2476a8a52c9 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -50,11 +50,12 @@ spec: - name: ozgcloud-elster-transfer-operator image: "{{ (.Values.image).repo }}/{{ (.Values.image).name }}:{{ coalesce (.Values.image).tag "latest" }}" env: + - name: ETR_NAMESPACE + value: "{{ .Values.etrNamespace | default "elster-transfer" }}" {{- with include "app.getCustomList" . }} {{ . | indent 8 }} {{- end }} imagePullPolicy: Always - resources: {{- with .Values.resources }} {{ toYaml . | indent 10 }} diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java index 854dbfff8e33f0c8c81d639819d316e7274f3e1c..dce10f3a68297f68d287a1e771c0117e97b572ae 100644 --- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java +++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java @@ -23,14 +23,17 @@ */ package de.ozgcloud.operator.elstertransfer.user; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +@Configuration public class Constants { public static final String CONFIG_MAP_NAME = "etr-user-config"; public static final String USERS_KEY = "users.yaml"; public static final String ELSTER_TRANSFER_USER_LOGIN_KEY = "login"; public static final String ELSTER_TRANSFER_USER_PASSWORD_KEY = "password"; - // todo - public static final String ETR_NAMESPACE = "etr-user-creation"; + @Value("${etr.namespace}") + public static String ETR_NAMESPACE; public static final String USER_ROLE = "USER"; public static final String ETR_DEPLOYMENT_NAME = "elster-transfer"; public static final String MUK_USER_SECRET_NAME = "muk-user-secret"; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 16145789ecb0afaee2cbd8aa7053f7e3dba9f377..33c0991ee5718c0a480733e019dee2dbb861ff90 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -21,3 +21,8 @@ management: web: exposure: include: "*" + + +etr: + namespace: elster-transfer + \ No newline at end of file diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml index 44c53a51913fcd635e245646aaa025c054b86d4a..99c86d81964dd62c66c8896f1280b513c23c551b 100644 --- a/src/test/helm/deployment_env_test.yaml +++ b/src/test/helm/deployment_env_test.yaml @@ -69,3 +69,20 @@ tests: name: test_environment value: "B test value" + - it: should contain env ETR_NAMESPACE with default value + asserts: + - contains: + path: spec.template.spec.containers[0].env + content: + name: ETR_NAMESPACE + value: "elster-transfer" + + - it: should set env ETR_NAMESPACE + set: + etrNamespace: "elster-transfer2" + asserts: + - contains: + path: spec.template.spec.containers[0].env + content: + name: ETR_NAMESPACE + value: "elster-transfer2" \ No newline at end of file