mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #106843 from liggitt/drop-curl-bash
Drop unused auto-install invocation
This commit is contained in:
		@@ -162,21 +162,11 @@ function verify-prereqs() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  # we use gcloud to create the cluster, gsutil to stage binaries and data
 | 
					  # we use gcloud to create the cluster, gsutil to stage binaries and data
 | 
				
			||||||
  for cmd in gcloud gsutil; do
 | 
					  for cmd in gcloud gsutil; do
 | 
				
			||||||
    if ! which "${cmd}" >/dev/null; then
 | 
					 | 
				
			||||||
      local resp="n"
 | 
					 | 
				
			||||||
      if [[ "${KUBE_PROMPT_FOR_UPDATE}" == "y" ]]; then
 | 
					 | 
				
			||||||
        echo "Can't find ${cmd} in PATH.  Do you wish to install the Google Cloud SDK? [Y/n]"
 | 
					 | 
				
			||||||
        read -r resp
 | 
					 | 
				
			||||||
      fi
 | 
					 | 
				
			||||||
      if [[ "${resp}" != "n" && "${resp}" != "N" ]]; then
 | 
					 | 
				
			||||||
        curl https://sdk.cloud.google.com | bash
 | 
					 | 
				
			||||||
      fi
 | 
					 | 
				
			||||||
    if ! which "${cmd}" >/dev/null; then
 | 
					    if ! which "${cmd}" >/dev/null; then
 | 
				
			||||||
      echo "Can't find ${cmd} in PATH, please fix and retry. The Google Cloud " >&2
 | 
					      echo "Can't find ${cmd} in PATH, please fix and retry. The Google Cloud " >&2
 | 
				
			||||||
      echo "SDK can be downloaded from https://cloud.google.com/sdk/." >&2
 | 
					      echo "SDK can be downloaded from https://cloud.google.com/sdk/." >&2
 | 
				
			||||||
      exit 1
 | 
					      exit 1
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
    fi
 | 
					 | 
				
			||||||
  done
 | 
					  done
 | 
				
			||||||
  update-or-verify-gcloud
 | 
					  update-or-verify-gcloud
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user