Skip to content

Commit 3569071

Browse files
xmudriixmudrii
authored
[release/v1.5] Actually bind cri-tools version for Ubuntu, CentOS, and Amazon Linux (#2627)
* Actually bind cri-tools version for Ubuntu, CentOS, and Amazon Linux Signed-off-by: Marko Mudrinić <[email protected]> * Update fixtures Signed-off-by: Marko Mudrinić <[email protected]> * Update v1.5.6 release date Signed-off-by: Marko Mudrinić <[email protected]> Signed-off-by: Marko Mudrinić <[email protected]>
1 parent 883c8df commit 3569071

File tree

37 files changed

+120
-81
lines changed

37 files changed

+120
-81
lines changed

‎CHANGELOG/CHANGELOG-1.5.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [v1.5.6](https://github.com/kubermatic/kubeone/releases/tag/v1.5.6) - 2023-01-26
1+
# [v1.5.6](https://github.com/kubermatic/kubeone/releases/tag/v1.5.6) - 2023-01-27
22

33
## Changelog since v1.5.5
44

‎pkg/scripts/os_amzn.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ EOF
130130
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubernetes/node/bin/kubeadm /opt/bin/kubeadm
131131
sudo ln -sf /opt/bin/kubeadm /usr/bin/
132132
rm /tmp/k8s-binaries/kubernetes/node/bin/kubeadm
133-
sudo yum install -y cri-tools
134133
{{- end }}
135134
136135
{{- if and .KUBECTL .KUBECTL_URL }}
@@ -142,7 +141,7 @@ rm /tmp/k8s-binaries/kubectl
142141
143142
{{ if .USE_KUBERNETES_REPO }}
144143
{{- if or .FORCE .UPGRADE }}
145-
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni || true
144+
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni cri-tools || true
146145
{{- end }}
147146
148147
sudo yum install -y \
@@ -155,8 +154,9 @@ sudo yum install -y \
155154
{{- if .KUBECTL }}
156155
kubectl-{{ .KUBERNETES_VERSION }} \
157156
{{- end }}
158-
kubernetes-cni-{{ .KUBERNETES_CNI_VERSION }}
159-
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni
157+
kubernetes-cni-{{ .KUBERNETES_CNI_VERSION }} \
158+
cri-tools-{{ .CRITOOLS_VERSION }}
159+
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni cri-tools
160160
{{- end }}
161161
162162
sudo systemctl daemon-reload
@@ -170,12 +170,13 @@ sudo systemctl restart kubelet
170170
removeBinariesAmazonLinuxScriptTemplate = `
171171
sudo systemctl stop kubelet || true
172172
173-
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni
173+
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni cri-tools || true
174174
sudo yum remove -y \
175175
kubelet \
176176
kubeadm \
177177
kubectl \
178-
kubernetes-cni
178+
kubernetes-cni \
179+
cri-tools
179180
180181
# Stop kubelet
181182
# Remove CNI and binaries
@@ -205,6 +206,7 @@ func KubeadmAmazonLinux(cluster *kubeoneapi.KubeOneCluster, force bool) (string,
205206
"KUBECTL_URL": cluster.AssetConfiguration.Kubectl.URL,
206207
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
207208
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
209+
"CRITOOLS_VERSION": defaultCriToolsVersion,
208210
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
209211
"PROXY": proxy,
210212
"FORCE": force,
@@ -242,6 +244,7 @@ func UpgradeKubeadmAndCNIAmazonLinux(cluster *kubeoneapi.KubeOneCluster) (string
242244
"CNI_URL": cluster.AssetConfiguration.CNI.URL,
243245
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
244246
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
247+
"CRITOOLS_VERSION": defaultCriToolsVersion,
245248
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
246249
"PROXY": proxy,
247250
"INSTALL_DOCKER": cluster.ContainerRuntime.Docker,
@@ -273,6 +276,7 @@ func UpgradeKubeletAndKubectlAmazonLinux(cluster *kubeoneapi.KubeOneCluster) (st
273276
"KUBECTL_URL": cluster.AssetConfiguration.Kubectl.URL,
274277
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
275278
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
279+
"CRITOOLS_VERSION": defaultCriToolsVersion,
276280
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
277281
"PROXY": proxy,
278282
"INSTALL_DOCKER": cluster.ContainerRuntime.Docker,

‎pkg/scripts/os_centos.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ sudo systemctl enable --now iscsid
8888
{{ end }}
8989
9090
{{- if or .FORCE .UPGRADE }}
91-
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni || true
91+
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni cri-tools || true
9292
{{- end }}
9393
9494
sudo yum install -y \
@@ -101,8 +101,9 @@ sudo yum install -y \
101101
{{- if .KUBECTL }}
102102
kubectl-{{ .KUBERNETES_VERSION }} \
103103
{{- end }}
104-
kubernetes-cni-{{ .KUBERNETES_CNI_VERSION }}
105-
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni
104+
kubernetes-cni-{{ .KUBERNETES_CNI_VERSION }} \
105+
cri-tools-{{ .CRITOOLS_VERSION }}
106+
sudo yum versionlock add kubelet kubeadm kubectl kubernetes-cni cri-tools
106107
107108
sudo systemctl daemon-reload
108109
sudo systemctl enable --now kubelet
@@ -111,12 +112,12 @@ sudo systemctl restart kubelet
111112
{{ end }}
112113
`
113114
removeBinariesCentOSScriptTemplate = `
114-
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni || true
115+
sudo yum versionlock delete kubelet kubeadm kubectl kubernetes-cni cri-tools || true
115116
sudo yum remove -y \
116117
kubelet \
117118
kubeadm \
118119
kubectl
119-
sudo yum remove -y kubernetes-cni || true
120+
sudo yum remove -y kubernetes-cni cri-tools || true
120121
sudo rm -rf /opt/cni
121122
sudo rm -f /etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
122123
sudo systemctl daemon-reload
@@ -143,6 +144,7 @@ func KubeadmCentOS(cluster *kubeoneapi.KubeOneCluster, force bool) (string, erro
143144
"KUBECTL": true,
144145
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
145146
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
147+
"CRITOOLS_VERSION": defaultCriToolsVersion,
146148
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
147149
"PROXY": proxy,
148150
"FORCE": force,
@@ -178,6 +180,7 @@ func UpgradeKubeadmAndCNICentOS(cluster *kubeoneapi.KubeOneCluster) (string, err
178180
"KUBEADM": true,
179181
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
180182
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
183+
"CRITOOLS_VERSION": defaultCriToolsVersion,
181184
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
182185
"PROXY": proxy,
183186
"INSTALL_DOCKER": cluster.ContainerRuntime.Docker,
@@ -207,6 +210,7 @@ func UpgradeKubeletAndKubectlCentOS(cluster *kubeoneapi.KubeOneCluster) (string,
207210
"KUBECTL": true,
208211
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
209212
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
213+
"CRITOOLS_VERSION": defaultCriToolsVersion,
210214
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
211215
"PROXY": proxy,
212216
"INSTALL_DOCKER": cluster.ContainerRuntime.Docker,

‎pkg/scripts/os_debian.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@ sudo apt-get update
7272
7373
kube_ver="{{ .KUBERNETES_VERSION }}*"
7474
cni_ver="{{ .KUBERNETES_CNI_VERSION }}*"
75+
cri_ver="{{ .CRITOOLS_VERSION }}*"
7576
7677
{{- if or .FORCE .UPGRADE }}
77-
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni
78+
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni cri-tools
7879
{{- end }}
7980
8081
{{ if .INSTALL_DOCKER }}
@@ -101,9 +102,10 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install \
101102
{{- if .KUBECTL }}
102103
kubectl=${kube_ver} \
103104
{{- end }}
104-
kubernetes-cni=${cni_ver}
105+
kubernetes-cni=${cni_ver} \
106+
cri-tools=${cri_ver}
105107
106-
sudo apt-mark hold kubelet kubeadm kubectl kubernetes-cni
108+
sudo apt-mark hold kubelet kubeadm kubectl kubernetes-cni cri-tools
107109
108110
sudo systemctl daemon-reload
109111
sudo systemctl enable --now kubelet
@@ -114,12 +116,12 @@ sudo systemctl restart kubelet
114116
`
115117

116118
removeBinariesDebianScriptTemplate = `
117-
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni
119+
sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni cri-tools
118120
sudo apt-get remove --purge -y \
119121
kubeadm \
120122
kubectl \
121123
kubelet
122-
sudo apt-get remove --purge -y kubernetes-cni || true
124+
sudo apt-get remove --purge -y kubernetes-cni cri-tools || true
123125
sudo rm -rf /opt/cni
124126
sudo rm -f /etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
125127
sudo systemctl daemon-reload
@@ -133,6 +135,7 @@ func KubeadmDebian(cluster *kubeoneapi.KubeOneCluster, force bool) (string, erro
133135
"KUBECTL": true,
134136
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
135137
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
138+
"CRITOOLS_VERSION": defaultCriToolsVersion,
136139
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
137140
"HTTP_PROXY": cluster.Proxy.HTTP,
138141
"HTTPS_PROXY": cluster.Proxy.HTTPS,
@@ -164,6 +167,7 @@ func UpgradeKubeadmAndCNIDebian(cluster *kubeoneapi.KubeOneCluster) (string, err
164167
"KUBEADM": true,
165168
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
166169
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
170+
"CRITOOLS_VERSION": defaultCriToolsVersion,
167171
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
168172
"HTTP_PROXY": cluster.Proxy.HTTP,
169173
"HTTPS_PROXY": cluster.Proxy.HTTPS,
@@ -189,6 +193,7 @@ func UpgradeKubeletAndKubectlDebian(cluster *kubeoneapi.KubeOneCluster) (string,
189193
"KUBECTL": true,
190194
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
191195
"KUBERNETES_CNI_VERSION": defaultKubernetesCNIVersion,
196+
"CRITOOLS_VERSION": defaultCriToolsVersion,
192197
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
193198
"HTTP_PROXY": cluster.Proxy.HTTP,
194199
"HTTPS_PROXY": cluster.Proxy.HTTPS,

‎pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ EOF
161161
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubernetes/node/bin/kubeadm /opt/bin/kubeadm
162162
sudo ln -sf /opt/bin/kubeadm /usr/bin/
163163
rm /tmp/k8s-binaries/kubernetes/node/bin/kubeadm
164-
sudo yum install -y cri-tools
165164
curl -L --output /tmp/k8s-binaries/kubectl http://127.0.0.1/kubectl.tar.gz
166165
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubectl /opt/bin/kubectl
167166
sudo ln -sf /opt/bin/kubectl /usr/bin/

‎pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ EOF
161161
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubernetes/node/bin/kubeadm /opt/bin/kubeadm
162162
sudo ln -sf /opt/bin/kubeadm /usr/bin/
163163
rm /tmp/k8s-binaries/kubernetes/node/bin/kubeadm
164-
sudo yum install -y cri-tools
165164
curl -L --output /tmp/k8s-binaries/kubectl http://127.0.0.1/kubectl.tar.gz
166165
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubectl /opt/bin/kubectl
167166
sudo ln -sf /opt/bin/kubectl /usr/bin/

‎pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ EOF
164164
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubernetes/node/bin/kubeadm /opt/bin/kubeadm
165165
sudo ln -sf /opt/bin/kubeadm /usr/bin/
166166
rm /tmp/k8s-binaries/kubernetes/node/bin/kubeadm
167-
sudo yum install -y cri-tools
168167
curl -L --output /tmp/k8s-binaries/kubectl http://127.0.0.1/kubectl.tar.gz
169168
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubectl /opt/bin/kubectl
170169
sudo ln -sf /opt/bin/kubectl /usr/bin/

‎pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ EOF
161161
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubernetes/node/bin/kubeadm /opt/bin/kubeadm
162162
sudo ln -sf /opt/bin/kubeadm /usr/bin/
163163
rm /tmp/k8s-binaries/kubernetes/node/bin/kubeadm
164-
sudo yum install -y cri-tools
165164
curl -L --output /tmp/k8s-binaries/kubectl http://127.0.0.1/kubectl.tar.gz
166165
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubectl /opt/bin/kubectl
167166
sudo ln -sf /opt/bin/kubectl /usr/bin/

‎pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ EOF
161161
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubernetes/node/bin/kubeadm /opt/bin/kubeadm
162162
sudo ln -sf /opt/bin/kubeadm /usr/bin/
163163
rm /tmp/k8s-binaries/kubernetes/node/bin/kubeadm
164-
sudo yum install -y cri-tools
165164
curl -L --output /tmp/k8s-binaries/kubectl http://127.0.0.1/kubectl.tar.gz
166165
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubectl /opt/bin/kubectl
167166
sudo ln -sf /opt/bin/kubectl /usr/bin/

‎pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.23.9.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ EOF
161161
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubernetes/node/bin/kubeadm /opt/bin/kubeadm
162162
sudo ln -sf /opt/bin/kubeadm /usr/bin/
163163
rm /tmp/k8s-binaries/kubernetes/node/bin/kubeadm
164-
sudo yum install -y cri-tools
165164
curl -L --output /tmp/k8s-binaries/kubectl http://127.0.0.1/kubectl.tar.gz
166165
sudo install --owner=0 --group=0 --mode=0755 /tmp/k8s-binaries/kubectl /opt/bin/kubectl
167166
sudo ln -sf /opt/bin/kubectl /usr/bin/

0 commit comments

Comments
 (0)