Skip to content

Commit

Permalink
Merge pull request #2863 from saschagrunert/cni-plugins-1.2.0
Browse files Browse the repository at this point in the history
Update CNI plugins to v1.2.0
  • Loading branch information
k8s-ci-robot authored Jan 17, 2023
2 parents 2c97b3f + 024e778 commit e10a44f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:

# CNI plugins
- name: "CNI plugins"
version: 1.1.1
version: 1.2.0
refPaths:
- path: packages/deb/build.go
match: currentCNIVersion\s+= "\d+\.\d+.\d+"
Expand Down
2 changes: 1 addition & 1 deletion packages/deb/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const (
ChannelUnstable ChannelType = "unstable"
ChannelNightly ChannelType = "nightly"

currentCNIVersion = "1.1.1"
currentCNIVersion = "1.2.0"
criToolsVersion = "1.26.0"
pre180kubeadmconf = "pre-1.8/10-kubeadm.conf"
pre1110kubeadmconf = "post-1.8/10-kubeadm.conf"
Expand Down
5 changes: 4 additions & 1 deletion packages/rpm/kubelet.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
%define semver() (%1 * 256 * 256 + %2 * 256 + %3)
%global KUBE_SEMVER %{semver %{KUBE_MAJOR} %{KUBE_MINOR} %{KUBE_PATCH}}

%global CNI_VERSION 1.1.1
%global CNI_VERSION 1.2.0
%global CRI_TOOLS_VERSION 1.26.0

Name: kubelet
Expand Down Expand Up @@ -157,6 +157,9 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/


%changelog
* Tue Jan 17 2023 Sascha Grunert <[email protected]> - 1.26.0
- Update CNI plugins to v1.2.0

* Thu Dec 14 2022 Sascha Grunert <[email protected]> - 1.26.0
- Update cri-tools to v1.26.0

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubepkg/kubepkg.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const (
ChannelNightly ChannelType = "nightly"

minimumKubernetesVersion = "1.13.0"
CurrentCNIVersion = "1.1.1"
CurrentCNIVersion = "1.2.0"
MinimumCNIVersion = "0.8.6"

kubeadmConf = "10-kubeadm.conf"
Expand Down

0 comments on commit e10a44f

Please sign in to comment.