Commit a4b1a96f authored by Geoff Simmons's avatar Geoff Simmons

viking-test-app supports IngressClass.

parent 0ad1cdd4
...@@ -7,7 +7,6 @@ metadata: ...@@ -7,7 +7,6 @@ metadata:
app.kubernetes.io/component: ingress app.kubernetes.io/component: ingress
{{- include "viking-ingress.labels" . | nindent 4 }} {{- include "viking-ingress.labels" . | nindent 4 }}
annotations: annotations:
kubernetes.io/ingress.class: {{ .Values.ingress.class }}
{{- if .Values.vikingAdmSvc }} {{- if .Values.vikingAdmSvc }}
ingress.varnish-cache.org/varnish-svc: {{ .Values.vikingAdmSvc }} ingress.varnish-cache.org/varnish-svc: {{ .Values.vikingAdmSvc }}
{{- end }} {{- end }}
...@@ -15,6 +14,7 @@ metadata: ...@@ -15,6 +14,7 @@ metadata:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
ingressClassName: {{ .Values.ingress.class }}
{{- if hasKey .Values.ingress "tlsSecrets" }} {{- if hasKey .Values.ingress "tlsSecrets" }}
tls: tls:
{{- range $secret := .Values.ingress.tlsSecrets }} {{- range $secret := .Values.ingress.tlsSecrets }}
......
...@@ -22,8 +22,9 @@ apps: {} ...@@ -22,8 +22,9 @@ apps: {}
# externalName: "" # externalName: ""
ingress: ingress:
# Must match the Ingress class observed by the controller. # Must match the name of an IngressClass whose spec.controller
class: "varnish" # field matches the value that is required by the controller.
class: "viking-controller.uplex.de"
name: viking-ingress name: viking-ingress
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment