Merge pull request #2732 from M00nF1sh/main_fix

fix failures during upgrade when using the default provided IngressClass and IngressClassParam

Author: k8s-ci-robot

helm/aws-load-balancer-controller/templates/ingressclass.yaml

@@ -1,16 +1,37 @@
+{{- /*
+[caution] AWSLoadBalancerController <= v2.4.2 expects referenced IngressClassParams to be created before IngressClass.
+We use a list here to force Helm create IngressClassParams(if any) before apply any IngressClass changes.
+*/}}
 {{- if .Values.createIngressClassResource }}
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
+apiVersion: v1
+kind: List
 metadata:
-  name: {{ .Values.ingressClass }}
-  labels:
-    {{- include "aws-load-balancer-controller.labels" . | nindent 4 }}
-spec:
-  controller: ingress.k8s.aws/alb
-  {{- if or .Values.ingressClassParams.create .Values.ingressClassParams.name }}
-  parameters:
-    apiGroup: elbv2.k8s.aws
-    kind: IngressClassParams
+  name: ingress-class
+items:
+{{- if .Values.ingressClassParams.create }}
+- apiVersion: elbv2.k8s.aws/v1beta1
+  kind: IngressClassParams
+  metadata:
     name: {{ include "aws-load-balancer-controller.ingressClassParamsName" . }}
+    labels:
+      {{- include "aws-load-balancer-controller.labels" . | nindent 6 }}
+  {{- with .Values.ingressClassParams.spec }}
+  spec:
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
+- apiVersion: networking.k8s.io/v1
+  kind: IngressClass
+  metadata:
+    name: {{ .Values.ingressClass }}
+    labels:
+      {{- include "aws-load-balancer-controller.labels" . | nindent 6 }}
+  spec:
+    controller: ingress.k8s.aws/alb
+    {{- if or .Values.ingressClassParams.name (and .Values.ingressClassParams.create .Values.ingressClassParams.spec) }}
+    parameters:
+      apiGroup: elbv2.k8s.aws
+      kind: IngressClassParams
+      name: {{ include "aws-load-balancer-controller.ingressClassParamsName" . }}
+    {{- end }}
+{{- end }}