OZG-6177 set ETR_NAMESPACE from env

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 }}

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";

src/main/resources/application.yml

@@ -21,3 +21,8 @@ management:
     web:
       exposure:
         include: "*"
+
+
+etr:
+  namespace: elster-transfer
+  
\ No newline at end of file

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