feat: add ingressClassName

templates/ingress.yaml

@@ -13,6 +13,9 @@ metadata:
     {{- . | toYaml | nindent 4 }}
   {{- end }}
 spec:
+{{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className | quote }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
     - hosts:

test/linter/test.sh

@@ -55,6 +55,16 @@ if [ $? -eq 0 ]; then
   exit 1
 fi
 
+helm lint . --strict --set 'ingress.className={1,2,3}' --set 'ingress.host=google' --set 'ingress.path=/'
+if [ $? -eq 0 ]; then
+  exit 1
+fi
+
+helm lint . --strict --set 'ingress.className=nginx' --set 'ingress.host=google' --set 'ingress.path=/'
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+
 helm lint . --strict --set 'ui.extraEnv=false'
 if [ $? -eq 0 ]; then
   exit 1
@@ -69,5 +79,3 @@ helm lint . --strict --set 'ui.extraEnv[0].name=qwe' --set 'ui.extraEnv[0].value
 if [ $? -ne 0 ]; then
   exit -1
 fi
-
-

test/linter/values-lint.yaml

@@ -40,6 +40,6 @@ reconcile:
 ingress:
   host: "cmak"
   path: "/"
+  className: "nginx"
   labels:
     my.label: "my.value"
-

test/unit/ingress.yaml

@@ -29,3 +29,25 @@ tests:
       - equal:
           path: spec.rules[0].http.paths[0].pathType
           value: Prefix
+  - it: should not render spec.ingressClassName by default
+    set:
+      ingress:
+        host: myhost
+        path: /
+        pathType: Prefix
+    asserts:
+      - isEmpty:
+          path: spec.ingressClassName
+  - it: should render spec.ingressClassName if specified
+    set:
+      ingress:
+        host: myhost
+        path: /
+        pathType: Prefix
+        className: nginx
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: spec.ingressClassName
+          value: nginx

values.schema.json

@@ -187,6 +187,7 @@
         "path": { "type": "string", "title": "ingress path" },
         "pathType": { "type": "string", "title": "ingress pathType", "default": "ImplementationSpecific" },
         "tls": { "$ref": "#/definitions/tls" },
+        "className": { "type": ["null", "string"], "title": "ingress class name", "default": null },
         "labels": { "type": "object", "title": "optional ingress labels", "default": {} },
         "annotations": { "type": "object", "title": "optional ingress annotations", "default": {} }
       }

values.yaml

@@ -139,6 +139,7 @@ ingress: null
   # # ingress
   # path: /
   # pathType: ImplementationSpecific
+  # className: nginx
   #
   # # Enable TLS configuration for the hostname defined at ingress.host
   # # secret name will be "${ingress.host.replace(".", "-")}"
@@ -156,4 +157,3 @@ affinity: {}
 nodeSelector: {}
 
 tolerations: []
-