From eae5c6d69a5d787f0ddce11a6df04aec84d023a2 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Tue, 3 Oct 2023 22:25:26 +0000
Subject: [PATCH] Uplift nginx ingress controller to v1.8.2

Change-Id: I4223f3f859833447f4045e7acea81bf4c7a8948a
---
 ingress/Chart.yaml              | 4 ++--
 ingress/values.yaml             | 2 +-
 mariadb/Chart.yaml              | 2 +-
 mariadb/files/nginx.tmpl        | 5 -----
 mariadb/values.yaml             | 2 +-
 releasenotes/notes/ingress.yaml | 1 +
 releasenotes/notes/mariadb.yaml | 1 +
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ingress/Chart.yaml b/ingress/Chart.yaml
index 8e422c6b8..c96eb6a4f 100644
--- a/ingress/Chart.yaml
+++ b/ingress/Chart.yaml
@@ -12,10 +12,10 @@
 
 ---
 apiVersion: v1
-appVersion: v1.5.1
+appVersion: v1.8.2
 description: OpenStack-Helm Ingress Controller
 name: ingress
-version: 0.2.18
+version: 0.2.19
 home: https://github.com/kubernetes/ingress
 sources:
   - https://github.com/kubernetes/ingress
diff --git a/ingress/values.yaml b/ingress/values.yaml
index a37af3fbb..600d646a8 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -27,7 +27,7 @@ deployment:
 images:
   tags:
     entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1
+    ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2
     ingress_module_init: docker.io/openstackhelm/neutron:xena-ubuntu_focal
     ingress_routed_vip: docker.io/openstackhelm/neutron:xena-ubuntu_focal
     error_pages: registry.k8s.io/defaultbackend:1.4
diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index 60198db0d..43644b3e9 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.6.7
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.2.33
+version: 0.2.34
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/files/nginx.tmpl b/mariadb/files/nginx.tmpl
index bc99c913c..c9b25478d 100644
--- a/mariadb/files/nginx.tmpl
+++ b/mariadb/files/nginx.tmpl
@@ -21,9 +21,6 @@ load_module /etc/nginx/modules/ngx_http_brotli_filter_module.so;
 load_module /etc/nginx/modules/ngx_http_brotli_static_module.so;
 {{ end }}
 
-{{ if (shouldLoadInfluxDBModule $servers) }}
-load_module /etc/nginx/modules/ngx_http_influxdb_module.so;
-{{ end }}
 
 {{ if (shouldLoadAuthDigestModule $servers) }}
 load_module /etc/nginx/modules/ngx_http_auth_digest_module.so;
@@ -1230,8 +1227,6 @@ stream {
             {{ template "CORS" $location }}
             {{ end }}
 
-            {{ buildInfluxDB $location.InfluxDB }}
-
             {{ if isValidByteSize $location.Proxy.BodySize true }}
             # NOTE: obsolete directive. removed.
             #client_max_body_size                    {{ $location.Proxy.BodySize }};
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 741a75fe3..b15a15841 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -21,7 +21,7 @@ release_group: null
 images:
   tags:
     mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-    ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1
+    ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2
     error_pages: registry.k8s.io/defaultbackend:1.4
     prometheus_create_mysql_user: docker.io/library/mariadb:10.5.9-focal
     prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1
diff --git a/releasenotes/notes/ingress.yaml b/releasenotes/notes/ingress.yaml
index f068f44fe..b579cd53a 100644
--- a/releasenotes/notes/ingress.yaml
+++ b/releasenotes/notes/ingress.yaml
@@ -22,4 +22,5 @@ ingress:
   - 0.2.16 Updated deprecated IngressClass annotation
   - 0.2.17 Fixed controller parameters
   - 0.2.18 Fixed some additional controller issues
+  - 0.2.19 Uplift ingress controller image to 1.8.2
 ...
diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml
index fbca3bbf4..31afa5eb0 100644
--- a/releasenotes/notes/mariadb.yaml
+++ b/releasenotes/notes/mariadb.yaml
@@ -49,4 +49,5 @@ mariadb:
   - 0.2.31 Update kubernetes registry to registry.k8s.io
   - 0.2.32 Prevent liveness probe from killing pods during SST
   - 0.2.33 Add 2023.1 Ubuntu Focal overrides
+  - 0.2.34 Uplift ingress controller image to 1.8.2
 ...