mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	updating all references in .sh scripts
This commit is contained in:
		| @@ -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} | ||||
|  | ||||
|   | ||||
| @@ -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 ]] || { | ||||
|   | ||||
| @@ -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=() | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
| } | ||||
|   | ||||
| @@ -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`; | ||||
|   | ||||
| @@ -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. | ||||
|   | ||||
| @@ -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. | ||||
|   | ||||
| @@ -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}" <<EOF | ||||
|   hub pull-request -F- -h "${GITHUB_USER}:${NEWBRANCH}" -b "kubernetes:${rel}" <<EOF | ||||
| Automated cherry pick of ${PULLSUBJ} | ||||
|  | ||||
| Cherry pick of ${PULLSUBJ} on ${rel}. | ||||
| EOF | ||||
| } | ||||
|  | ||||
| if git remote -v | grep ^origin | grep GoogleCloudPlatform/kubernetes.git; then | ||||
|   echo "!!! You have 'origin' configured as your GoogleCloudPlatform/kubernetes.git" | ||||
| if git remote -v | grep ^origin | grep kubernetes/kubernetes.git; then | ||||
|   echo "!!! You have 'origin' configured as your kubernetes/kubernetes.git" | ||||
|   echo "This isn't normal. Leaving you with push instructions:" | ||||
|   echo | ||||
|   echo "+++ First manually push the branch this script created:" | ||||
|   | ||||
| @@ -27,7 +27,7 @@ | ||||
| #    declare -x KUBE_MASTER_IP="1.2.3.4" | ||||
| #  - Make sure only essential pods are running and there are no failed/pending pods. | ||||
| #  - Go to a git tree that contains the kubernetes source. | ||||
| #    - git clone git://github.com/GoogleCloudPlatform/kubernetes.git | ||||
| #    - git clone git://github.com/kubernetes/kubernetes.git | ||||
| #  - Checkout the upstream/conformance-test-v1 branch | ||||
| #    - git checkout upstream/conformance-test-v1 | ||||
| #    - The working tree will be in a "detached HEAD" state. | ||||
|   | ||||
| @@ -20,5 +20,5 @@ if [ "$#" -lt 1 ]; then | ||||
| fi | ||||
| OUTPUT=${2:-${PWD}} | ||||
|  | ||||
| docker run -v ${OUTPUT}:/output gcr.io/google_containers/gen-swagger-docs:v1 https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/api/swagger-spec/$1.json https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/$1/register.go | ||||
| docker run -v ${OUTPUT}:/output gcr.io/google_containers/gen-swagger-docs:v1 https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/swagger-spec/$1.json https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/$1/register.go | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user