mariadb-ingress-error-pages: upgrading defaultbackend version to 1.4

removing ingress-error-pages.sh script as 1.4 version
has ENTRYPOINT ["/server"]

Change-Id: I6666f4f5af940836d797e838b870cd08f8e3a5e8

mariadb/templates/bin/_mariadb-ingress-error-pages.sh.tpl

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-{{/*
-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}"
-
-if [ "x${COMMAND}" == "xstart" ]; then
-  exec /server
-elif [ "x${COMMAND}" == "xstop" ]; then
-  kill -TERM 1
-fi

mariadb/templates/configmap-bin.yaml

@@ -29,8 +29,6 @@ data:
 {{- end }}
   mariadb-ingress-controller.sh: |
 {{ tuple "bin/_mariadb-ingress-controller.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  mariadb-ingress-error-pages.sh: |
-{{ tuple "bin/_mariadb-ingress-error-pages.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-error.yaml

@@ -66,27 +66,10 @@ spec:
             timeoutSeconds: 5
           ports:
             - containerPort: 8080
-          command:
-            - /tmp/mariadb-ingress-error-pages.sh
-            - start
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                  - /tmp/mariadb-ingress-error-pages.sh
-                  - stop
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
-            - name: ingress-bin
-              mountPath: /tmp/mariadb-ingress-error-pages.sh
-              subPath: mariadb-ingress-error-pages.sh
-              readOnly: true
       volumes:
         - name: pod-tmp
           emptyDir: {}
-        - name: ingress-bin
-          configMap:
-            name: mariadb-bin
-            defaultMode: 0555
 {{- end }}

mariadb/values.yaml

@@ -22,7 +22,7 @@ images:
     # 10.2.31
     mariadb: openstackhelm/mariadb@sha256:5f05ce5dce71c835c6361a05705da5cce31114934689ec87dfa48b8f8c600f70
     ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
-    error_pages: gcr.io/google_containers/defaultbackend:1.0
+    error_pages: gcr.io/google_containers/defaultbackend:1.4
     prometheus_create_mysql_user: docker.io/mariadb:10.2.31
     prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0
     prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial