To support multiple CSRs per tenant (#1997)

.github/workflows/deploy-tenant.sh

@@ -20,17 +20,17 @@ export SCRIPT_DIR
 
 source "${SCRIPT_DIR}/common.sh"
 
+function install_tenants() {
+	echo "Installing tenants"
 
+	# Install lite & kes tenants
+	try kubectl apply -k "${SCRIPT_DIR}/../../portal-ui/tests/scripts/tenant-lite"
+	try kubectl apply -k "${SCRIPT_DIR}/../../portal-ui/tests/scripts/tenant-kes-encryption"
 
-function install_tenant() {
-    echo "Installing lite tenant"
-
-	try kubectl apply -k "${SCRIPT_DIR}/../../portal-ui/tests/scripts/tenant"
-
-    echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
-    waitdone=0
-    totalwait=0
-    while true; do
+	echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
+	waitdone=0
+	totalwait=0
+	while true; do
 	waitdone=$(kubectl -n tenant-lite get pods -l v1.min.io/tenant=storage-lite --no-headers | wc -l)
 	if [ "$waitdone" -ne 0 ]; then
 	    echo "Found $waitdone pods"
@@ -39,41 +39,34 @@ function install_tenant() {
 	sleep 5
 	totalwait=$((totalwait + 5))
 	if [ "$totalwait" -gt 300 ]; then
-	    echo "Tenant never created statefulset after 5 minutes"
-	    try false
+		echo "Tenant never created statefulset after 5 minutes"
+		try false
 	fi
-    done
+	done
 
-    echo "Waiting for tenant pods to come online (5m timeout)"
-    try kubectl wait --namespace tenant-lite \
+	echo "Waiting for tenant pods to come online (5m timeout)"
+	try kubectl wait --namespace tenant-lite \
 	--for=condition=ready pod \
 	--selector="v1.min.io/tenant=storage-lite" \
 	--timeout=300s
 
-    echo "Build passes basic tenant creation"
+	echo "Build passes basic tenant creation"
 }
 
 
 function main() {
-    destroy_kind
-
-    setup_kind
-
-    install_operator
-
-    install_tenant
-
-    check_tenant_status tenant-lite storage-lite
-
-    kubectl proxy &
-
-    # Beginning  Kubernetes 1.24 ----> Service Account Token Secrets are not 
-    # automatically generated, to generate them manually, users must manually
-    # create the secret, for our examples where we lead people to get the JWT
-    # from the console-sa service account, they additionally need to manually
-    # generate the secret via
-    kubectl apply -f "${SCRIPT_DIR}/console-sa-secret.yaml"
-
+	destroy_kind
+	setup_kind
+	install_operator
+	install_tenants
+	check_tenant_status tenant-lite storage-lite
+	kubectl proxy &
+	# Beginning  Kubernetes 1.24 ----> Service Account Token Secrets are not 
+	# automatically generated, to generate them manually, users must manually
+	# create the secret, for our examples where we lead people to get the JWT
+	# from the console-sa service account, they additionally need to manually
+	# generate the secret via
+	kubectl apply -f "${SCRIPT_DIR}/console-sa-secret.yaml"
 }
 
 main "$@"