Skip to content

Commit

Permalink
Merge pull request #324 from xiaoloongfang/main
Browse files Browse the repository at this point in the history
fix: Modify the script to adapt to cn scenes
  • Loading branch information
mrlihanbo authored Jun 2, 2024
2 parents ad23985 + 37b7f43 commit 79c6330
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hack/make-rules/deploy-kubeadmiral.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit 79c6330

Please sign in to comment.