OZG_6513 resolve comments

Jenkinsfile

@@ -437,7 +437,7 @@ Void setNewGitopsVersion(String environment) {
 
     envFile = "${environment}/application/values/alfa-client-values.yaml"
     commitMessage = "jenkins rollout ${environment} alfa-client version ${IMAGE_TAG}";
-    setNewGitopsVersion(envFile, commitMessage);
+    setNewAlfaClientGitopsVersion(envFile, commitMessage);
 }
 
 Void setNewBarrierefreiheitVersion() {
@@ -462,6 +462,22 @@ Void setNewGitopsVersion(String envFile, String commitMessage) {
     }
 }
 
+Void setNewAlfaClientGitopsVersion(String envFile, String commitMessage) {
+    dir("gitops") {
+        def envVersions = readYaml file: envFile
+
+        envVersions.alfa_client.image.tag = IMAGE_TAG
+        envVersions.alfa_client.helm.version = HELM_CHART_VERSION
+
+        writeYaml file: envFile, data: envVersions, overwrite: true
+
+        if (hasValuesFileChanged(envFile)) {
+            sh "git add ${envFile}"
+            sh "git commit -m '${commitMessage}'"
+        }
+    }
+}
+
 String getCommitHash() {
     return "-${env.GIT_COMMIT.take(7)}";
 }

alfa-client/src/main/helm/templates/ingress.yaml

@@ -14,7 +14,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     {{- end }}
 spec:
-  {{- if and (.Values.ingress).className (ne (.Values).cluster_env "dataport") }}
+  {{- if (.Values.ingress).className }}
   ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   rules:
@@ -42,6 +42,6 @@ spec:
       - {{ include "app.baseDomain" . }}
       {{- if (.Values.ingress).tlsSecretName }}
       secretName: {{ (.Values.ingress).tlsSecretName }}
-      {{- else if ne (.Values).cluster_env "dataport" }}
+      {{- else }}
       secretName: {{ .Values.ozgcloud.bezeichner }}-{{ .Release.Name }}-tls
       {{- end }}
\ No newline at end of file

alfa-client/src/test/helm/deployment_imagepull_secret_test.yaml

@@ -28,12 +28,17 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
-set:
-  imagePullSecret: test-image-secret
+
 
 tests:
   - it: should use correct imagePull secret
+    set:
+      imagePullSecret: test-image-secret
     asserts:
       - equal:
           path: spec.template.spec.imagePullSecrets[0].name
-          value: test-image-secret
+          value: test-image-secret
\ No newline at end of file
+  - it: should fail template when image pull secret not set
+    asserts:
+      - failedTemplate:
+          errormessage: imagePullSecret must be set
\ No newline at end of file

alfa-client/src/test/helm/ingress_tests.yaml

@@ -38,20 +38,33 @@ tests:
     asserts:
       - isKind:
           of: Ingress
-  - it: should create ingress tls
+  - it: should create default ingress tls
     asserts:
       - equal:
           path: spec.tls[0].secretName
           value: helm-alfa-client-tls
+  - it: should set ingress tls
+    set: 
+      ingress:
+        tlsSecretName: client-tls
+    asserts:
+      - equal:
+          path: spec.tls[0].secretName
+          value: client-tls
 
-  - it: should not create ingress tls/ingressClass
-    set:
-      cluster_env: dataport
+  - it: should not create ingress tls/ingressClass by default 
     asserts:
       - isNull:
           path: spec.ingressClassName
-      - isNull:
-          path: spec.tls[0].secretName
+  - it: should set ingress tls/ingressClass
+    set:
+      ingress:
+        className: ingress
+    asserts:
+      - equal:
+          path: spec.ingressClassName
+          value: ingress
+
   
   - it: should use default letsencrypt-prod cluster-issuer
     asserts: