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
This commit is contained in:
Anthony Lin 2018-05-11 17:54:51 +00:00
parent e479cba5ff
commit a004c7a19e
3 changed files with 4 additions and 4 deletions

View File

@ -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" }}

View File

@ -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 }}

View File

@ -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