airship/shipyard
Code Issues Proposed changes

Update Shipyard API Pod Labels

Browse Source 
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
This commit is contained in:
Anthony Lin 2018-05-11 15:30:34 +00:00 committed by Aaron Sheffield
parent aca1b60f22
commit 14d66afb01
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/shipyard/templates/deployment-shipyard.yaml
View File

@ -31,7 +31,7 @@ spec:
template: template:
metadata: metadata:
labels: 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: annotations:
configmap-bin-hash: {{ tuple "configmap-shipyard-bin.yaml" . | include "helm-toolkit.utils.hash" }} 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" }} configmap-etc-hash: {{ tuple "configmap-shipyard-etc.yaml" . | include "helm-toolkit.utils.hash" }}

2
charts/shipyard/templates/service-shipyard.yaml
View File

@ -37,7 +37,7 @@ spec:
targetPort: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} targetPort: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ end }} {{ end }}
selector: 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 }} {{ if .Values.network.shipyard.enable_node_port }}
type: NodePort type: NodePort
{{ end }} {{ end }}

4
tools/helm_tk.sh
View File

@ -44,8 +44,8 @@ function helm_serve {
mkdir -p build mkdir -p build
cd build cd build
git clone --depth 1 https://git.openstack.org/openstack/openstack-helm.git || true git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
cd openstack-helm cd openstack-helm-infra
git pull git pull
helm_serve helm_serve
make helm-toolkit make helm-toolkit