Update Nginx Ingress Controller to helm-chart-4.11.2

Change-Id: Ia8e32260a0a15bc230095a89a69096b2683d2639
Signed-off-by: Gleb Aronsky <gleb.aronsky@windriver.com>

helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/changelog

@@ -1,3 +1,10 @@
+
+ingress-nginx-helm (helm-chart-4.11.2) unstable; urgency=medium
+
+  * App upversion
+
+ -- Gleb Aronsky <gleb.aronsky@windriver.com>  Fri, 27 Sep 2024 09:20:54
+
 ingress-nginx-helm (4.10-1) unstable; urgency=medium
 
   * App upversion

helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-PATCH-Add-Tolerations-to-daemonsets.patch

@@ -0,0 +1,27 @@
+From 360330a8febb0b66933a3560866a448b2a90c8b1 Mon Sep 17 00:00:00 2001
+From: Gleb Aronsky <gleb.aronsky@windriver.com>
+Date: Fri, 27 Sep 2024 09:20:51 -0700
+Subject: [PATCH] [PATCH] Add Tolerations to daemonsets
+
+---
+ charts/ingress-nginx/values.yaml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
+index fbd0b31cf..3cb670370 100644
+--- a/charts/ingress-nginx/values.yaml
++++ b/charts/ingress-nginx/values.yaml
+@@ -240,7 +240,9 @@ controller:
+   # -- Node tolerations for server scheduling to nodes with taints
+   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+   ##
+-  tolerations: []
++  tolerations:
++    - {"key": "node-role.kubernetes.io/control-plane", "operator": "Exists", "effect": "NoSchedule"}
++    - {"key": "node-role.kubernetes.io/master", "operator": "Exists", "effect": "NoSchedule"}
+   #  - key: "key"
+   #    operator: "Equal|Exists"
+   #    value: "value"
+--
+2.25.1
+

helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-add-toleration-fluxcd.patch

@@ -1,38 +0,0 @@
-From dd376b4c04c311756a302cbaf672cf9fb3f7e903 Mon Sep 17 00:00:00 2001
-From: amantri <ayyappa.mantri@windriver.com>
-Date: Thu, 11 Jul 2024 14:09:28 -0400
-Subject: [PATCH] Add toleration to daemonset
-
----
- charts/ingress-nginx/values.yaml | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
-index 68f8b58..ed6d68c 100644
---- a/charts/ingress-nginx/values.yaml
-+++ b/charts/ingress-nginx/values.yaml
-@@ -226,12 +226,20 @@ controller:
-   # -- Node tolerations for server scheduling to nodes with taints
-   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-   ##
--  tolerations: []
-+  # tolerations: []
-   #  - key: "key"
-   #    operator: "Equal|Exists"
-   #    value: "value"
-   #    effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
-
-+  tolerations:
-+    - key: "node-role.kubernetes.io/master"
-+      operator: "Exists"
-+      effect: "NoSchedule"
-+    - key: "node-role.kubernetes.io/control-plane"
-+      operator: "Exists"
-+      effect: "NoSchedule"
-+
-   # -- Affinity and anti-affinity rules for server scheduling to nodes
-   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-   ##
---
-2.25.1
-

helm-charts/upstream/ingress-nginx-helm/debian/meta_data.yaml

@@ -1,15 +1,14 @@
----
 debname: ingress-nginx-helm
-debver: 4.10-1
+debver: 4.11-2
 dl_path:
-  name: ingress-nginx-helm-chart-4.10.1.tar.gz
+  name: ingress-nginx-helm-chart-4.11.2.tar.gz
-  url: https://github.com/kubernetes/ingress-nginx/archive/refs/tags/helm-chart-4.10.1.tar.gz
+  sha256sum: ccc0a9def7ad02e567c8e2335189b717444653c7213b9f23846db5a169cc5a90
-  sha256sum: 07348d9b68e38d5fd59afae7a5671a05bbeca7e97e90af41020d9a2c0f0e0ffe
+  url: https://github.com/kubernetes/ingress-nginx/archive/refs/tags/helm-chart-4.11.2.tar.gz
-src_files:
-  - ingress-nginx-helm/files/Makefile
 revision:
-  dist: $STX_DIST
-  stx_patch: 0
   GITREVCOUNT:
     BASE_SRCREV: 0eceb0371b546979204e7c7b88416a2b641aac29
     SRC_DIR: ${MY_REPO}/stx/nginx-ingress-controller-armada-app/helm-charts/upstream/ingress-nginx-helm
+  dist: $STX_DIST
+  stx_patch: 0
+src_files:
+- ingress-nginx-helm/files/Makefile

stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/ingress-nginx-static-overrides.yaml

@@ -4,20 +4,21 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-imagePullSecrets: [{"name": "default-registry-key"}]
+imagePullSecrets:
+  - name: default-registry-key
 controller:
   # This fixes CVE-2023-5044: https://github.com/kubernetes/ingress-nginx/issues/10572
   enableAnnotationValidations: true
   kind: DaemonSet
   image:
     # cleans the default digest value since sysinv changes the digest when pushing the image to the local registry
-    digest: ""
+    digest: ''
     repository: registry.k8s.io/ingress-nginx/controller
-    tag: v1.10.1
+    tag: v1.11.2
   daemonset:
     useHostPort: false
   nodeSelector:
-    node-role.kubernetes.io/control-plane: ""
+    node-role.kubernetes.io/control-plane: ''
   config:
     # https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/
     nginx-status-ipv4-whitelist: 0.0.0.0/0
@@ -29,7 +30,7 @@ controller:
   scope:
     enabled: false
   service:
-    type: ""
+    type: ''
   hostNetwork: true
   livenessProbe:
     timeoutSeconds: 5
@@ -45,16 +46,16 @@ controller:
     port: 5443
     patch:
       image:
-        digest: ""
+        digest: ''
         repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen
-        tag: v1.4.1
+        tag: v1.4.3
       tolerations:
-        - key: "node-role.kubernetes.io/master"
+        - key: node-role.kubernetes.io/master
-          operator: "Exists"
+          operator: Exists
-          effect: "NoSchedule"
+          effect: NoSchedule
-        - key: "node-role.kubernetes.io/control-plane"
+        - key: node-role.kubernetes.io/control-plane
-          operator: "Exists"
+          operator: Exists
-          effect: "NoSchedule"
+          effect: NoSchedule
     createSecretJob:
       resources:
         requests:
@@ -78,13 +79,13 @@ controller:
     image: registry.k8s.io/ingress-nginx/opentelemetry:v20230721-3e2062ee5
 defaultBackend:
   image:
-    digest: ""
+    digest: ''
     repository: registry.k8s.io/defaultbackend-amd64
-    tag: "1.5"
+    tag: '1.5'
   nodeSelector:
-    node-role.kubernetes.io/control-plane: ""
+    node-role.kubernetes.io/control-plane: ''
   service:
-    type: ""
+    type: ''
   resources:
     requests:
       cpu: 0