Uplift Mariadb-ingress image to v1.2.0

Change-Id: Ic368517f893c5016793ce5d65b882a43fb2381ec

mariadb/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.2.23
+version: 0.2.24
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:

mariadb/templates/bin/_mariadb-ingress-controller.sh.tpl

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-set -ex
-COMMAND="${@:-start}"
-
-function start () {
-  find /tmp -maxdepth 1 \! -path /tmp -perm /222 -exec rm -rfv {} \;
-  exec /usr/bin/dumb-init \
-      /nginx-ingress-controller \
-      --watch-namespace ${POD_NAMESPACE} \
-      --election-id=${RELEASE_NAME} \
-      --ingress-class=${INGRESS_CLASS} \
-      --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
-      --configmap=${POD_NAMESPACE}/mariadb-ingress-conf \
-      --enable-ssl-chain-completion=false \
-      --tcp-services-configmap=${POD_NAMESPACE}/mariadb-services-tcp
-}
-
-
-function stop () {
-  kill -TERM 1
-}
-
-$COMMAND

mariadb/templates/configmap-bin.yaml

@@ -27,8 +27,6 @@ data:
   image-repo-sync.sh: |
 {{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
 {{- end }}
-  mariadb-ingress-controller.sh: |
-{{ tuple "bin/_mariadb-ingress-controller.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   readiness.sh: |
 {{ tuple "bin/_readiness.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   start.py: |

mariadb/templates/deployment-ingress.yaml

@@ -280,32 +280,25 @@ spec:
             - name: ERROR_PAGE_SERVICE
               value: {{ tuple "oslo_db" "error_pages" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
           command:
-            - /tmp/mariadb-ingress-controller.sh
-            - start
+            - /usr/bin/dumb-init
+            - /nginx-ingress-controller
+            - --election-id=$(RELEASE_NAME)
+            - --ingress-class=$(INGRESS_CLASS)
+            - --default-backend-service=$(POD_NAMESPACE)/$(ERROR_PAGE_SERVICE)
+            - --configmap=$(POD_NAMESPACE)/mariadb-ingress-conf
+            - --enable-ssl-chain-completion=false
+            - --tcp-services-configmap=$(POD_NAMESPACE)/mariadb-services-tcp
           lifecycle:
             preStop:
               exec:
                 command:
-                  - /tmp/mariadb-ingress-controller.sh
-                  - stop
+                  - kill -TERM 1
           volumeMounts:
-            - name: pod-tmp
-              mountPath: /tmp
-            - name: mariadb-bin
-              mountPath: /tmp/mariadb-ingress-controller.sh
-              subPath: mariadb-ingress-controller.sh
-              readOnly: true
             - name: mariadb-ingress-etc
               mountPath: /etc/nginx/template/nginx.tmpl
               subPath: nginx.tmpl
               readOnly: true
       volumes:
-        - name: pod-tmp
-          emptyDir: {}
-        - name: mariadb-bin
-          configMap:
-            name: mariadb-bin
-            defaultMode: 0555
         - name: mariadb-ingress-etc
           configMap:
             name: mariadb-ingress-etc

releasenotes/notes/mariadb.yaml

@@ -39,4 +39,5 @@ mariadb:
   - 0.2.21 Fix mysql exporter user privileges
   - 0.2.22 Fix ingress cluster role privileges
   - 0.2.23 Fix backup script by ignoring sys database for MariaDB 10.6 compartibility
+  - 0.2.24 Uplift Mariadb-ingress to 1.2.0
 ...