Unverified Commit f98e25ef authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

fix: make ingress.className value optional 

In order to be backwards-compatible with old controllers, cannot set
ingressClassName on the Ingress. And we cannot rely on having having the
ability to list IngressClass resources, as this is a new cluster level
permission that needs its own RBAC. Instead, we just expose the value
and use it for both the annotation kubernetes.io/ingress.class AND the
ingressClassName field on the Ingress resource.
parent 4484dc83

assets/auto-deploy-app/README.md

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
| service.extraPorts.protocol | Protocol of the service port definition | `nil` |

| service.extraPorts.name | Name of the service port definition | `nil` |

| ingress.enabled               | If true, enables ingress | `true`                |

| ingress.className             | The name of the ingress class to use | `nginx`                |

| ingress.className             | The name of the ingress class to use. When present, sets `ingressClassName` and `kubernetes.io/ingress.class` as appropriate. | `nil`                |

| ingress.path                  | Default path for the ingress | `/` |

| ingress.tls.enabled           | If true, enables SSL | `true`                    |

| ingress.tls.acme              | Controls `kubernetes.io/tls-acme` annotation | `true` |

assets/auto-deploy-app/templates/_ingress-annotations.yaml

+1 −1
Original line number Diff line number Diff line 
kubernetes.io/ingress.class: {{ .Values.ingress.className | quote }}

kubernetes.io/ingress.class: {{ .Values.ingress.className | default "nginx" | quote }}

{{- if .Values.ingress.tls.enabled }}

kubernetes.io/tls-acme: {{ .Values.ingress.tls.acme | quote }}

{{- end }}

assets/auto-deploy-app/templates/ingress.yaml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ metadata: 
  annotations:

{{ include "ingress.annotations" . | indent 4 }}

spec:

{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}

{{- if and .Values.ingress.className (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") }}

  ingressClassName: {{ .Values.ingress.className | quote }}

{{- end }}

{{- if .Values.ingress.tls.enabled }}

assets/auto-deploy-app/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ ingress: 
    acme: true

    secretName: ""

    useDefaultSecret: false

  className: nginx

  # className: nginx

  modSecurity:

    enabled: false

    secRuleEngine: "DetectionOnly"