openstack/openstack-helm
Code Issues Proposed changes

Add proper chart path for ingress deployment script

Browse Source 
Change-Id: I79058dc00764494d6ea37d430529b1c06b49434f
This commit is contained in:
Andrii Ostapenko 2020-05-18 18:07:57 -05:00
parent c7685c9b2a
commit 750bb939d9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/deployment/apparmor/015-ingress.sh
View File

@ -19,6 +19,8 @@ set -xe
#NOTE: Lint and package chart #NOTE: Lint and package chart
make ingress make ingress
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_SYSTEM:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} : ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_SYSTEM:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_OPENSTACK:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} : ${OSH_INFRA_EXTRA_HELM_ARGS_OPENSTACK:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
: ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} : ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
@ -34,7 +36,7 @@ deployment:
network: network:
host_namespace: true host_namespace: true
EOF EOF
helm upgrade --install ingress-kube-system ./ingress \ helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=kube-system \ --namespace=kube-system \
--values=/tmp/ingress-kube-system.yaml \ --values=/tmp/ingress-kube-system.yaml \
${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS} \
@ -47,7 +49,7 @@ helm upgrade --install ingress-kube-system ./ingress \
helm status ingress-kube-system helm status ingress-kube-system
#NOTE: Deploy namespace ingress #NOTE: Deploy namespace ingress
helm upgrade --install ingress-osh-infra ./ingress \ helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=osh-infra \ --namespace=osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK} ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
@ -58,7 +60,7 @@ helm upgrade --install ingress-osh-infra ./ingress \
#NOTE: Display info #NOTE: Display info
helm status ingress-osh-infra helm status ingress-osh-infra
helm upgrade --install ingress-ceph ./ingress \ helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=ceph \ --namespace=ceph \
${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH} ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH}