Skip to content

Commit 880e2e6

Browse files
Merge remote-tracking branch 'origin/master' into release-1.28
2 parents 0ed6d9a + cc2f7b3 commit 880e2e6

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

cluster/gce/gci/configure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function install-gci-mounter-tools {
254254
mkdir -p "${CONTAINERIZED_MOUNTER_HOME}"
255255
chmod a+x "${CONTAINERIZED_MOUNTER_HOME}"
256256
mkdir -p "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
257-
download-or-bust "${mounter_tar_sha}" "https://dl.k8s.io/gci-mounter/mounter.tar"
257+
download-or-bust "${mounter_tar_sha}" "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar"
258258
cp "${KUBE_HOME}/kubernetes/server/bin/mounter" "${CONTAINERIZED_MOUNTER_HOME}/mounter"
259259
chmod a+x "${CONTAINERIZED_MOUNTER_HOME}/mounter"
260260
mv "${KUBE_HOME}/mounter.tar" /tmp/mounter.tar

test/e2e_node/jenkins/cos-init-live-restore.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runcmd:
1212
- mkdir -p /home/kubernetes/containerized_mounter/rootfs
1313
- mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
1414
- mount -o remount, exec /home/kubernetes/containerized_mounter/
15-
- wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
15+
- wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
1616
- tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
1717
- mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
1818
- mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

test/e2e_node/jenkins/gci-init-gpu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runcmd:
1717
- mkdir -p /home/kubernetes/containerized_mounter/rootfs
1818
- mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
1919
- mount -o remount, exec /home/kubernetes/containerized_mounter/
20-
- wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
20+
- wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
2121
- tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
2222
- mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
2323
- mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

test/e2e_node/jenkins/gci-init.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runcmd:
77
- mkdir -p /home/kubernetes/containerized_mounter/rootfs
88
- mount --bind /home/kubernetes/containerized_mounter/ /home/kubernetes/containerized_mounter/
99
- mount -o remount, exec /home/kubernetes/containerized_mounter/
10-
- wget https://dl.k8s.io/gci-mounter/mounter.tar -O /tmp/mounter.tar
10+
- wget https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar -O /tmp/mounter.tar
1111
- tar xvf /tmp/mounter.tar -C /home/kubernetes/containerized_mounter/rootfs
1212
- mkdir -p /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet
1313
- mount --rbind /var/lib/kubelet /home/kubernetes/containerized_mounter/rootfs/var/lib/kubelet

0 commit comments

Comments
 (0)