From 37b7f438a31ba8d66cba5839eab3590c1cf15303 Mon Sep 17 00:00:00 2001 From: Fang Xiaolong Date: Sun, 26 May 2024 14:37:05 +0800 Subject: [PATCH] fix: Modify the script to adapt to cn scenes --- hack/make-rules/deploy-kubeadmiral.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/make-rules/deploy-kubeadmiral.sh b/hack/make-rules/deploy-kubeadmiral.sh index bbb5f0de..d9042074 100644 --- a/hack/make-rules/deploy-kubeadmiral.sh +++ b/hack/make-rules/deploy-kubeadmiral.sh @@ -165,13 +165,13 @@ done # 5. deploy kubeadmiral-controller-manager component echo -e "\nDeploying the kubeadmiral-controller-manager." -kubectl --kubeconfig="${META_CLUSTER_KUBECONFIG}" --context="${META_CLUSTER_NAME}" apply -f "${CONTROLPLANE_DEPLOY_PATH}/kubeadmiral-controller-manager.yaml" +util::deploy_components_according_to_different_region "${REGION}" "${CONTROLPLANE_DEPLOY_PATH}/kubeadmiral-controller-manager.yaml" "${META_CLUSTER_KUBECONFIG}" "${META_CLUSTER_NAME}" deploy::wait_pod_ready "${META_CLUSTER_KUBECONFIG}" "${META_CLUSTER_NAME}" "${KUBEADMIRAL_CONTROLLER_MANAGER_LABEL}" "${KUBEADMIRAL_SYSTEM_NAMESPACE}" # 6. deploy kubeadmiral-hpa-aggregator component echo -e "\nDeploying the kubeadmiral-hpa-aggregator." -kubectl --kubeconfig="${HOST_CLUSTER_KUBECONFIG}" --context="${HOST_CLUSTER_CONTEXT}" apply -f "${CONTROLPLANE_DEPLOY_PATH}/kubeadmiral-hpa-aggregator-apiservice.yaml" -kubectl --kubeconfig="${META_CLUSTER_KUBECONFIG}" --context="${META_CLUSTER_NAME}" apply -f "${CONTROLPLANE_DEPLOY_PATH}/kubeadmiral-hpa-aggregator.yaml" +util::deploy_components_according_to_different_region "${REGION}" "${CONTROLPLANE_DEPLOY_PATH}/kubeadmiral-hpa-aggregator-apiservice.yaml" "${HOST_CLUSTER_KUBECONFIG}" "${HOST_CLUSTER_CONTEXT}" +util::deploy_components_according_to_different_region "${REGION}" "${CONTROLPLANE_DEPLOY_PATH}/kubeadmiral-hpa-aggregator.yaml" "${META_CLUSTER_KUBECONFIG}" "${META_CLUSTER_NAME}" deploy::wait_pod_ready "${META_CLUSTER_KUBECONFIG}" "${META_CLUSTER_NAME}" "${KUBEADMIRAL_HPA_AGGREGATOR_LABEL}" "${KUBEADMIRAL_SYSTEM_NAMESPACE}" kubectl config set-cluster hpa-aggregator-api \ --server="https://${KUBEADMIRAL_APISERVER_IP}:${KUBEADMIRAL_APISERVER_SECURE_PORT}/apis/hpaaggregator.kubeadmiral.io/v1alpha1/aggregations/hpa/proxy" \