Merge branch 'master' into OZG-3934-Fix-Cypress-Screenshots

alfa-service/pom.xml

@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.itvsh.ozg</groupId>
 		<artifactId>goofy</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>1.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>alfa-service</artifactId>

alfa-xdomea/pom.xml

@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.itvsh.ozg</groupId>
 		<artifactId>goofy</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>1.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>alfa-xdomea</artifactId>

goofy-client/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.itvsh.ozg</groupId>
 		<artifactId>goofy</artifactId>
-		<version>1.16.0-SNAPSHOT</version>
+		<version>1.17.0-SNAPSHOT</version>
 	</parent>
 
     <modelVersion>4.0.0</modelVersion>

goofy-server/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.itvsh.ozg</groupId>
     <artifactId>goofy</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>goofy-server</artifactId>

pom.xml

@@ -30,7 +30,7 @@
 
 	<groupId>de.itvsh.ozg</groupId>
 	<artifactId>goofy</artifactId>
-	<version>1.16.0-SNAPSHOT</version>
+	<version>1.17.0-SNAPSHOT</version>
 	<name>Goofy Parent</name>
 	<packaging>pom</packaging>
 

src/main/helm/templates/ingress.yaml

@@ -35,8 +35,8 @@ metadata:
   name: {{ include "app.name" . }}
   namespace: {{ include "app.namespace" . }}
 spec:
-  {{- if ne (.Values).cluster_env "dataport"}}
-  ingressClassName: nginx
+  {{- if and (.Values.ingress).className (ne (.Values).cluster_env "dataport") }}
+  ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   rules:
     - http:

src/test/helm/deployment_defaults_annotaion_test.yaml

@@ -36,9 +36,8 @@ tests:
       - equal:
           path: metadata.annotations.[cert-manager.io/cluster-issuer]
           value: letsencrypt-prod
-      - equal:
+      - isNull:
           path: spec.ingressClassName
-          value: nginx
       - equal:
           path: spec.tls[0].secretName
           value: helm-goofy-tls

src/test/helm/ingress-nginx-tests.yaml

@@ -29,11 +29,8 @@ release:
 templates:
   - templates/ingress.yaml
 tests:
-  - it: should create ingress tls/ingressClass
+  - it: should create ingress tls
     asserts:
-      - equal:
-          path: spec.ingressClassName
-          value: nginx
       - equal:
           path: spec.tls[0].secretName
           value: helm-goofy-tls
@@ -73,3 +70,14 @@ tests:
       - equal:
           path: metadata.annotations.[nginx.ingress.kubernetes.io/proxy-body-size]
           value: 42m
+  - it: should not set ingressClassName
+    asserts:
+      - isNull:
+          path: spec.ingressClassName
+  - it: should set ingressClassName
+    set:
+      ingress.className: nginx
+    asserts:
+      - equal:
+          path: spec.ingressClassName
+          value: nginx
\ No newline at end of file