use dl.k8s.io instead of kubernetes-release uri

there were simple enough to merely search-replace vs the script in previous commits
kubernetes-sigs · Jul 16, 2021 · db0f4fa · db0f4fa
1 parent d38ed91
commit db0f4fa
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/images/capi/ansible/windows/example.vars.yml b/images/capi/ansible/windows/example.vars.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-kubernetes_base_url: https://storage.googleapis.com/kubernetes-release/release/v1.19.2/bin/windows/amd64
+kubernetes_base_url: https://dl.k8s.io/release/v1.19.2/bin/windows/amd64
 cloudbase_init_url: https://github.com/cloudbase/cloudbase-init/releases/download/1.1.2/CloudbaseInitSetup_1_1_2_x64.msi
 wins_url: https://github.com/rancher/wins/releases/download/v0.0.4/wins.exe
 nssm_url: https://azurek8scishared.blob.core.windows.net/nssm/nssm.exe

diff --git a/images/capi/hack/serve_artifacts.go b/images/capi/hack/serve_artifacts.go
@@ -24,7 +24,7 @@ var (
 func main() {
 	artifacts := map[string]string {
 	   "kubelet.exe": "kubernetes_base_url",
-	   //"kubernetes_base_url": "https://storage.googleapis.com/kubernetes-release/release/v1.19.2/bin/windows/amd64",
+	   //"kubernetes_base_url": "https://dl.k8s.io/release/v1.19.2/bin/windows/amd64",
 	   "CloudbaseInit*": "cloudbase_init_url",  
 	   // "cloudbase_init_url": "https://github.com/cloudbase/cloudbase-init/releases/download/1.1.2/CloudbaseInitSetup_1_1_2_x64.msi",
 	   "wins.exe": "wins_url", //: "https://github.com/rancher/wins/releases/download/v0.0.4/wins.exe",

diff --git a/images/capi/packer/config/kubernetes.json b/images/capi/packer/config/kubernetes.json
@@ -7,7 +7,7 @@
   "kubernetes_deb_gpg_key": "https://packages.cloud.google.com/apt/doc/apt-key.gpg",
   "kubernetes_deb_repo": "\"https://apt.kubernetes.io/ kubernetes-xenial\"",
   "kubernetes_deb_version": "1.19.11-00",
-  "kubernetes_http_source": "https://storage.googleapis.com/kubernetes-release/release",
+  "kubernetes_http_source": "https://dl.k8s.io/release",
   "kubernetes_load_additional_imgs": "false",
   "kubernetes_rpm_gpg_check": "True",
   "kubernetes_rpm_gpg_key": "\"https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\"",

diff --git a/images/kube-deploy/imagebuilder/templates/1.11-stretch.yml b/images/kube-deploy/imagebuilder/templates/1.11-stretch.yml
@@ -155,8 +155,8 @@ plugins:
        - [ 'wget', 'https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz', '-O', '{root}/var/cache/nodeup/sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz' ]
        - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822  sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz" | sha256sum -c -' ]
 
-       - [ 'wget', 'https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
-       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
+       - [ 'wget', 'https://dl.k8s.io/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
+       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
 
        # We perform a full replacement of some grub conf variables:
        #   GRUB_CMDLINE_LINUX_DEFAULT (add memory cgroup)

diff --git a/images/kube-deploy/imagebuilder/templates/1.12-stretch.yml b/images/kube-deploy/imagebuilder/templates/1.12-stretch.yml
@@ -155,8 +155,8 @@ plugins:
        - [ 'wget', 'https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz', '-O', '{root}/var/cache/nodeup/sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz' ]
        - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822  sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz" | sha256sum -c -' ]
 
-       - [ 'wget', 'https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
-       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
+       - [ 'wget', 'https://dl.k8s.io/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
+       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
 
        # We perform a full replacement of some grub conf variables:
        #   GRUB_CMDLINE_LINUX_DEFAULT (add memory cgroup)

diff --git a/images/kube-deploy/imagebuilder/templates/1.13-stretch.yml b/images/kube-deploy/imagebuilder/templates/1.13-stretch.yml
@@ -155,8 +155,8 @@ plugins:
        - [ 'wget', 'https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz', '-O', '{root}/var/cache/nodeup/sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz' ]
        - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822  sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz" | sha256sum -c -' ]
 
-       - [ 'wget', 'https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
-       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
+       - [ 'wget', 'https://dl.k8s.io/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
+       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
 
        # We perform a full replacement of some grub conf variables:
        #   GRUB_CMDLINE_LINUX_DEFAULT (add memory cgroup)

diff --git a/images/kube-deploy/imagebuilder/templates/1.14-stretch.yml b/images/kube-deploy/imagebuilder/templates/1.14-stretch.yml
@@ -155,8 +155,8 @@ plugins:
        - [ 'wget', 'https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz', '-O', '{root}/var/cache/nodeup/sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz' ]
        - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822  sha256:346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822_https___download_docker_com_linux_static_stable_x86_64_docker-18_06_3-ce_tgz" | sha256sum -c -' ]
 
-       - [ 'wget', 'https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
-       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___storage_googleapis_com_kubernetes-release_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
+       - [ 'wget', 'https://dl.k8s.io/network-plugins/cni-plugins-amd64-v0.7.5.tgz', '-O', '{root}/var/cache/nodeup/sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz' ]
+       - [ '/bin/sh', '-c', 'cd {root}/var/cache/nodeup; echo "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64  sha256:3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64_https___dl_k8s_io_network-plugins_cni-plugins-amd64-v0_7_5_tgz" | sha256sum -c -' ]
 
        # We perform a full replacement of some grub conf variables:
        #   GRUB_CMDLINE_LINUX_DEFAULT (add memory cgroup)