Merge "error-pages: updating the defaultbackend version to 1.4"

ingress/templates/bin/_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

ingress/templates/configmap-bin.yaml

@@ -34,6 +34,4 @@ data:
 {{- end }}
   ingress-controller.sh: |
 {{ tuple "bin/_ingress-controller.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  ingress-error-pages.sh: |
-{{ tuple "bin/_ingress-error-pages.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end }}

ingress/templates/deployment-error.yaml

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

ingress/values.yaml

@@ -27,7 +27,7 @@ images:
     ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.23.0
     ingress_module_init: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
     ingress_routed_vip: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
-    error_pages: gcr.io/google_containers/defaultbackend:1.0
+    error_pages: gcr.io/google_containers/defaultbackend:1.4
     keepalived: docker.io/osixia/keepalived:1.4.5
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0