Merge pull request kubernetes#119663 from dims/avoid-pulling-mounter-…

…through-CDN Avoid pulling mounter.tar through the CDN
openshift · Jul 29, 2023 · cc2f7b3 · cc2f7b3
2 parents 97c7dbc + b4ef401
commit cc2f7b3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
@@ -254,7 +254,7 @@ function install-gci-mounter-tools {
   mkdir -p "${CONTAINERIZED_MOUNTER_HOME}"
   chmod a+x "${CONTAINERIZED_MOUNTER_HOME}"
   mkdir -p "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
-  download-or-bust "${mounter_tar_sha}" "https://dl.k8s.io/gci-mounter/mounter.tar"
+  download-or-bust "${mounter_tar_sha}" "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar"
   cp "${KUBE_HOME}/kubernetes/server/bin/mounter" "${CONTAINERIZED_MOUNTER_HOME}/mounter"
   chmod a+x "${CONTAINERIZED_MOUNTER_HOME}/mounter"
   mv "${KUBE_HOME}/mounter.tar" /tmp/mounter.tar

diff --git a/test/e2e_node/jenkins/cos-init-live-restore.yaml b/test/e2e_node/jenkins/cos-init-live-restore.yaml
@@ -12,7 +12,7 @@ runcmd:
   - mkdir -p /home/kubernetes/containerized_mounter/rootfs
   - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
   - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
   - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
   - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
   - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

diff --git a/test/e2e_node/jenkins/gci-init-gpu.yaml b/test/e2e_node/jenkins/gci-init-gpu.yaml
@@ -17,7 +17,7 @@ runcmd:
   - mkdir -p /home/kubernetes/containerized_mounter/rootfs
   - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
   - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
   - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
   - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
   - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

diff --git a/test/e2e_node/jenkins/gci-init.yaml b/test/e2e_node/jenkins/gci-init.yaml
@@ -7,7 +7,7 @@ runcmd:
   - mkdir -p /home/kubernetes/containerized_mounter/rootfs
   - mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
   - mount -o remount, exec /home/kubernetes/containerized_mounter/
-  - wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
+  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
   - tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
   - mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
   - mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet