Merge pull request 'optional-ingress-class-name' (#317) from...

Merge pull request 'optional-ingress-class-name' (#317) from optional-ingress-class-name into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/317


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

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
@@ -72,4 +69,15 @@ tests:
     asserts:
       - equal:
           path: metadata.annotations.[nginx.ingress.kubernetes.io/proxy-body-size]
-          value: 42m
\ No newline at end of file
+          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