From 06070f12cef752b0c0fdf5ad0c5389f0b074b35b Mon Sep 17 00:00:00 2001 From: amantri Date: Thu, 3 Oct 2024 10:59:59 -0400 Subject: [PATCH] Upversion nginx app to v4.11.1 Update nginx helm chart to v4.11.1 to pick up latest CVE fixes Test Cases: PASS: Install system,bootstrap with new images and verify it is successful with latest k8s v1.29.2 PASS: Deploy kaurd app by exposing service using nginx ingress controller with cert issued by stepca using ACME protocol PASS: Test snmp app with nginx overrides, try snmpbulkget with success with no error on nginx pods PASS: Run ansible bootstrap playbook with new image on k8s v1.24.4 and verify that both apps are applied successfully and all nginx,cert-manager pods are running without issues PASS: Perform platform upgrade and notice that nginx app is successfully updated during the upgrade Story: 2011087 Task: 51143 Depends-on: https://review.opendev.org/c/starlingx/ansible-playbooks/+/931789 Change-Id: I4c2385ea6f2f69f8a98063510fbf56d75b18a7fb Signed-off-by: amantri --- .../ingress-nginx-helm/debian/deb_folder/changelog | 6 ++++++ ...luxcd.patch => 0001-Add-toleration-to-daemonset.patch} | 8 ++++---- .../ingress-nginx-helm/debian/deb_folder/patches/series | 2 +- .../upstream/ingress-nginx-helm/debian/meta_data.yaml | 8 ++++---- .../ingress-nginx/ingress-nginx-static-overrides.yaml | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) rename helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/{0001-add-toleration-fluxcd.patch => 0001-Add-toleration-to-daemonset.patch} (87%) diff --git a/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/changelog b/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/changelog index 6be4b2d..9014a34 100644 --- a/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/changelog +++ b/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +ingress-nginx-helm (4.11-1) unstable; urgency=medium + + * App upversion + + -- amantri Thu 03 Oct 2024 10:33:50 AM EDT + ingress-nginx-helm (4.10-1) unstable; urgency=medium * App upversion diff --git a/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-add-toleration-fluxcd.patch b/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-Add-toleration-to-daemonset.patch similarity index 87% rename from helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-add-toleration-fluxcd.patch rename to helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-Add-toleration-to-daemonset.patch index 59371ff..896c9f3 100644 --- a/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-add-toleration-fluxcd.patch +++ b/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/0001-Add-toleration-to-daemonset.patch @@ -1,6 +1,6 @@ -From dd376b4c04c311756a302cbaf672cf9fb3f7e903 Mon Sep 17 00:00:00 2001 +From ed2afa03c3d0584cca145a79981cb0ad1f3f86ee Mon Sep 17 00:00:00 2001 From: amantri -Date: Thu, 11 Jul 2024 14:09:28 -0400 +Date: Thu, 3 Oct 2024 10:54:27 -0400 Subject: [PATCH] Add toleration to daemonset --- @@ -8,10 +8,10 @@ Subject: [PATCH] Add toleration to daemonset 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 +index 92735d2..db33be5 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml -@@ -226,12 +226,20 @@ controller: +@@ -240,12 +240,20 @@ controller: # -- Node tolerations for server scheduling to nodes with taints ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ## diff --git a/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/series b/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/series index 63cdcd7..7d39ba1 100644 --- a/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/series +++ b/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/patches/series @@ -1 +1 @@ -0001-add-toleration-fluxcd.patch +0001-Add-toleration-to-daemonset.patch diff --git a/helm-charts/upstream/ingress-nginx-helm/debian/meta_data.yaml b/helm-charts/upstream/ingress-nginx-helm/debian/meta_data.yaml index 3fa95bd..91065ce 100644 --- a/helm-charts/upstream/ingress-nginx-helm/debian/meta_data.yaml +++ b/helm-charts/upstream/ingress-nginx-helm/debian/meta_data.yaml @@ -1,10 +1,10 @@ --- debname: ingress-nginx-helm -debver: 4.10-1 +debver: 4.11-1 dl_path: - name: ingress-nginx-helm-chart-4.10.1.tar.gz - url: https://github.com/kubernetes/ingress-nginx/archive/refs/tags/helm-chart-4.10.1.tar.gz - sha256sum: 07348d9b68e38d5fd59afae7a5671a05bbeca7e97e90af41020d9a2c0f0e0ffe + name: ingress-nginx-helm-chart-4.11.1.tar.gz + url: https://github.com/kubernetes/ingress-nginx/archive/refs/tags/helm-chart-4.11.1.tar.gz + sha256sum: 1c528e262989f883e101e04bd44e3f3fb432d5df1fdc2f98332ff7ee2bbc8ea4 src_files: - ingress-nginx-helm/files/Makefile revision: diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/ingress-nginx-static-overrides.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/ingress-nginx-static-overrides.yaml index 8de26f2..74287a9 100644 --- a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/ingress-nginx-static-overrides.yaml +++ b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/ingress-nginx-static-overrides.yaml @@ -13,7 +13,7 @@ controller: # cleans the default digest value since sysinv changes the digest when pushing the image to the local registry digest: "" repository: registry.k8s.io/ingress-nginx/controller - tag: v1.10.1 + tag: v1.11.1 daemonset: useHostPort: false nodeSelector: