openstack/openstack-helm
Code Issues Proposed changes

Update ingress deployment script

Browse Source 
We recently merged https://review.opendev.org/c/openstack/openstack-helm-infra/+/891720
which updates ingress controller deployment and assumes
we now use IngressClass objects instead of annotations.

We have to update the ingress deployment script
so it creates IngressClass objects with correct names.

Change-Id: I547f27250ba21bb068bc83c62954092111df8b50
This commit is contained in:
Vladimir Kozhukalov 2023-09-17 08:34:40 +03:00
parent c52b794a2f
commit 56842b39d4
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
#NOTE: Deploy namespace ingress
helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=osh-infra \
--set deployment.cluster.class=nginx-osh-infra \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
@ -58,6 +59,7 @@ helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \
helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=ceph \
--set deployment.cluster.class=nginx-ceph \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH}

2
tools/deployment/component/common/ingress.sh
View File

@ -62,6 +62,7 @@ helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=openstack \
--values=/tmp/ingress-component.yaml \
--set deployment.cluster.class=nginx \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
@ -72,6 +73,7 @@ helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \
helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
--namespace=ceph \
--values=/tmp/ingress-component.yaml \
--set deployment.cluster.class=nginx-ceph \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_CEPH}