Use https://dl.k8s.io instead of https://storage.googleapis.com/...

roberthbailey · Dec 7, 2016 · d7fc15d · d7fc15d
1 parent 28da69f
commit d7fc15d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 13 deletions.
diff --git a/debian/xenial/kubeadm/debian/rules b/debian/xenial/kubeadm/debian/rules
@@ -10,7 +10,7 @@ binary:
 	mkdir -p usr/bin
 	curl --fail -sSL \
 		-o usr/bin/kubeadm \
-		"https://storage.googleapis.com/kubernetes-release-dev/ci-cross/v1.5.0-alpha.2.421+a6bea3d79b8bba/bin/linux/{{ .Arch }}/kubeadm"
+		"https://dl.k8s.io/ci-cross/v1.5.0-alpha.2.421+a6bea3d79b8bba/bin/linux/{{ .Arch }}/kubeadm"
 
 	chmod +x usr/bin/kubeadm
 	dh_testroot

diff --git a/debian/xenial/kubectl/debian/rules b/debian/xenial/kubectl/debian/rules
@@ -10,7 +10,7 @@ binary:
 	mkdir -p usr/bin
 	curl  --fail -sS -L \
 		-o usr/bin/kubectl \
-		"https://storage.googleapis.com/kubernetes-release/release/v{{ .Version }}/bin/linux/{{ .Arch }}/kubectl"
+		"https://dl.k8s.io/v{{ .Version }}/bin/linux/{{ .Arch }}/kubectl"
 	chmod +x usr/bin/kubectl
 	dh_testroot
 	dh_auto_install

diff --git a/debian/xenial/kubelet/debian/rules b/debian/xenial/kubelet/debian/rules
@@ -10,7 +10,7 @@ binary:
 	mkdir -p usr/bin
 	curl  --fail -sS -L \
 		-o usr/bin/kubelet \
-		"https://storage.googleapis.com/kubernetes-release/release/v{{ .Version }}/bin/linux/{{ .Arch }}/kubelet"
+		"https://dl.k8s.io/v{{ .Version }}/bin/linux/{{ .Arch }}/kubelet"
 	chmod +x usr/bin/kubelet
 	dh_testroot
 	dh_auto_install

diff --git a/debian/xenial/kubernetes-cni/debian/rules b/debian/xenial/kubernetes-cni/debian/rules
@@ -9,7 +9,7 @@ build:
 
 binary:
 	curl -sSL --fail --retry 5 \
-		"https://storage.googleapis.com/kubernetes-release/network-plugins/cni-{{ .Arch }}-$(CNI_RELEASE).tar.gz" \
+		"https://dl.k8s.io/network-plugins/cni-{{ .Arch }}-$(CNI_RELEASE).tar.gz" \
 		| tar xz
 	dh_testroot
 	dh_auto_install

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -28,7 +28,7 @@ A example major milestone release (1.X.0) in CHANGELOG.md:
 
 binary | sha1 hash | md5 hash
 ------ | --------- | --------
-[kubernetes.tar.gz](https://storage.googleapis.com/kubernetes-release/release/v1.X.0/kubernetes.tar.gz) | `7deca064d2e277a0beed802c7cfe32d152434aed` | `0b735e8b9fd64064caa578d49062820d`
+[kubernetes.tar.gz](https://dl.k8s.io/v1.X.0/kubernetes.tar.gz) | `7deca064d2e277a0beed802c7cfe32d152434aed` | `0b735e8b9fd64064caa578d49062820d`
 
 ## Major Themes
 * TBD

diff --git a/lib/releaselib.sh b/lib/releaselib.sh
@@ -687,6 +687,9 @@ release::gcs::publish () {
   local publish_file_dst="gs://$bucket/$publish_file"
   local contents
   local public_link="https://storage.googleapis.com/$bucket/$publish_file"
+  if [[ "$bucket" == "kubernetes-release" ]]; then
+    public_link="https://dl.k8s.io/$publish_file"
+  fi
 
   logrun mkdir -p "$release_stage/upload" || return 1
   echo "$version" > "$release_stage/upload/latest" || return 1

diff --git a/relnotes b/relnotes
@@ -180,13 +180,19 @@ get_prs_by_label () {
 create_downloads_table () {
   local heading=$1
   shift
+  local url_prefix
+  if [[ "$release_bucket" == "kubernetes-release" ]]; then
+    url_prefix="https://dl.k8s.io"
+  else
+    url_prefix="https://storage.googleapis.com/$release_bucket/release"
+  fi
 
   [[ -n "$heading" ]] && echo "### $heading"
   echo
   echo "filename | sha256 hash"
   echo "-------- | -----------"
   for file in $@; do
-    echo "[${file##*/}](https://storage.googleapis.com/$release_bucket/release/$release_tag/${file##*/}) | \`$(common::sha $file 256)\`"
+    echo "[${file##*/}]($url_prefix/$release_tag/${file##*/}) | \`$(common::sha $file 256)\`"
   done
   echo
 }
@@ -216,8 +222,8 @@ create_body () {
   echo
   echo "# $title"
   echo
-  echo "[Documentation](http://kubernetes.github.io) &" \
-       "[Examples](http://releases.k8s.io/$CURRENT_BRANCH/examples)"
+  echo "[Documentation](https://docs.k8s.io) &" \
+       "[Examples](https://releases.k8s.io/$CURRENT_BRANCH/examples)"
   echo
   if [[ -n $release_tars ]]; then
     echo "## Downloads for $title"

diff --git a/rpm/kubelet.spec b/rpm/kubelet.spec
@@ -1,7 +1,7 @@
 %global KUBE_VERSION 1.5.0-beta.2
 %global KUBEADM_VERSION 1.5.0-alpha.2.421+a6bea3d79b8bba
 %global CNI_RELEASE 07a8a28637e97b22eb8dfe710eeae1344f69d16e
-%global RPM_RELEASE 1
+%global RPM_RELEASE 2
 
 Name: kubelet
 Version: %{KUBE_VERSION}
@@ -10,12 +10,12 @@ Summary: Container cluster management
 License: ASL 2.0
 
 URL: https://kubernetes.io
-Source0: https://storage.googleapis.com/kubernetes-release/release/v%{KUBE_VERSION}/bin/linux/amd64/kubelet
+Source0: https://dl.k8s.io/v%{KUBE_VERSION}/bin/linux/amd64/kubelet
 Source1: kubelet.service
-Source2: https://storage.googleapis.com/kubernetes-release/release/v%{KUBE_VERSION}/bin/linux/amd64/kubectl
-Source3: https://storage.googleapis.com/kubernetes-release-dev/ci-cross/v%{KUBEADM_VERSION}/bin/linux/amd64/kubeadm
+Source2: https://dl.k8s.io/v%{KUBE_VERSION}/bin/linux/amd64/kubectl
+Source3: https://dl.k8s.io/ci-cross/v%{KUBEADM_VERSION}/bin/linux/amd64/kubeadm
 Source4: 10-kubeadm.conf
-Source5: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-%{CNI_RELEASE}.tar.gz
+Source5: https://dl.k8s.io/network-plugins/cni-amd64-%{CNI_RELEASE}.tar.gz
 
 
 BuildRequires: curl