From 0927b6a61cf1c1573dec39f207c30811b6c128bf Mon Sep 17 00:00:00 2001
From: Matt McEuen <matt.mceuen@att.com>
Date: Fri, 14 Sep 2018 17:44:58 -0500
Subject: [PATCH] Add release uuid to pods and rc objects (dbell)

This PS adds the ability to attach a release uuid to pods and rc
objects as desired.  This can be used, for example, to force an
artificial manifest change in CICD scenarios, for upgradability
testing purposes.

Change-Id: I2f5279c6983f43288e4ef3cb48898d5a36b33833
---
 divingbell/templates/daemonset-ethtool.yaml | 2 ++
 divingbell/templates/daemonset-mounts.yaml  | 2 ++
 divingbell/templates/daemonset-sysctl.yaml  | 2 ++
 divingbell/templates/daemonset-uamlite.yaml | 2 ++
 tools/helm_tk.sh                            | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/divingbell/templates/daemonset-ethtool.yaml b/divingbell/templates/daemonset-ethtool.yaml
index 0f2e3d3..3f21328 100644
--- a/divingbell/templates/daemonset-ethtool.yaml
+++ b/divingbell/templates/daemonset-ethtool.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/divingbell/templates/daemonset-mounts.yaml b/divingbell/templates/daemonset-mounts.yaml
index e1665cc..fb4fc19 100644
--- a/divingbell/templates/daemonset-mounts.yaml
+++ b/divingbell/templates/daemonset-mounts.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/divingbell/templates/daemonset-sysctl.yaml b/divingbell/templates/daemonset-sysctl.yaml
index a4e9d49..b869935 100644
--- a/divingbell/templates/daemonset-sysctl.yaml
+++ b/divingbell/templates/daemonset-sysctl.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/divingbell/templates/daemonset-uamlite.yaml b/divingbell/templates/daemonset-uamlite.yaml
index 3b6953e..460cd10 100644
--- a/divingbell/templates/daemonset-uamlite.yaml
+++ b/divingbell/templates/daemonset-uamlite.yaml
@@ -24,6 +24,8 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: {{ $daemonset }}
+  annotations:
+    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
 {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
   template:
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 6eabfc6..1b49098 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -16,7 +16,7 @@
 # Script to setup helm-toolkit and helm dep up the shipyard chart
 #
 HELM=$1
-HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm"}
+HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
 HTK_PATH=${HTK_PATH:-""}
 DEP_UP_LIST=${DEP_UP_LIST:-"divingbell"}