Bump ingress nginx helm chart to 4.3.0

Signed-off-by: Derek Nola <[email protected]>
rancher · Feb 15, 2023 · faa07b8 · faa07b8
1 parent c9d912e
commit faa07b8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 57 deletions.
diff --git a/packages/rke2-ingress-nginx/generated-changes/patch/Chart.yaml.patch b/packages/rke2-ingress-nginx/generated-changes/patch/Chart.yaml.patch
@@ -1,11 +1,11 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -28,7 +28,7 @@
+@@ -19,7 +19,7 @@
  - name: rikatz
  - name: strongjz
  - name: tao12345666333
 -name: ingress-nginx
 +name: rke2-ingress-nginx
  sources:
  - https://github.com/kubernetes/ingress-nginx
- type: application
+ version: 4.3.0
diff --git a/packages/rke2-ingress-nginx/generated-changes/patch/templates/clusterrole.yaml.patch b/packages/rke2-ingress-nginx/generated-changes/patch/templates/clusterrole.yaml.patch
@@ -1,26 +1,12 @@
 --- charts-original/templates/clusterrole.yaml
 +++ charts/templates/clusterrole.yaml
-@@ -82,6 +82,23 @@
-       - get
-       - list
-       - watch
-+  - apiGroups:
-+      - coordination.k8s.io
-+    resources:
-+      - leases
-+    verbs:
+@@ -34,6 +34,9 @@
+     resources:
+       - leases
+     verbs:
 +      - create
 +      - update
 +      - get
-+      - list
-+      - watch
-+  - apiGroups:
-+      - discovery.k8s.io
-+    resources:
-+      - endpointslices
-+    verbs:
-+      - list
-+      - watch
- {{- end }}
-
- {{- end }}
+       - list
+       - watch
+ {{- if and .Values.controller.scope.enabled .Values.controller.scope.namespace }}
diff --git a/packages/rke2-ingress-nginx/generated-changes/patch/values.yaml.patch b/packages/rke2-ingress-nginx/generated-changes/patch/values.yaml.patch
@@ -1,23 +1,6 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -18,14 +18,11 @@
-   image:
-     ## Keep false as default for now!
-     chroot: false
--    registry: k8s.gcr.io
--    image: ingress-nginx/controller
-+    repository: rancher/nginx-ingress-controller
-     ## for backwards compatibility consider setting the full image url via the repository value below
-     ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
-     ## repository:
--    tag: "v1.2.0"
--    digest: sha256:d8196e3bc1e72547c5dec66d6556c0ff92a23f6d0919b206be170bc90d5f9185
--    digestChroot: sha256:fb17f1700b77d4fcc52ca6f83ffc2821861ae887dbb87149cf5cbc52bea425e5
-+    tag: "nginx-1.4.1-hardened2"
-     pullPolicy: IfNotPresent
-     # www-data -> uid 101
-     runAsUser: 101
-@@ -35,7 +32,7 @@
+@@ -35,7 +35,7 @@
    existingPsp: ""
 
    # -- Configures the controller container name
@@ -26,7 +9,7 @@
 
    # -- Configures the ports that the nginx-controller listens on
    containerPort:
-@@ -63,7 +60,7 @@
+@@ -63,7 +63,7 @@
    # -- Optionally change this to ClusterFirstWithHostNet in case you have 'hostNetwork: true'.
    # By default, while using host network, name resolution uses the host's DNS. If you wish nginx-controller
    # to keep resolving names inside the k8s network, use ClusterFirstWithHostNet.
@@ -35,7 +18,7 @@
 
    # -- Bare-metal considerations via the host network https://kubernetes.github.io/ingress-nginx/deploy/baremetal/#via-the-host-network
    # Ingress status was blank because there is no Service exposing the NGINX Ingress controller in a configuration using the host network, the default --publish-service flag used in standard cloud setups does not apply
-@@ -72,7 +69,7 @@
+@@ -72,7 +72,7 @@
    # -- Process Ingress objects without ingressClass annotation/ingressClassName field
    # Overrides value for --watch-ingress-without-class flag of the controller binary
    # Defaults to false
@@ -44,7 +27,7 @@
 
    # -- Process IngressClass per name (additionally as per spec.controller).
    ingressClassByName: false
-@@ -81,7 +78,7 @@
+@@ -81,7 +81,7 @@
    # their own *-snippet annotations, otherwise this is forbidden / dropped
    # when users add those annotations.
    # Global snippets in ConfigMap are still respected
@@ -53,7 +36,7 @@
 
    # -- Required for use with CNI based kubernetes installations (such as ones set up by kubeadm),
    # since CNI and hostport don't mix yet. Can be deprecated once https://github.com/kubernetes/kubernetes/issues/23920
-@@ -92,7 +89,7 @@
+@@ -92,7 +92,7 @@
    ## Disabled by default
    hostPort:
      # -- Enable 'hostPort' or not
@@ -62,7 +45,7 @@
      ports:
        # -- 'hostPort' http port
        http: 80
-@@ -141,7 +138,7 @@
+@@ -141,7 +141,7 @@
    # node or nodes where an ingress controller pod is running.
    publishService:
      # -- Enable 'publishService' or not
@@ -71,7 +54,7 @@
      # -- Allows overriding of the publish service to bind to
      # Must be <namespace>/<service_name>
      pathOverride: ""
-@@ -191,7 +188,7 @@
+@@ -191,7 +191,7 @@
    #         name: secret-resource
 
    # -- Use a `DaemonSet` or `Deployment`
@@ -80,7 +63,7 @@
 
    # -- Annotations to be added to the controller Deployment or DaemonSet
    ##
-@@ -441,7 +438,7 @@
+@@ -441,7 +441,7 @@
      configMapKey: ""
 
    service:
@@ -89,26 +72,27 @@
 
      # -- If enabled is adding an appProtocol option for Kubernetes service. An appProtocol field replacing annotations that were
      # using for setting a backend protocol. Here is an example for AWS: service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
-@@ -630,13 +627,11 @@
+@@ -641,13 +641,11 @@
      patch:
        enabled: true
        image:
--        registry: k8s.gcr.io
+-        registry: registry.k8s.io
 -        image: ingress-nginx/kube-webhook-certgen
 +        repository: rancher/mirrored-ingress-nginx-kube-webhook-certgen
          ## for backwards compatibility consider setting the full image url via the repository value below
          ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
          ## repository:
-         tag: v1.1.1
--        digest: sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660
+-        tag: v20220916-gd32f8c343
+-        digest: sha256:39c5b2e3310dc4264d638ad28d9d1d96c4cbb2b2dcfb52368fe4e3c63f61e10f
++        tag: v1.5.2
          pullPolicy: IfNotPresent
        # -- Provide a priority class name to the webhook patching job
        ##
-@@ -757,12 +752,11 @@
+@@ -772,12 +770,11 @@
 
    name: defaultbackend
    image:
--    registry: k8s.gcr.io
+-    registry: registry.k8s.io
 -    image: defaultbackend-amd64
 +    repository: rancher/nginx-ingress-controller-defaultbackend
      ## for backwards compatibility consider setting the full image url via the repository value below
@@ -119,7 +103,7 @@
      pullPolicy: IfNotPresent
      # nobody user -> uid 65534
      runAsUser: 65534
-@@ -924,3 +918,6 @@
+@@ -943,3 +940,6 @@
  # This can be generated with: `openssl dhparam 4096 2> /dev/null | base64`
  ## Ref: https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/ssl-dh-param
  dhParam:

diff --git a/packages/rke2-ingress-nginx/package.yaml b/packages/rke2-ingress-nginx/package.yaml
@@ -1,4 +1,4 @@
-url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.1.0/ingress-nginx-4.1.0.tgz
-packageVersion: 08
+url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.3.0/ingress-nginx-4.3.0.tgz
+packageVersion: 09
 # This repository does not use releaseCandidateVersions, so you can leave this as 00.
 releaseCandidateVersion: 00