Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/v1.5] Update kubernetes-cni to v1.2.0 and cri-tools to v1.26.0 #2608

Merged
merged 3 commits into from
Jan 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/scripts/os.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
)

const (
defaultKubernetesCNIVersion = "1.1.1"
defaultCriToolsVersion = "1.21.0"
defaultKubernetesCNIVersion = "1.2.0"
defaultCriToolsVersion = "1.26.0"
)

var migrateToContainerdScriptTemplate = heredoc.Doc(`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
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
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
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
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
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
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ sudo yum install -y \
kubelet-1.23.9 \
kubeadm-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"



Expand Down
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"



Expand Down
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"



Expand Down
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"



Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestKubeadmDebian-simple.golden
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"



Expand Down
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"



Expand Down
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"



Expand Down
4 changes: 2 additions & 2 deletions pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ 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/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-${HOST_ARCH}-v1.2.0.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.23.9"
CRI_TOOLS_RELEASE="v1.21.0"
CRI_TOOLS_RELEASE="v1.26.0"

curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}/crictl-${CRI_TOOLS_RELEASE}-linux-${HOST_ARCH}.tar.gz |
sudo tar -C /opt/bin -xz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ 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/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-${HOST_ARCH}-v1.2.0.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.23.9"
CRI_TOOLS_RELEASE="v1.21.0"
CRI_TOOLS_RELEASE="v1.26.0"

curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}/crictl-${CRI_TOOLS_RELEASE}-linux-${HOST_ARCH}.tar.gz |
sudo tar -C /opt/bin -xz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ 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/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-${HOST_ARCH}-v1.2.0.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.23.9"
CRI_TOOLS_RELEASE="v1.21.0"
CRI_TOOLS_RELEASE="v1.26.0"

curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}/crictl-${CRI_TOOLS_RELEASE}-linux-${HOST_ARCH}.tar.gz |
sudo tar -C /opt/bin -xz
Expand Down
4 changes: 2 additions & 2 deletions pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ 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/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-${HOST_ARCH}-v1.2.0.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.23.9"
CRI_TOOLS_RELEASE="v1.21.0"
CRI_TOOLS_RELEASE="v1.26.0"

curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}/crictl-${CRI_TOOLS_RELEASE}-linux-${HOST_ARCH}.tar.gz |
sudo tar -C /opt/bin -xz
Expand Down
4 changes: 2 additions & 2 deletions pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ 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/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-${HOST_ARCH}-v1.2.0.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.23.9"
CRI_TOOLS_RELEASE="v1.21.0"
CRI_TOOLS_RELEASE="v1.26.0"

curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}/crictl-${CRI_TOOLS_RELEASE}-linux-${HOST_ARCH}.tar.gz |
sudo tar -C /opt/bin -xz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ 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/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-${HOST_ARCH}-v1.2.0.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.23.9"
CRI_TOOLS_RELEASE="v1.21.0"
CRI_TOOLS_RELEASE="v1.26.0"

curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}/crictl-${CRI_TOOLS_RELEASE}-linux-${HOST_ARCH}.tar.gz |
sudo tar -C /opt/bin -xz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ 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/v1.1.1/cni-plugins-linux-${HOST_ARCH}-v1.1.1.tgz" |
curl -L "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-${HOST_ARCH}-v1.2.0.tgz" |
sudo tar -C /opt/cni/bin -xz

RELEASE="v1.23.9"
CRI_TOOLS_RELEASE="v1.21.0"
CRI_TOOLS_RELEASE="v1.26.0"

curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}/crictl-${CRI_TOOLS_RELEASE}-linux-${HOST_ARCH}.tar.gz |
sudo tar -C /opt/bin -xz
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni || true

sudo yum install -y \
kubeadm-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
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
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ sudo systemctl restart containerd
source /etc/kubeone/proxy-env

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

RELEASE="v1.23.9"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni || true
sudo yum install -y \
kubelet-1.23.9 \
kubectl-1.23.9 \
kubernetes-cni-1.1.1
kubernetes-cni-1.2.0
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni

sudo systemctl daemon-reload
Expand Down
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.23.9*"
cni_ver="1.1.1*"
cni_ver="1.2.0*"
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni


Expand Down
4 changes: 2 additions & 2 deletions pkg/templates/images/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ func baseResources() map[Resource]map[string]string {
CalicoNode: {"*": "quay.io/calico/node:v3.23.5"},
DNSNodeCache: {"*": "registry.k8s.io/dns/k8s-dns-node-cache:1.21.1"},
Flannel: {"*": "quay.io/coreos/flannel:v0.15.1"},
MachineController: {"*": "quay.io/kubermatic/machine-controller:v1.54.2"},
MachineController: {"*": "quay.io/kubermatic/machine-controller:v1.54.4"},
MetricsServer: {"*": "registry.k8s.io/metrics-server/metrics-server:v0.6.1"},
OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.1.1"},
OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.1.2"},
}
}

Expand Down
Loading