Merge "Upversion nginx helm chart to 4.5.4 (image 1.7.0)"

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.1.1.tar.gz
+export FLUXCD_NGINX_PKG = helm-charts-ingress-nginx-1.7.0.tar.gz
 
 %:
 	dh $@

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.1.1.tar.gz:
+  helm-charts-ingress-nginx-1.7.0.tar.gz:
     topdir: helm-charts
-    url: https://github.com/kubernetes/ingress-nginx/archive/controller-v1.1.1.tar.gz
-    md5sum: 9fa3de1800175a4f7dfa890bf9d376c9
+    url: https://github.com/kubernetes/ingress-nginx/archive/controller-v1.7.0.tar.gz
+    md5sum: e30e752d70740ca888792d534cc960f1
 revision:
   dist: $STX_DIST
   GITREVCOUNT:

stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx/helmrelease.yaml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Wind River Systems, Inc.
+# Copyright (c) 2022-2023 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -15,7 +15,7 @@ spec:
   chart:
     spec:
       chart: ingress-nginx
-      version: 4.0.15
+      version: 4.5.4
       sourceRef:
         kind: HelmRepository
         name: stx-platform

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Wind River Systems, Inc.
+# Copyright (c) 2022-2023 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -10,8 +10,8 @@ controller:
   image:
     # cleans the default digest value since sysinv changes the digest when pushing the image to the local registry
     digest: ""
-    repository: k8s.gcr.io/ingress-nginx/controller
-    tag: v1.1.1
+    repository: registry.k8s.io/ingress-nginx/controller
+    tag: v1.7.0
   daemonset:
     useHostPort: false
   nodeSelector:
@@ -40,8 +40,8 @@ controller:
     patch:
       image:
         digest: ""
-        repository: k8s.gcr.io/ingress-nginx/kube-webhook-certgen
-        tag: v1.1.1
+        repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen
+        tag: v20230312-helm-chart-4.5.2-28-g66a760794
       tolerations:
         - key: "node-role.kubernetes.io/master"
           operator: "Exists"
@@ -60,13 +60,20 @@ controller:
   extraVolumes:
     - name: pod-tmp
       emptyDir: {}
+    - name: pod-tmp-nginx
+      emptyDir: {}
   extraVolumeMounts:
     - name: pod-tmp
       mountPath: /tmp
+    - name: pod-tmp-nginx
+      mountPath: /tmp/nginx
+  opentelemetry:
+    enabled: false
+    image: registry.k8s.io/ingress-nginx/opentelemetry:v20230312-helm-chart-4.5.2-28-g66a760794
 defaultBackend:
   image:
     digest: ""
-    repository: k8s.gcr.io/defaultbackend-amd64
+    repository: registry.k8s.io/defaultbackend-amd64
     tag: "1.5"
   nodeSelector:
     node-role.kubernetes.io/control-plane: ""