From aaac53a74a71a14f8d11a94c979ab3f02881783a Mon Sep 17 00:00:00 2001
From: amantri <ayyappa.mantri@windriver.com>
Date: Thu, 26 Oct 2023 11:29:40 -0400
Subject: [PATCH] Upversion nginx app to v1.9.3
Upversioned the nginx app with new images, nginx
controller image to v1.9.3, kube-webhook-certgen to
v20231011-8b53cabe0 and opentelementry to v20230721-3e2062ee5
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: Test WRO app, upload,apply and deploy WRO without https.
Verify openstack endpoints and check cli, notice there are
no errors in the logs.
PASS: Test WRO app with https, install openstack,openstack_ca
certificate, verify openstack endpoints changed to https
and verify openstack cli with no errors
Story: 2010705
Task: 48992
Depends-on: https://review.opendev.org/c/starlingx/ansible-playbooks/+/899271
Change-Id: I047b763c529efe482b3f3e90c130ffa56bd01993
Signed-off-by: amantri <ayyappa.mantri@windriver.com>
---
stx-nginx-ingress-controller-helm/debian/deb_folder/rules | 2 +-
stx-nginx-ingress-controller-helm/debian/meta_data.yaml | 6 +++---
.../fluxcd-manifests/ingress-nginx/helmrelease.yaml | 2 +-
.../ingress-nginx/ingress-nginx-static-overrides.yaml | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules
index 8e56988..7776169 100755
--- a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules
+++ b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules
@@ -13,7 +13,7 @@ export APP_VERSION = $(RELEASE)-$(REVISION)
export APP_TARBALL_FLUXCD = $(APP_NAME)-$(APP_VERSION).tgz
export HELM_REPO = stx-platform
export STAGING_FLUXCD = staging-fluxcd
-export FLUXCD_NGINX_PKG = helm-charts-ingress-nginx-1.7.0.tar.gz
+export FLUXCD_NGINX_PKG = helm-charts-ingress-nginx-1.9.3.tar.gz
%:
dh $@
diff --git a/stx-nginx-ingress-controller-helm/debian/meta_data.yaml b/stx-nginx-ingress-controller-helm/debian/meta_data.yaml
index a90464a..9dfbd96 100644
--- a/stx-nginx-ingress-controller-helm/debian/meta_data.yaml
+++ b/stx-nginx-ingress-controller-helm/debian/meta_data.yaml
@@ -3,10 +3,10 @@ debname: stx-nginx-ingress-controller-helm
debver: 1.0-1
src_path: stx-nginx-ingress-controller-helm
dl_files:
- helm-charts-ingress-nginx-1.7.0.tar.gz:
+ helm-charts-ingress-nginx-1.9.3.tar.gz:
topdir: helm-charts
- url: https://github.com/kubernetes/ingress-nginx/archive/controller-v1.7.0.tar.gz
- md5sum: e30e752d70740ca888792d534cc960f1
+ url: https://github.com/kubernetes/ingress-nginx/archive/controller-v1.9.3.tar.gz
+ md5sum: e26752857ac5f083a7b0fcba7ec9a81f
revision:
dist: $STX_DIST
GITREVCOUNT:
diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml
index 7937d35..ff40652 100644
--- a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml
+++ b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml
@@ -15,7 +15,7 @@ spec:
chart:
spec:
chart: ingress-nginx
- version: 4.5.4
+ version: 4.8.2
sourceRef:
kind: HelmRepository
name: stx-platform
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 804de3d..4e37ee0 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
@@ -11,7 +11,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.7.0
+ tag: v1.9.3
daemonset:
useHostPort: false
nodeSelector:
@@ -41,7 +41,7 @@ controller:
image:
digest: ""
repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen
- tag: v20230312-helm-chart-4.5.2-28-g66a760794
+ tag: v20231011-8b53cabe0
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
@@ -69,7 +69,7 @@ controller:
mountPath: /tmp/nginx
opentelemetry:
enabled: false
- image: registry.k8s.io/ingress-nginx/opentelemetry:v20230312-helm-chart-4.5.2-28-g66a760794
+ image: registry.k8s.io/ingress-nginx/opentelemetry:v20230721-3e2062ee5
defaultBackend:
image:
digest: ""