Skip to content

Commit

Permalink
Update kubernetes-cni to 1.1.1 (#2358)
Browse files Browse the repository at this point in the history 
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
  • Loading branch information
@xmudrii
xmudrii authored Sep 21, 2022
1 parent 6ff3ec0 commit a1ac454
Show file tree
Hide file tree
Showing 32 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion pkg/scripts/os.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

const (
defaultKubernetesCNIVersion = "0.8.7"
defaultKubernetesCNIVersion = "1.1.1"
defaultCriToolsVersion = "1.21.0"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-with_cilium.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-cilium_cluster.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-force.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ sudo yum install -y \
kubelet-1.16.1 \
kubeadm-1.16.1 \
kubectl-1.16.1 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ sudo yum install -y \
kubelet-1.17.4 \
kubeadm-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-simple.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sudo systemctl force-reload systemd-journald


sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.17.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sudo systemctl force-reload systemd-journald


sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.17.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sudo systemctl force-reload systemd-journald


sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.17.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sudo systemctl force-reload systemd-journald


sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.17.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ sudo systemctl force-reload systemd-journald


sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.17.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sudo systemctl force-reload systemd-journald


sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.17.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni || true

sudo yum install -y \
kubeadm-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni


Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeadmAndCNIFlatcar.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ sudo systemctl restart docker


sudo mkdir -p /opt/cni/bin
curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.17.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni || true
sudo yum install -y \
kubelet-1.17.4 \
kubectl-1.17.4 \
kubernetes-cni-0.8.7
kubernetes-cni-1.1.1
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/
sudo apt-get update

kube_ver="1.17.4*"
cni_ver="0.8.7*"
cni_ver="1.1.1*"
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni


Expand Down

0 comments on commit a1ac454

Please sign in to comment.