Merge "Cleanup - add remaining configmap hashes"

etcd/templates/deployment.yaml

@@ -14,6 +14,9 @@ spec:
     {{ end }}
   template:
     metadata:
+      annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
       labels:
         app: etcd
     spec:

heat/templates/deployment-api.yaml

@@ -35,6 +35,8 @@ spec:
       labels:
         app: heat-api
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'

heat/templates/deployment-cfn.yaml

@@ -35,6 +35,8 @@ spec:
       labels:
         app: heat-cfn
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'

heat/templates/deployment-cloudwatch.yaml

@@ -35,6 +35,8 @@ spec:
       labels:
         app: heat-cloudwatch
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'

heat/templates/statefulset-engine.yaml

@@ -28,6 +28,8 @@ spec:
       labels:
         app: heat-engine
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_heat_engine_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'

ingress/requirements.yaml

@@ -0,0 +1,18 @@
+# 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.
+
+dependencies:
+  - name: helm-toolkit
+    repository: http://localhost:8879/charts
+    version: 0.1.0

ingress/templates/error-deployment.yaml

@@ -28,6 +28,8 @@ spec:
     {{ end }}
   template:
     metadata:
+      annotations:
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
       labels:
         app: ingress-error-pages
     spec:

ingress/templates/ingress-deployment.yaml

@@ -30,6 +30,8 @@ spec:
 {{- end }}
   template:
     metadata:
+      annotations:
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
       labels:
         app: ingress-api
     spec:

magnum/templates/deployment-api.yaml

@@ -35,6 +35,8 @@ spec:
       labels:
         app: magnum-api
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_magnum_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'

magnum/templates/statefulset-conductor.yaml

@@ -28,6 +28,8 @@ spec:
       labels:
         app: magnum-conductor
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_magnum_conductor_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'

mariadb/templates/deployment.yaml

@@ -30,6 +30,8 @@ spec:
         app: {{ .Values.service_name }}
         galera: enabled
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         # alanmeadows: this soft requirement allows single
         # host deployments to spawn several mariadb containers
         # but in a larger environment, would attempt to spread

memcached/templates/deployment.yaml

@@ -28,6 +28,9 @@ spec:
     {{ end }}
   template:
     metadata:
+      annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
       labels:
         app: memcached
     spec:

senlin/templates/deployment-api.yaml

@@ -35,6 +35,8 @@ spec:
       labels:
         app: senlin-api
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_senlin_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'

senlin/templates/statefulset-engine.yaml

@@ -28,6 +28,8 @@ spec:
       labels:
         app: senlin-engine
       annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
         pod.beta.kubernetes.io/init-containers: '[
 {{ tuple $envAll $dependencies $mounts_senlin_engine_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
         ]'