From 1ec16901ab9217db64cf5f641e088b381b3b1532 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 29 May 2020 00:39:29 -0400 Subject: [PATCH] Use k8s-artifacts-cri-tools GCS bucket as source for CRI tools Signed-off-by: Stephen Augustus --- debian/bionic/cri-tools/debian/rules | 2 +- rpm/kubelet.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/bionic/cri-tools/debian/rules b/debian/bionic/cri-tools/debian/rules index 56606ad9f02..18115f502ee 100644 --- a/debian/bionic/cri-tools/debian/rules +++ b/debian/bionic/cri-tools/debian/rules @@ -9,7 +9,7 @@ build: binary: mkdir -p ./bin curl -sSL --fail --retry 5 \ - "https://github.com/kubernetes-sigs/cri-tools/releases/download/v$(CRI_TOOLS_VERSION)/crictl-v$(CRI_TOOLS_VERSION)-linux-{{ .Arch }}.tar.gz" \ + "https://storage.googleapis.com/k8s-artifacts-cri-tools/release/v$(CRI_TOOLS_VERSION)/crictl-v$(CRI_TOOLS_VERSION)-linux-{{ .Arch }}.tar.gz" \ | tar -C ./bin -xz dh_testroot dh_auto_install diff --git a/rpm/kubelet.spec b/rpm/kubelet.spec index 511aa48fc53..0d303fa687c 100644 --- a/rpm/kubelet.spec +++ b/rpm/kubelet.spec @@ -28,7 +28,7 @@ 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 Source6: kubelet.env -Source7: https://github.com/kubernetes-sigs/cri-tools/releases/download/v%{CRI_TOOLS_VERSION}/crictl-v%{CRI_TOOLS_VERSION}-linux-%{ARCH}.tar.gz +Source7: https://storage.googleapis.com/k8s-artifacts-cri-tools/release/v%{CRI_TOOLS_VERSION}/crictl-v%{CRI_TOOLS_VERSION}-linux-%{ARCH}.tar.gz BuildRequires: systemd BuildRequires: curl @@ -157,6 +157,10 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/ %changelog +* Fri May 29 2020 Stephen Augustus - 1.18.4 +- Source cri-tools from https://storage.googleapis.com/k8s-artifacts-cri-tools/release + instead of https://github.com/kubernetes-sigs/cri-tools + * Thu Jun 24 2019 Stephen Augustus - 1.15.1 - Bump minimum versions of all kubernetes dependencies - Remove conditional logic for unsupported versions of Kubernetes