diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 14:33:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 14:33:14 +0100 |
| commit | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (patch) | |
| tree | 5cdf443e718788f8473148ce4d4205da54efbf04 /chart/templates/ingress.yaml | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | a808ac1fd8d4a42ee930bbb30cb6b58c810f828b (diff) | |
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'chart/templates/ingress.yaml')
| -rw-r--r-- | chart/templates/ingress.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index 811d98a22..e5c5e1dc6 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $fullName := include "mastodon.fullname" . -}} {{- $webPort := .Values.mastodon.web.port -}} {{- $streamingPort := .Values.mastodon.streaming.port -}} -{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }} +{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) -}} apiVersion: networking.k8s.io/v1 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 @@ -19,6 +19,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.ingress.ingressClassName }} + ingressClassName: {{ .Values.ingress.ingressClassName }} + {{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} |