From f1da4c4352563bc39f7e84dee502dd78a84c4e0d Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 14 Dec 2022 08:35:19 +0100 Subject: [PATCH] Update cri-tools to v1.26.0 Signed-off-by: Sascha Grunert --- dependencies.yaml | 2 +- packages/deb/build.go | 2 +- packages/deb/build_test.go | 4 ++-- packages/rpm/kubelet.spec | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 4a5e2c5b4cf..1dbe5b3a673 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -34,7 +34,7 @@ dependencies: # CRI Tools - name: "crictl" - version: 1.25.0 + version: 1.26.0 refPaths: - path: packages/deb/build.go match: criToolsVersion\s+= "\d+\.\d+.\d+" diff --git a/packages/deb/build.go b/packages/deb/build.go index 5092b37a520..534adbffcf6 100644 --- a/packages/deb/build.go +++ b/packages/deb/build.go @@ -42,7 +42,7 @@ const ( ChannelNightly ChannelType = "nightly" currentCNIVersion = "1.1.1" - criToolsVersion = "1.25.0" + criToolsVersion = "1.26.0" pre180kubeadmconf = "pre-1.8/10-kubeadm.conf" pre1110kubeadmconf = "post-1.8/10-kubeadm.conf" latestkubeadmconf = "post-1.10/10-kubeadm.conf" diff --git a/packages/deb/build_test.go b/packages/deb/build_test.go index bae8e9ec715..2f3074db69e 100644 --- a/packages/deb/build_test.go +++ b/packages/deb/build_test.go @@ -74,7 +74,7 @@ func TestGetKubeadmDependencies(t *testing.T) { "kubectl (>= 1.19.0)", "kubernetes-cni (>= 0.8.7)", "${misc:Depends}", - "cri-tools (>= 1.25.0)", + "cri-tools (>= 1.26.0)", }, }, { @@ -85,7 +85,7 @@ func TestGetKubeadmDependencies(t *testing.T) { "kubectl (>= 1.19.0)", "kubernetes-cni (>= 0.8.7)", "${misc:Depends}", - "cri-tools (>= 1.25.0)", + "cri-tools (>= 1.26.0)", }, }, } diff --git a/packages/rpm/kubelet.spec b/packages/rpm/kubelet.spec index 38bfee42208..ad610b68e0c 100644 --- a/packages/rpm/kubelet.spec +++ b/packages/rpm/kubelet.spec @@ -12,7 +12,7 @@ %global KUBE_SEMVER %{semver %{KUBE_MAJOR} %{KUBE_MINOR} %{KUBE_PATCH}} %global CNI_VERSION 1.1.1 -%global CRI_TOOLS_VERSION 1.25.0 +%global CRI_TOOLS_VERSION 1.26.0 Name: kubelet Version: %{KUBE_VERSION} @@ -157,6 +157,9 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/ %changelog +* Thu Dec 14 2022 Sascha Grunert - 1.26.0 +- Update cri-tools to v1.26.0 + * Thu Aug 30 2022 Sascha Grunert - 1.25.0 - Update CNI plugins to v1.1.1