From 56842b39d47ae0f1ca8ad8cb94ca102dd577777b Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Sun, 17 Sep 2023 08:34:40 +0300
Subject: [PATCH] Update ingress deployment script

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
---
 tools/deployment/apparmor/015-ingress.sh     | 2 ++
 tools/deployment/component/common/ingress.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tools/deployment/apparmor/015-ingress.sh b/tools/deployment/apparmor/015-ingress.sh
index 9b41f314f3..d001b7b6af 100755
--- a/tools/deployment/apparmor/015-ingress.sh
+++ b/tools/deployment/apparmor/015-ingress.sh
@@ -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}
 
diff --git a/tools/deployment/component/common/ingress.sh b/tools/deployment/component/common/ingress.sh
index 278a6e095d..9ae03719ce 100755
--- a/tools/deployment/component/common/ingress.sh
+++ b/tools/deployment/component/common/ingress.sh
@@ -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}