From 14d66afb012025a5289818d8e8d2092ccce19ffa Mon Sep 17 00:00:00 2001
From: Anthony Lin <anthony.jclin@gmail.com>
Date: Fri, 11 May 2018 15:30:34 +0000
Subject: [PATCH] Update Shipyard 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 shipyard 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: I0b2acda47d87f8dda35fbf054e1c8d906b495061
---
 charts/shipyard/templates/deployment-shipyard.yaml | 2 +-
 charts/shipyard/templates/service-shipyard.yaml    | 2 +-
 tools/helm_tk.sh                                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/shipyard/templates/deployment-shipyard.yaml b/charts/shipyard/templates/deployment-shipyard.yaml
index 0eaa33a8..94a14f83 100644
--- a/charts/shipyard/templates/deployment-shipyard.yaml
+++ b/charts/shipyard/templates/deployment-shipyard.yaml
@@ -31,7 +31,7 @@ spec:
   template:
     metadata:
       labels:
-{{ tuple $envAll "shipyard-api" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ tuple $envAll "shipyard" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
         configmap-bin-hash: {{ tuple "configmap-shipyard-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-shipyard-etc.yaml" . | include "helm-toolkit.utils.hash" }}
diff --git a/charts/shipyard/templates/service-shipyard.yaml b/charts/shipyard/templates/service-shipyard.yaml
index 375a1e3c..0becf2ff 100644
--- a/charts/shipyard/templates/service-shipyard.yaml
+++ b/charts/shipyard/templates/service-shipyard.yaml
@@ -37,7 +37,7 @@ spec:
       targetPort: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ end }}
   selector:
-{{ tuple $envAll "shipyard-api" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{ tuple $envAll "shipyard" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   {{ if .Values.network.shipyard.enable_node_port }}
   type: NodePort
   {{ end }}
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 7a2c7e25..4cea01be 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