Merge "Move ingress config to separate configmap"

mariadb/templates/configmap-etc.yaml

@@ -28,10 +28,4 @@ data:
 {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" ( index $envAll.Values.conf.database "config_override" ) "key" "20-override.cnf" ) | indent 2 }}
 {{- end }}
 {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" ( index $envAll.Values.conf.database "99_force" ) "key" "99-force.cnf" ) | indent 2 }}
-{{- if $envAll.Values.conf.ingress }}
-  nginx.tmpl: |
-{{ $envAll.Values.conf.ingress | indent 4 }}
-{{- else }}
-{{ ( $envAll.Files.Glob "files/nginx.tmpl" ).AsConfig | indent 2 }}
-{{- end }}
 {{- end }}

mariadb/templates/configmap-ingress-etc.yaml

@@ -0,0 +1,31 @@
+{{/*
+Copyright 2017 The Openstack-Helm Authors.
+
+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.
+*/}}
+
+{{- if .Values.manifests.configmap_ingress_etc }}
+{{- $envAll := . }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mariadb-ingress-etc
+data:
+{{- if $envAll.Values.conf.ingress }}
+  nginx.tmpl: |
+{{ $envAll.Values.conf.ingress | indent 4 }}
+{{- else }}
+{{ ( $envAll.Files.Glob "files/nginx.tmpl" ).AsConfig | indent 2 }}
+{{- end }}
+{{- end }}

mariadb/templates/deployment-error.yaml

@@ -41,7 +41,7 @@ spec:
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-ingress-etc.yaml" . | include "helm-toolkit.utils.hash" }}
     spec:
       shareProcessNamespace: true
       serviceAccountName: {{ $serviceAccountName }}

mariadb/templates/deployment-ingress.yaml

@@ -138,7 +138,7 @@ spec:
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-ingress-etc.yaml" . | include "helm-toolkit.utils.hash" }}
     spec:
       shareProcessNamespace: true
       serviceAccountName: {{ $serviceAccountName }}
@@ -196,7 +196,7 @@ spec:
               mountPath: /tmp/mariadb-ingress-controller.sh
               subPath: mariadb-ingress-controller.sh
               readOnly: true
-            - name: mariadb-etc
+            - name: mariadb-ingress-etc
               mountPath: /etc/nginx/template/nginx.tmpl
               subPath: nginx.tmpl
               readOnly: true
@@ -207,8 +207,8 @@ spec:
           configMap:
             name: mariadb-bin
             defaultMode: 0555
-        - name: mariadb-etc
+        - name: mariadb-ingress-etc
           configMap:
-            name: mariadb-etc
+            name: mariadb-ingress-etc
             defaultMode: 0444
 {{- end }}

mariadb/values.yaml

@@ -512,6 +512,7 @@ manifests:
   configmap_bin: true
   configmap_etc: true
   configmap_ingress_conf: true
+  configmap_ingress_etc: true
   configmap_services_tcp: true
   deployment_error: true
   deployment_ingress: true