From 1025eabd3b4b4d8d0ad33bd9d76f2f1b60d01c92 Mon Sep 17 00:00:00 2001 From: Ashish Tiwari Date: Mon, 15 Jan 2024 10:54:15 +0530 Subject: [PATCH 1/2] fix: allow configuring apiVersion in Ingress Class resource --- charts/apisix-ingress-controller/templates/ingress-class.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/apisix-ingress-controller/templates/ingress-class.yaml b/charts/apisix-ingress-controller/templates/ingress-class.yaml index 01206140..af0522be 100644 --- a/charts/apisix-ingress-controller/templates/ingress-class.yaml +++ b/charts/apisix-ingress-controller/templates/ingress-class.yaml @@ -1,4 +1,8 @@ +{{ if (eq .Values.config.kubernetes.ingressVersion "") }} apiVersion: networking.k8s.io/v1 +{{- else }} +apiVersion: {{ .Values.config.kubernetes.ingressVersion }} +{{- end }} kind: IngressClass metadata: name: {{ .Values.config.kubernetes.ingressClass | quote }} From 086b4126945307e1831d4012d7ecffdfe9b1e1d1 Mon Sep 17 00:00:00 2001 From: Ashish Tiwari Date: Thu, 18 Jan 2024 10:39:10 +0530 Subject: [PATCH 2/2] apply suggestions Signed-off-by: Ashish Tiwari --- charts/apisix-ingress-controller/templates/ingress-class.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/apisix-ingress-controller/templates/ingress-class.yaml b/charts/apisix-ingress-controller/templates/ingress-class.yaml index af0522be..0099b3a4 100644 --- a/charts/apisix-ingress-controller/templates/ingress-class.yaml +++ b/charts/apisix-ingress-controller/templates/ingress-class.yaml @@ -1,5 +1,7 @@ -{{ if (eq .Values.config.kubernetes.ingressVersion "") }} +{{ if or (eq .Values.config.kubernetes.ingressVersion "") (eq .Values.config.kubernetes.ingressVersion "networking/v1")}} apiVersion: networking.k8s.io/v1 +{{- else if (eq .Values.config.kubernetes.ingressVersion "networking/v1beta1")}} +apiVersion: networking.k8s.io/v1beta1 {{- else }} apiVersion: {{ .Values.config.kubernetes.ingressVersion }} {{- end }}