From a004c7a19e890f7d82fb36330101f3d535c3eec4 Mon Sep 17 00:00:00 2001
From: Anthony Lin <anthony.jclin@gmail.com>
Date: Fri, 11 May 2018 17:54:51 +0000
Subject: [PATCH] Update Deckhand API Pod Labels

As part of ongoing effort to update the "application" and
"component" labels for the UCP components, there is a need
to align with the convention. We will update the label for
the deckhand API pod in this case.

Also updated helm_tk.sh to point to openstack-helm-infra for
reference to helm-toolkit as helm-toolkit has been removed
from the openstack-helm repo [0]

[0] https://review.openstack.org/#/c/558065/

Change-Id: I753c4ce653790250b79986c670224d0962f7676f
---
 charts/deckhand/templates/deployment.yaml | 2 +-
 charts/deckhand/templates/service.yaml    | 2 +-
 tools/helm_tk.sh                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/deckhand/templates/deployment.yaml b/charts/deckhand/templates/deployment.yaml
index 9db22f32..3d6ef259 100644
--- a/charts/deckhand/templates/deployment.yaml
+++ b/charts/deckhand/templates/deployment.yaml
@@ -30,7 +30,7 @@ spec:
   template:
     metadata:
       labels:
-{{ tuple $envAll "deckhand-api" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ tuple $envAll "deckhand" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
diff --git a/charts/deckhand/templates/service.yaml b/charts/deckhand/templates/service.yaml
index 3ea50699..14c95608 100644
--- a/charts/deckhand/templates/service.yaml
+++ b/charts/deckhand/templates/service.yaml
@@ -36,7 +36,7 @@ spec:
       targetPort: {{ .Values.network.port }}
     {{ end }}
   selector:
-{{ tuple $envAll "deckhand-api" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{ tuple $envAll "deckhand" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   {{ if .Values.network.enable_node_port }}
   type: NodePort
   {{ end }}
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index cd64a6bf..db31f2ee 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -44,8 +44,8 @@ function helm_serve {
 
 mkdir -p build
 cd build
-git clone --depth 1 https://git.openstack.org/openstack/openstack-helm.git || true
-cd openstack-helm
+git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
+cd openstack-helm-infra
 git pull
 helm_serve
 make helm-toolkit