github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove several red herring error messages in GCE cluster scripts

Browse Source
This commit is contained in:
Jeff Grafton
2016-10-18 17:32:56 -07:00
parent 743e0689cc
commit 7a7cbcffd3
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/common.sh
View File

@@ -147,15 +147,15 @@ function clear-kubeconfig() {
fi fi
local kubectl="${KUBE_ROOT}/cluster/kubectl.sh" local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
"${kubectl}" config unset "clusters.${CONTEXT}" # Unset the current-context before we delete it, as otherwise kubectl errors.
"${kubectl}" config unset "users.${CONTEXT}"
"${kubectl}" config unset "users.${CONTEXT}-basic-auth"
"${kubectl}" config unset "contexts.${CONTEXT}"
local cc=$("${kubectl}" config view -o jsonpath='{.current-context}') local cc=$("${kubectl}" config view -o jsonpath='{.current-context}')
if [[ "${cc}" == "${CONTEXT}" ]]; then if [[ "${cc}" == "${CONTEXT}" ]]; then
"${kubectl}" config unset current-context "${kubectl}" config unset current-context
fi fi
"${kubectl}" config unset "clusters.${CONTEXT}"
"${kubectl}" config unset "users.${CONTEXT}"
"${kubectl}" config unset "users.${CONTEXT}-basic-auth"
"${kubectl}" config unset "contexts.${CONTEXT}"
echo "Cleared config for ${CONTEXT} from ${KUBECONFIG}" echo "Cleared config for ${CONTEXT} from ${KUBECONFIG}"
} }

3
cluster/gce/util.sh
View File

@@ -277,7 +277,7 @@ function upload-server-tars() {
local staging_bucket="gs://kubernetes-staging-${project_hash}${suffix}" local staging_bucket="gs://kubernetes-staging-${project_hash}${suffix}"
# Ensure the buckets are created # Ensure the buckets are created
if ! gsutil ls "${staging_bucket}" ; then if ! gsutil ls "${staging_bucket}" >/dev/null; then
echo "Creating ${staging_bucket}" echo "Creating ${staging_bucket}"
gsutil mb -l "${region}" "${staging_bucket}" gsutil mb -l "${region}" "${staging_bucket}"
fi fi
@@ -1161,6 +1161,7 @@ function check-cluster() {
# returns the result of ssh command which removes replica # returns the result of ssh command which removes replica
function remove-replica-from-etcd() { function remove-replica-from-etcd() {
local -r port="${1}" local -r port="${1}"
[[ -n "${EXISTING_MASTER_NAME}" ]] || return
gcloud compute ssh "${EXISTING_MASTER_NAME}" \ gcloud compute ssh "${EXISTING_MASTER_NAME}" \
--project "${PROJECT}" \ --project "${PROJECT}" \
--zone "${EXISTING_MASTER_ZONE}" \ --zone "${EXISTING_MASTER_ZONE}" \