From 11798ca5efd79c07411eac3b0627d50bd747e35f Mon Sep 17 00:00:00 2001 From: amantri Date: Thu, 20 Jun 2024 14:17:33 -0400 Subject: [PATCH] Upversion nginx app to v4.10.1 Upversioned the nginx app to latest helm chart v4.10.1 Test Cases: PASS: Install system,bootstrap with new images and verify it is successful 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: Install lab with k8s 1.24.4 and nginx app 1.3.1 now perform application-update to v4.10.1 and verify the app is successfully updated Story: 2010705 Task: 50528 Depends-on: https://review.opendev.org/c/starlingx/ansible-playbooks/+/922869 Change-Id: I43bd6f6e145f15efd839200aa8113891942eaf8b Signed-off-by: amantri --- .../ingress-nginx-helm/debian/deb_folder/changelog | 7 ++++++- .../patches/0001-add-toleration-fluxcd.patch | 14 +++++++------- .../ingress-nginx-helm/debian/meta_data.yaml | 8 ++++---- .../ingress-nginx-static-overrides.yaml | 4 ++-- 4 files changed, 19 insertions(+), 14 deletions(-) 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 9f74a0d..6be4b2d 100644 --- a/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/changelog +++ b/helm-charts/upstream/ingress-nginx-helm/debian/deb_folder/changelog @@ -1,6 +1,11 @@ +ingress-nginx-helm (4.10-1) unstable; urgency=medium + + * App upversion + + -- amantri Thu Jun 20 14:17:33 2024 -0400 + ingress-nginx-helm (4.8-2) unstable; urgency=medium * Initial release. -- Joshua Reed Fri, 16 Feb 2024 14:54:00 +0000 - 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-fluxcd.patch index 4352e0b..59371ff 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-fluxcd.patch @@ -1,6 +1,6 @@ -From 93680e0483c66d50de2bd248f5f499e86ce0bbf9 Mon Sep 17 00:00:00 2001 -From: Sachin Gopala Krishna -Date: Fri, 28 Oct 2022 06:32:04 -0400 +From dd376b4c04c311756a302cbaf672cf9fb3f7e903 Mon Sep 17 00:00:00 2001 +From: amantri +Date: Thu, 11 Jul 2024 14:09:28 -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 93096dda1..f13b4f534 100644 +index 68f8b58..ed6d68c 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml -@@ -207,12 +207,20 @@ controller: +@@ -226,12 +226,20 @@ controller: # -- Node tolerations for server scheduling to nodes with taints ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ## @@ -21,7 +21,7 @@ index 93096dda1..f13b4f534 100644 # operator: "Equal|Exists" # value: "value" # effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)" - + + tolerations: + - key: "node-role.kubernetes.io/master" + operator: "Exists" @@ -33,6 +33,6 @@ index 93096dda1..f13b4f534 100644 # -- 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 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 814f4b6..3fa95bd 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.8-2 +debver: 4.10-1 dl_path: - name: controller-v1.9.3.tar.gz - url: https://mirror.starlingx.windriver.com/mirror/debian/github.com/kubernetes/ingress-nginx/archive/controller-v1.9.3.tar.gz - sha256sum: 1047a9edd5d4ccf9a8b1a7941d3083a31987f32890a16b05862c49fb842e49bb + 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 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 e5f3384..6261e2c 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.9.3 + tag: v1.10.1 daemonset: useHostPort: false nodeSelector: @@ -46,7 +46,7 @@ controller: image: digest: "" repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen - tag: v20231011-8b53cabe0 + tag: v1.4.1 tolerations: - key: "node-role.kubernetes.io/master" operator: "Exists"