Use IngressClass in the helm tests/examples, all passing e2e tests.

examples/architectures/cluster-and-ns-wide/values-varnish.yaml

@@ -2,10 +2,6 @@ nameOverride: varnish-ingress
 fullnameOverride: varnish-ingress
 vikingService:
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   # labels to add to the pod container metadata
   podLabels:
     app: varnish-ingress

examples/architectures/clusterwide/values-varnish.yaml

@@ -2,10 +2,6 @@ nameOverride: varnish-ingress
 fullnameOverride: varnish-ingress
 vikingService:
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   # labels to add to the pod container metadata
   podLabels:
     app: varnish-ingress

examples/architectures/multi-controller/values-coffee.yaml

@@ -4,8 +4,8 @@ apps:
     replicas: 2
 
 ingress:
+  class: varnish-coffee-class
   name: coffee-ingress
-  class: varnish-coffee
   rules:
   - host: coffee.example.com
     paths:

examples/architectures/multi-controller/values-controller.yaml

@@ -2,7 +2,15 @@ vikingController:
 
   ## Name of the ingress class to route through this controller
   ##
-  ingressClass: varnish-coffee
+  ingressClass: varnish-coffee-class
+
+  ## The controller only considers Ingresses that specify an
+  ## IngressClass with this value in its spec.controller field. If
+  ## that IngressClass is also specified as the cluster default, the
+  ## controller will assume it for Ingresses that do not specify an
+  ## IngressClass.
+  ##
+  ingressClassController: varnish-coffee/ingress-controller
 
   # labels to add to the pod container metadata
   podLabels:

examples/architectures/multi-controller/values-varnish.yaml

 vikingService:
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   # labels to add to the pod container metadata
   podLabels:
     app: varnish-ingress

examples/architectures/multi-controller/verify.sh

@@ -30,9 +30,9 @@ varnishtest ${TESTOPTS} -Dcoffeeport=${COFFEEPORT} -Dteaport=${TEAPORT} cafe.vtc
 CTLPOD=$(kubectl get pods -n kube-system -l app=varnish-ingress-controller,example!=coffee -o jsonpath={.items[0].metadata.name})
 
 # Match the logs
-kubectl logs -n kube-system $CTLPOD | grep -q 'Ingress class:varnish' 
+kubectl logs -n kube-system $CTLPOD | grep -q 'Ingress class:viking.uplex.de/ingress-controller'
 kubectl logs -n kube-system $CTLPOD | grep -q 'Ingress cafe/tea-ingress configured for Varnish Service cafe/varnish-tea'
-kubectl logs -n kube-system $CTLPOD | grep -q "Ignoring Ingress cafe/coffee-ingress, Annotation 'kubernetes.io/ingress.class' absent or is not 'varnish'"
+kubectl logs -n kube-system $CTLPOD | grep -q "Ignoring Ingress cafe/coffee-ingress, IngressClass 'varnish-coffee-class' does not specify 'viking.uplex.de/ingress-controller'"
 
 # Parse the coffee controller log for these lines
 # Ingress class:varnish-coffee
@@ -43,6 +43,6 @@ kubectl logs -n kube-system $CTLPOD | grep -q "Ignoring Ingress cafe/coffee-ingr
 CTLPOD=$(kubectl get pods -n kube-system -l app=varnish-ingress-controller -l example=coffee -o jsonpath={.items[0].metadata.name})
 
 # Match the logs
-kubectl logs -n kube-system $CTLPOD | grep -q 'Ingress class:varnish-coffee' 
+kubectl logs -n kube-system $CTLPOD | grep -q 'Ingress class:varnish-coffee/ingress-controller'
 kubectl logs -n kube-system $CTLPOD | grep -q 'Ingress cafe/coffee-ingress configured for Varnish Service cafe/varnish-coffee'
-kubectl logs -n kube-system $CTLPOD | grep -q "Ignoring Ingress cafe/tea-ingress, Annotation 'kubernetes.io/ingress.class' absent or is not 'varnish-coffee'"
+kubectl logs -n kube-system $CTLPOD | grep -q "Ignoring Ingress cafe/tea-ingress, IngressClass 'viking-controller.uplex.de' does not specify 'varnish-coffee/ingress-controller'"

examples/architectures/multi-varnish-ns/values-varnish.yaml

 vikingService:
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   # labels to add to the pod container metadata
   podLabels:
     app: varnish-ingress

examples/file-cache/values-varnish.yaml

 vikingService:
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   kind: StatefulSet
   persistentVolume:
     enabled: true

examples/namespace/values-controller.yaml

@@ -2,7 +2,15 @@ vikingController:
 
   ## Name of the ingress class to route through this controller
   ##
-  ingressClass: varnish
+  ingressClass: varnish-ns
+
+  ## The controller only considers Ingresses that specify an
+  ## IngressClass with this value in its spec.controller field. If
+  ## that IngressClass is also specified as the cluster default, the
+  ## controller will assume it for Ingresses that do not specify an
+  ## IngressClass.
+  ##
+  ingressClassController: varnish-ns/ingress-controller
 
   ## Only listen for resources in this namespace (default all)
   namespace: varnish-ingress

examples/namespace/values-varnish.yaml

@@ -4,10 +4,6 @@ vikingService:
   varnish:
     extraArgs: []
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   # labels to add to the pod container metadata
   podLabels:
     app: varnish-ingress

examples/svctypes/values-lb.yaml

@@ -4,10 +4,6 @@ vikingService:
   service:
     type: LoadBalancer
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   replicaCount: 1
 
   # labels to add to the pod container metadata

examples/svctypes/values-nodeport.yaml

@@ -4,10 +4,6 @@ vikingService:
   service:
     type: NodePort
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   replicaCount: 1
 
   # labels to add to the pod container metadata

examples/varnish_pod_template/values-cli-args-varnish.yaml

@@ -10,10 +10,6 @@ vikingService:
       - -p
       - workspace_client=256k
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   replicaCount: 1
 
   # labels to add to the pod container metadata

examples/varnish_pod_template/values-env-varnish.yaml

@@ -35,10 +35,6 @@ vikingService:
     - name: VARNISH_READY_PORT
       value: "8000"
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   replicaCount: 1
 
   # labels to add to the pod container metadata

examples/varnish_pod_template/values-nonroot-varnish.yaml

@@ -9,10 +9,6 @@ vikingService:
     fsGroup: 998
     runAsUser: 102
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   replicaCount: 1
 
   # labels to add to the pod container metadata

examples/varnish_pod_template/values-proxy-varnish.yaml

@@ -6,10 +6,6 @@ vikingService:
     - name: PROTO
       value: PROXY
 
-  ## Name of the ingress class to route through this controller
-  ##
-  ingressClass: varnish
-
   replicaCount: 1
 
   # labels to add to the pod container metadata

test/e2e/probeCfg/values-controller.yaml

 vikingController:
-  ingressClass: viking-probeCfg
+  ingressClass: viking-probe-cfg
+  ingressClassController: viking-probe-cfg/ingress-controller
 
   namespace: probe-cfg
 

test/e2e/probeCfg/values.yaml

@@ -10,7 +10,7 @@ apps:
 
 ingress:
   name: probe-cfg-ingress
-  class: viking-probeCfg
+  class: viking-probe-cfg
   rules:
   - host: cafe.example.com
     paths:

test/e2e/tmplcfg/values-controller.yaml

 vikingController:
 
   ingressClass: viking-dev
+  ingressClassController: viking-dev.uplex.de/ingress-controller
 
   namespace: dev