From f061875840611cea6c6ce54209201354ed865e10 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Wed, 12 Aug 2015 13:12:31 -0700 Subject: [PATCH] updating all references in .sh scripts --- build/build-official-release.sh | 2 +- build/mark-new-version.sh | 8 ++++---- build/versionize-docs.sh | 2 +- cluster/update-storage-objects.sh | 2 +- examples/high-availability/provision.sh | 2 +- examples/k8petstore/k8petstore-loadbalancer.sh | 4 ++-- examples/k8petstore/k8petstore-nodeport.sh | 2 +- examples/k8petstore/k8petstore.sh | 2 +- hack/cherry_pick_pull.sh | 6 +++--- hack/conformance-test.sh | 2 +- hack/gen-swagger-doc/run-gen-swagger-docs.sh | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/build-official-release.sh b/build/build-official-release.sh index 797cc566e92..161441278d6 100755 --- a/build/build-official-release.sh +++ b/build/build-official-release.sh @@ -41,7 +41,7 @@ function sha1() { fi } -declare -r KUBE_GITHUB="https://github.com/GoogleCloudPlatform/kubernetes.git" +declare -r KUBE_GITHUB="https://github.com/kubernetes/kubernetes.git" declare -r KUBE_RELEASE_VERSION=${1-} declare -r KUBE_RELEASE_UMASK=${KUBE_RELEASE_UMASK:-022} diff --git a/build/mark-new-version.sh b/build/mark-new-version.sh index 881397106f3..7bc473adeaa 100755 --- a/build/mark-new-version.sh +++ b/build/mark-new-version.sh @@ -24,11 +24,11 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. NEW_VERSION=${1-} -fetch_url=$(git remote -v | grep GoogleCloudPlatform/kubernetes.git | grep fetch | awk '{ print $2 }') -if ! push_url=$(git remote -v | grep GoogleCloudPlatform/kubernetes.git | grep push | awk '{ print $2 }'); then - push_url="https://github.com/GoogleCloudPlatform/kubernetes.git" +fetch_url=$(git remote -v | grep kubernetes/kubernetes.git | grep fetch | awk '{ print $2 }') +if ! push_url=$(git remote -v | grep kubernetes/kubernetes.git | grep push | awk '{ print $2 }'); then + push_url="https://github.com/kubernetes/kubernetes.git" fi -fetch_remote=$(git remote -v | grep GoogleCloudPlatform/kubernetes.git | grep fetch | awk '{ print $1 }') +fetch_remote=$(git remote -v | grep kubernetes/kubernetes.git | grep fetch | awk '{ print $1 }') VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$" [[ ${NEW_VERSION} =~ $VERSION_REGEX ]] || { diff --git a/build/versionize-docs.sh b/build/versionize-docs.sh index d65fc77dd6b..7822cf10b49 100755 --- a/build/versionize-docs.sh +++ b/build/versionize-docs.sh @@ -44,7 +44,7 @@ fi echo "+++ Versioning documentation and examples" # Update the docs to match this version. -HTML_PREVIEW_PREFIX="https://htmlpreview.github.io/\?https://github.com/GoogleCloudPlatform/kubernetes" +HTML_PREVIEW_PREFIX="https://htmlpreview.github.io/\?https://github.com/kubernetes/kubernetes" md_dirs=(docs examples) md_files=() diff --git a/cluster/update-storage-objects.sh b/cluster/update-storage-objects.sh index f853dd4e9bb..239127e4fef 100755 --- a/cluster/update-storage-objects.sh +++ b/cluster/update-storage-objects.sh @@ -19,7 +19,7 @@ # they are written using the latest API version. # # Steps to use this script to upgrade the cluster to a new version: -# https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/cluster_management.md#updgrading-to-a-different-api-version +# https://github.com/kubernetes/kubernetes/blob/master/docs/cluster_management.md#updgrading-to-a-different-api-version set -o errexit set -o nounset diff --git a/examples/high-availability/provision.sh b/examples/high-availability/provision.sh index 0cd7c943d4b..ceb57592748 100755 --- a/examples/high-availability/provision.sh +++ b/examples/high-availability/provision.sh @@ -80,7 +80,7 @@ function test_etcd { function k8petstore { ### run K8petstore . Should work perfectly IFF flannel and so on is setup properly. - wget https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/release-0.17/examples/k8petstore/k8petstore.sh + wget https://raw.githubusercontent.com/kubernetes/kubernetes/release-0.17/examples/k8petstore/k8petstore.sh chmod 777 k8petstore.sh ./k8petstore.sh } diff --git a/examples/k8petstore/k8petstore-loadbalancer.sh b/examples/k8petstore/k8petstore-loadbalancer.sh index b4338ffca5c..1ae4de652d0 100755 --- a/examples/k8petstore/k8petstore-loadbalancer.sh +++ b/examples/k8petstore/k8petstore-loadbalancer.sh @@ -20,7 +20,7 @@ echo "WRITING KUBE FILES , will overwrite the jsons, then testing pods. is kube #Args below can be overriden when calling from cmd line. #Just send all the args in order. #for dev/test you can use: -#kubectl=$GOPATH/src/github.com/GoogleCloudPlatform/kubernetes/cluster/kubectl.sh" +#kubectl=$GOPATH/src/github.com/kubernetes/kubernetes/cluster/kubectl.sh" kubectl="kubectl" VERSION="r.2.8.19" _SECONDS=1000 # number of seconds to measure throughput. @@ -227,7 +227,7 @@ $kubectl create -f fe-s.json --namespace=$NS $kubectl create -f bps-load-gen-rc.json --namespace=$NS } -#This script assumes the cloud provider is able to create a load balancer. If this not the case, you may want to check out other ways to make the frontend service accessible from outside (https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/services.md#external-services) +#This script assumes the cloud provider is able to create a load balancer. If this not the case, you may want to check out other ways to make the frontend service accessible from outside (https://github.com/kubernetes/kubernetes/blob/master/docs/services.md#external-services) function getIP { echo "Waiting up to 1 min for a public IP to be assigned by the cloud provider..." for i in `seq 1 20`; diff --git a/examples/k8petstore/k8petstore-nodeport.sh b/examples/k8petstore/k8petstore-nodeport.sh index 2709449dffc..07b2cd1d2db 100755 --- a/examples/k8petstore/k8petstore-nodeport.sh +++ b/examples/k8petstore/k8petstore-nodeport.sh @@ -20,7 +20,7 @@ echo "WRITING KUBE FILES , will overwrite the jsons, then testing pods. is kube #Args below can be overriden when calling from cmd line. #Just send all the args in order. #for dev/test you can use: -#kubectl=$GOPATH/src/github.com/GoogleCloudPlatform/kubernetes/cluster/kubectl.sh" +#kubectl=$GOPATH/src/github.com/kubernetes/kubernetes/cluster/kubectl.sh" kubectl="kubectl" VERSION="r.2.8.19" _SECONDS=1000 # number of seconds to measure throughput. diff --git a/examples/k8petstore/k8petstore.sh b/examples/k8petstore/k8petstore.sh index 7558ccc4198..4d75e2e07c1 100755 --- a/examples/k8petstore/k8petstore.sh +++ b/examples/k8petstore/k8petstore.sh @@ -20,7 +20,7 @@ echo "WRITING KUBE FILES , will overwrite the jsons, then testing pods. is kube #Args below can be overriden when calling from cmd line. #Just send all the args in order. #for dev/test you can use: -#kubectl=$GOPATH/src/github.com/GoogleCloudPlatform/kubernetes/cluster/kubectl.sh" +#kubectl=$GOPATH/src/github.com/kubernetes/kubernetes/cluster/kubectl.sh" kubectl="kubectl" VERSION="r.2.8.19" PUBLIC_IP="10.1.4.89" # ip which we use to access the Web server. diff --git a/hack/cherry_pick_pull.sh b/hack/cherry_pick_pull.sh index 2b5ade80714..5ab230d4a71 100755 --- a/hack/cherry_pick_pull.sh +++ b/hack/cherry_pick_pull.sh @@ -136,15 +136,15 @@ gitamcleanup=false function make-a-pr() { local rel=$(basename ${BRANCH}) echo "+++ Creating a pull request on github" - hub pull-request -F- -h "${GITHUB_USER}:${NEWBRANCH}" -b "GoogleCloudPlatform:${rel}" <