Source CNI plugins from gs://k8s-artifacts-cni/release

Signed-off-by: Stephen Augustus <[email protected]>
kubernetes · May 29, 2020 · b5815d8 · b5815d8
1 parent 14701fd
commit b5815d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/debian/bionic/kubernetes-cni/debian/rules b/debian/bionic/kubernetes-cni/debian/rules
@@ -10,7 +10,7 @@ build:
 binary:
 	mkdir -p ./bin
 	curl -sSL --fail --retry 5 \
-		"https://dl.k8s.io/network-plugins/cni-plugins-{{ .Arch }}-$(CNI_VERSION).tgz" \
+		"https://storage.googleapis.com/k8s-artifacts-cni/release/$(CNI_VERSION)/cni-plugins-linux-{{ .Arch }}-$(CNI_VERSION).tgz" \
 		| tar -C ./bin -xz
 	dh_testroot
 	dh_auto_install

diff --git a/rpm/kubelet.spec b/rpm/kubelet.spec
@@ -26,7 +26,7 @@ Source1: kubelet.service
 Source2: https://dl.k8s.io/v%{KUBE_VERSION}/bin/linux/%{ARCH}/kubectl
 Source3: https://dl.k8s.io/v%{KUBE_VERSION}/bin/linux/%{ARCH}/kubeadm
 Source4: 10-kubeadm.conf
-Source5: https://dl.k8s.io/network-plugins/cni-plugins-%{ARCH}-v%{CNI_VERSION}.tgz
+Source5: https://storage.googleapis.com/k8s-artifacts-cni/release/v%{CNI_VERSION}/cni-plugins-linux-%{ARCH}-v%{CNI_VERSION}.tgz
 Source6: kubelet.env
 Source7: https://storage.googleapis.com/k8s-artifacts-cri-tools/release/v%{CRI_TOOLS_VERSION}/crictl-v%{CRI_TOOLS_VERSION}-linux-%{ARCH}.tar.gz
 
@@ -130,7 +130,7 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -p -m 644 -T kubelet.env %{buildroot}%{_sysconfdir}/sysconfig/kubelet
 
 install -m 755 -d %{buildroot}/opt/cni/bin
-# bin directory from cni-plugins-%{ARCH}-%{CNI_VERSION}.tgz with a list of cni plugins (among other things)
+# bin directory from cni-plugins-linux-%{ARCH}-%{CNI_VERSION}.tgz with a list of cni plugins (among other things)
 mv cni-plugins/* %{buildroot}/opt/cni/bin/
 
 %files
@@ -161,6 +161,10 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/
 - Source cri-tools from https://storage.googleapis.com/k8s-artifacts-cri-tools/release
   instead of https://github.com/kubernetes-sigs/cri-tools
 
+* Fri May 22 2020 Stephen Augustus <[email protected]> - 1.18.4
+- Source CNI plugins from https://storage.googleapis.com/k8s-artifacts-cni/release
+  instead of https://dl.k8s.io/network-plugins
+
 * Thu Jun 24 2019 Stephen Augustus <[email protected]> - 1.15.1
 - Bump minimum versions of all kubernetes dependencies
 - Remove conditional logic for unsupported versions of Kubernetes