github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98037 from vinayakankugoyal/kube-controller-manager-crp

Browse Source 
Update configure-helper.sh to early exit from start-kube-controller-m…
This commit is contained in:
Kubernetes Prow Robot 2021-01-25 12:38:59 -08:00 committed by GitHub
commit 1a67280508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/gce/gci/configure-helper.sh
View File

@ -1982,6 +1982,12 @@ function run-kube-controller-manager-as-non-root {
# CLOUD_CONFIG_MOUNT # CLOUD_CONFIG_MOUNT
# DOCKER_REGISTRY # DOCKER_REGISTRY
function start-kube-controller-manager { function start-kube-controller-manager {
if [[ -e "${KUBE_HOME}/bin/gke-internal-configure-helper.sh" ]]; then
if ! deploy-kube-controller-manager-via-kube-up; then
echo "kube-controller-manager is configured to not be deployed through kube-up."
return
fi
fi
echo "Start kubernetes controller-manager" echo "Start kubernetes controller-manager"
create-kubeconfig "kube-controller-manager" "${KUBE_CONTROLLER_MANAGER_TOKEN}" create-kubeconfig "kube-controller-manager" "${KUBE_CONTROLLER_MANAGER_TOKEN}"
prepare-log-file /var/log/kube-controller-manager.log prepare-log-file /var/log/kube-controller-manager.log
@ -2090,10 +2096,12 @@ function start-kube-controller-manager {
# Assumed vars (which are calculated in compute-master-manifest-variables) # Assumed vars (which are calculated in compute-master-manifest-variables)
# DOCKER_REGISTRY # DOCKER_REGISTRY
function start-kube-scheduler { function start-kube-scheduler {
if [[ "${KUBE_SCHEDULER_CRP:-}" == "true" ]]; then if [[ -e "${KUBE_HOME}/bin/gke-internal-configure-helper.sh" ]]; then
echo "kube-scheduler is configured to be deployed through CRP." if ! deploy-kube-scheduler-via-kube-up; then
echo "kube-scheduler is configured to not be deployed through kube-up."
return return
fi fi
fi
echo "Start kubernetes scheduler" echo "Start kubernetes scheduler"
create-kubeconfig "kube-scheduler" "${KUBE_SCHEDULER_TOKEN}" create-kubeconfig "kube-scheduler" "${KUBE_SCHEDULER_TOKEN}"
# User and group should never contain characters that need to be quoted # User and group should never contain characters that need to be quoted