Revert "Update cri-tools to v1.26.0"

This reverts commit f1da4c4.
kubernetes · Jan 25, 2023 · 0b473ac · 0b473ac
1 parent 6ebf124
commit 0b473ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -34,7 +34,7 @@ dependencies:
 
   # CRI Tools
   - name: "crictl"
-    version: 1.26.0
+    version: 1.25.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
@@ -42,7 +42,7 @@ const (
 	ChannelNightly  ChannelType = "nightly"
 
 	currentCNIVersion  = "1.1.1"
-	criToolsVersion    = "1.26.0"
+	criToolsVersion    = "1.25.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
@@ -74,7 +74,7 @@ func TestGetKubeadmDependencies(t *testing.T) {
 				"kubectl (>= 1.19.0)",
 				"kubernetes-cni (>= 0.8.7)",
 				"${misc:Depends}",
-				"cri-tools (>= 1.26.0)",
+				"cri-tools (>= 1.25.0)",
 			},
 		},
 		{
@@ -85,7 +85,7 @@ func TestGetKubeadmDependencies(t *testing.T) {
 				"kubectl (>= 1.19.0)",
 				"kubernetes-cni (>= 0.8.7)",
 				"${misc:Depends}",
-				"cri-tools (>= 1.26.0)",
+				"cri-tools (>= 1.25.0)",
 			},
 		},
 	}

diff --git 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.26.0
+%global CRI_TOOLS_VERSION 1.25.0
 
 Name: kubelet
 Version: %{KUBE_VERSION}
@@ -157,6 +157,12 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/
 
 
 %changelog
+* Wed Jan 25 2023 Marko Mudrinić <mudrinic.mare@gmail.com> - 1.26.2
+- Revert updating CNI plugins to v1.2.0 and cri-tools to v1.26.0
+
+* Tue Jan 17 2023 Sascha Grunert <sgrunert@redhat.com> - 1.26.0
+- Update CNI plugins to v1.2.0
+
 * Thu Dec 14 2022 Sascha Grunert <sgrunert@redhat.com> - 1.26.0
 - Update cri-tools to v1.26.0