Merge pull request #80 from erikwilson/bump-ingress-nginx

Update for rke2 ingress-nginx CI issues

packages/rke2-ingress-nginx/generated-changes/patch/templates/controller-daemonset.yaml.patch

@@ -1,12 +1,14 @@
 --- charts-original/templates/controller-daemonset.yaml
 +++ charts/templates/controller-daemonset.yaml
-@@ -63,9 +63,7 @@
+@@ -62,10 +62,8 @@
+     {{- end }}
      {{- end }}
        containers:
-         - name: controller
+-        - name: controller
 -          {{- with .Values.controller.image }}
 -          image: "{{.repository}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}}"
 -          {{- end }}
++        - name: rke2-ingress-nginx-controller
 +          image: "{{ template "system_default_registry" . }}{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}{{- if (.Values.controller.image.digest) -}} @{{.Values.controller.image.digest}} {{- end -}}"
            imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
          {{- if .Values.controller.lifecycle }}

packages/rke2-ingress-nginx/generated-changes/patch/templates/controller-deployment.yaml.patch

@@ -1,12 +1,14 @@
 --- charts-original/templates/controller-deployment.yaml
 +++ charts/templates/controller-deployment.yaml
-@@ -67,9 +67,7 @@
+@@ -66,10 +66,8 @@
+     {{- end }}
      {{- end }}
        containers:
-         - name: controller
+-        - name: controller
 -          {{- with .Values.controller.image }}
 -          image: "{{.repository}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}}"
 -          {{- end }}
++        - name: rke2-ingress-nginx-controller
 +          image: "{{ template "system_default_registry" . }}{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}{{- if (.Values.controller.image.digest) -}} @{{.Values.controller.image.digest}} {{- end -}}"
            imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
          {{- if .Values.controller.lifecycle }}

packages/rke2-ingress-nginx/generated-changes/patch/values.yaml.patch

@@ -52,6 +52,15 @@
  
    ## Annotations to be added to the controller Deployment or DaemonSet
    ##
+@@ -491,7 +492,7 @@
+     patch:
+       enabled: true
+       image:
+-        repository: docker.io/jettech/kube-webhook-certgen
++        repository: rancher/mirrored-jettech-kube-webhook-certgen
+         tag: v1.5.1
+         pullPolicy: IfNotPresent
+       ## Provide a priority class name to the webhook patching job
 @@ -608,8 +609,8 @@
  
    name: defaultbackend

packages/rke2-ingress-nginx/package.yaml

@@ -1,4 +1,4 @@
 url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-3.30.0/ingress-nginx-3.30.0.tgz
-packageVersion: 01
+packageVersion: 02
 # This repository does not use releaseCandidateVersions, so you can leave this as 00.
 releaseCandidateVersion: 00