From ca5553a063a46dd1e235ed4d15f83ba71df905ee Mon Sep 17 00:00:00 2001 From: Joost Buskermolen <j.buskermolen@fullstaq.com> Date: Wed, 24 Aug 2022 17:47:35 +0200 Subject: [PATCH 1/2] Add support for stable ingress apiVersion Signed-off-by: Joost Buskermolen <j.buskermolen@fullstaq.com> --- .../open-notificaties/templates/ingress.yaml | 42 +++++++++++++++++-- charts/open-zaak/templates/ingress.yaml | 16 ++++++- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/charts/open-notificaties/templates/ingress.yaml b/charts/open-notificaties/templates/ingress.yaml index f1a545f..b12b3e7 100644 --- a/charts/open-notificaties/templates/ingress.yaml +++ b/charts/open-notificaties/templates/ingress.yaml @@ -6,9 +6,11 @@ {{- $flowerFullName := include "open-notificaties.flowerFullname" . -}} {{- $flowerSvcPort := .Values.flower.service.port -}} {{- $flowerUrlPrefix := .Values.settings.flower.urlPrefix -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} +apiVersion: networking.k8s.io/v1 +{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress @@ -38,13 +40,33 @@ spec: paths: - path: / backend: + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + pathType: ImplementationSpecific + {{- end }} {{- if and ($flowerEnabled) (not $flowerIngressEnabled) }} - path: /{{ $flowerUrlPrefix }} backend: + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + service: + name: {{ $flowerFullName }} + port: + number: {{ $flowerSvcPort }} + {{- else }} serviceName: {{ $flowerFullName }} servicePort: {{ $flowerSvcPort }} + {{- end }} + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + pathType: ImplementationSpecific + {{- end }} {{- end }} {{- end }} {{- end }} @@ -54,9 +76,11 @@ spec: {{- $fullName := include "open-notificaties.flowerFullname" . -}} {{- $svcPort := .Values.flower.service.port -}} {{- $flowerUrlPrefix := .Values.settings.flower.urlPrefix -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} +apiVersion: networking.k8s.io/v1 +{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress @@ -86,7 +110,17 @@ spec: paths: - path: /{{ $flowerUrlPrefix }} backend: + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + pathType: ImplementationSpecific + {{- end }} {{- end }} {{- end }} diff --git a/charts/open-zaak/templates/ingress.yaml b/charts/open-zaak/templates/ingress.yaml index 6cd45db..1c8fe09 100644 --- a/charts/open-zaak/templates/ingress.yaml +++ b/charts/open-zaak/templates/ingress.yaml @@ -1,9 +1,11 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "open-zaak.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} +apiVersion: networking.k8s.io/v1 +{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{- else }} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress @@ -33,7 +35,17 @@ spec: paths: - path: / backend: + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + service: + name: {{ $fullName }} + port: + name: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end}} + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} + pathType: ImplementationSpecific + {{- end }} {{- end }} {{- end }} From 87c3238622f51d55ea04e203658f7e754482e768 Mon Sep 17 00:00:00 2001 From: Joost Buskermolen <j.buskermolen@fullstaq.com> Date: Wed, 24 Aug 2022 17:58:37 +0200 Subject: [PATCH 2/2] fix: Add className to spec Signed-off-by: Joost Buskermolen <j.buskermolen@fullstaq.com> --- .../open-notificaties/templates/ingress.yaml | 6 +++++ charts/open-notificaties/values.yaml | 1 + charts/open-zaak/Chart.yaml | 22 +++++++++---------- charts/open-zaak/templates/ingress.yaml | 3 +++ charts/open-zaak/values.yaml | 1 + 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/charts/open-notificaties/templates/ingress.yaml b/charts/open-notificaties/templates/ingress.yaml index b12b3e7..ac115d1 100644 --- a/charts/open-notificaties/templates/ingress.yaml +++ b/charts/open-notificaties/templates/ingress.yaml @@ -23,6 +23,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} @@ -93,6 +96,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} {{- if .Values.flower.ingress.tls }} tls: {{- range .Values.flower.ingress.tls }} diff --git a/charts/open-notificaties/values.yaml b/charts/open-notificaties/values.yaml index 847f242..93a5f5a 100644 --- a/charts/open-notificaties/values.yaml +++ b/charts/open-notificaties/values.yaml @@ -59,6 +59,7 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + className: "" hosts: - open-notificaties.gemeente.nl tls: [] diff --git a/charts/open-zaak/Chart.yaml b/charts/open-zaak/Chart.yaml index c1153e1..9b0f13d 100644 --- a/charts/open-zaak/Chart.yaml +++ b/charts/open-zaak/Chart.yaml @@ -6,14 +6,14 @@ type: application version: 0.8.1 appVersion: "1.7.1" -dependencies: - - name: postgresql - version: ~10.12.0 - repository: https://charts.bitnami.com/bitnami - tags: - - postgresql - - name: redis - version: ~13.0.0 - repository: https://charts.bitnami.com/bitnami - tags: - - redis +# dependencies: +# - name: postgresql +# version: ~10.12.0 +# repository: https://charts.bitnami.com/bitnami +# tags: +# - postgresql +# - name: redis +# version: ~13.0.0 +# repository: https://charts.bitnami.com/bitnami +# tags: +# - redis diff --git a/charts/open-zaak/templates/ingress.yaml b/charts/open-zaak/templates/ingress.yaml index 1c8fe09..bf9c831 100644 --- a/charts/open-zaak/templates/ingress.yaml +++ b/charts/open-zaak/templates/ingress.yaml @@ -18,6 +18,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/charts/open-zaak/values.yaml b/charts/open-zaak/values.yaml index d4fc912..f869477 100644 --- a/charts/open-zaak/values.yaml +++ b/charts/open-zaak/values.yaml @@ -59,6 +59,7 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + className: "" hosts: - open-zaak.gemeente.nl tls: []