From 365132a4c53999b73fd16a63bbd049608267c76a Mon Sep 17 00:00:00 2001
From: Larry Rensing <lr699s@att.com>
Date: Mon, 15 May 2017 20:05:17 +0000
Subject: [PATCH] Cleanup - add remaining configmap hashes
This adds a configmap-bin/etc hash value to the remainder of the manifests
Change-Id: Icccadccfd1d68e89b452b1c722e28b7340d9164b
---
etcd/templates/deployment.yaml | 5 ++++-
heat/templates/deployment-api.yaml | 2 ++
heat/templates/deployment-cfn.yaml | 2 ++
heat/templates/deployment-cloudwatch.yaml | 2 ++
heat/templates/statefulset-engine.yaml | 2 ++
ingress/requirements.yaml | 18 ++++++++++++++++++
ingress/templates/error-deployment.yaml | 2 ++
ingress/templates/ingress-deployment.yaml | 2 ++
magnum/templates/deployment-api.yaml | 2 ++
magnum/templates/statefulset-conductor.yaml | 2 ++
mariadb/templates/deployment.yaml | 2 ++
memcached/templates/deployment.yaml | 5 ++++-
senlin/templates/deployment-api.yaml | 2 ++
senlin/templates/statefulset-engine.yaml | 2 ++
14 files changed, 48 insertions(+), 2 deletions(-)
create mode 100644 ingress/requirements.yaml
diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml
index b0a4e43d30..698b90d6d5 100644
--- a/etcd/templates/deployment.yaml
+++ b/etcd/templates/deployment.yaml
@@ -11,9 +11,12 @@ spec:
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
- {{ end }}
+ {{ 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:
diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml
index e54fd6cf2d..cfdf6de06b 100644
--- a/heat/templates/deployment-api.yaml
+++ b/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 }}
]'
diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml
index 151009918f..d4ada20938 100644
--- a/heat/templates/deployment-cfn.yaml
+++ b/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 }}
]'
diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml
index 21914b9fce..b2485f325e 100644
--- a/heat/templates/deployment-cloudwatch.yaml
+++ b/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 }}
]'
diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml
index bcaead3137..1553c56c56 100644
--- a/heat/templates/statefulset-engine.yaml
+++ b/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 }}
]'
diff --git a/ingress/requirements.yaml b/ingress/requirements.yaml
new file mode 100644
index 0000000000..53782e69b2
--- /dev/null
+++ b/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
diff --git a/ingress/templates/error-deployment.yaml b/ingress/templates/error-deployment.yaml
index 933d7edf80..5b32f6f887 100644
--- a/ingress/templates/error-deployment.yaml
+++ b/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:
diff --git a/ingress/templates/ingress-deployment.yaml b/ingress/templates/ingress-deployment.yaml
index 043f038a22..d9cd951c0b 100644
--- a/ingress/templates/ingress-deployment.yaml
+++ b/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:
diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml
index 7368c279fd..f87ca04655 100644
--- a/magnum/templates/deployment-api.yaml
+++ b/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 }}
]'
diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml
index 4c767ec7b7..a053ebc31e 100644
--- a/magnum/templates/statefulset-conductor.yaml
+++ b/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 }}
]'
diff --git a/mariadb/templates/deployment.yaml b/mariadb/templates/deployment.yaml
index df04d10ebf..012994d373 100644
--- a/mariadb/templates/deployment.yaml
+++ b/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
diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml
index f9c755b7c7..bd93fce723 100644
--- a/memcached/templates/deployment.yaml
+++ b/memcached/templates/deployment.yaml
@@ -25,9 +25,12 @@ spec:
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
- {{ end }}
+ {{ 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:
diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml
index 3267084569..23d77d6dd9 100644
--- a/senlin/templates/deployment-api.yaml
+++ b/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 }}
]'
diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml
index 22db719763..1a41a5548a 100644
--- a/senlin/templates/statefulset-engine.yaml
+++ b/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 }}
]'