Configure IngressClass for helm from values, and set common labels.

charts/viking-controller/templates/deployment.yaml

@@ -52,7 +52,9 @@ spec:
           imagePullPolicy: "{{ .Values.vikingController.image.pullPolicy }}"
           args:
             - -readyfile=/run/controller-ready
-            - -class={{ .Values.vikingController.ingressClass }}
+            {{- if  .Values.vikingController.ingressClassController }}
+            - -class={{ .Values.vikingController.ingressClassController }}
+            {{- end }}
           {{- if .Values.vikingController.namespace }}
             - -namespace={{ .Values.vikingController.namespace }}
           {{- end }}

charts/viking-controller/templates/ingress-class.yaml

 apiVersion: networking.k8s.io/v1
 kind: IngressClass
 metadata:
-  name: viking-controller.uplex.de
+  labels:
+    app.kubernetes.io/name: {{ template "viking-controller.name" . }}
+    helm.sh/chart: {{ template "viking-controller.chart" . }}
+    app.kubernetes.io/component: {{ template "viking-controller.fullname" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  name: {{ default "viking-controller.uplex.de" .Values.vikingController.ingressClass }}
 spec:
-  controller: viking.uplex.de/ingress-controller
+  controller: {{ default "viking.uplex.de/ingress-controller" .Values.vikingController.ingressClassController }}

charts/viking-controller/values.yaml

@@ -10,7 +10,17 @@ vikingController:
 
   ## Name of the ingress class to route through this controller
   ##
-  ingressClass: viking
+  # ingressClass: viking-controller.uplex.de
+
+  ## 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.
+  ##
+  ## This value is the default.
+  ##
+  # ingressClassController: viking.uplex.de/ingress-controller
 
   ## Only listen for resources in this namespace (default all)
   # namespace: