Skip to content

Commit ff93675

Browse files
archupsarchups
authored
Drop support for Kubernetes 1.29 (#464)
* Drop support for Kubernetes 1.29 Signed-off-by: archups <[email protected]> * More cleanup and update fixtures Signed-off-by: archups <[email protected]> --------- Signed-off-by: archups <[email protected]>
1 parent 6e0bb53 commit ff93675

18 files changed

+22
-39
lines changed

‎deploy/osps/default/osp-amzn2.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,7 @@ spec:
219219
chown -R root:root "$cni_bin_dir"
220220
221221
{{- /* # cri-tools variables */}}
222-
{{- if semverCompare "~1.29.0" .KubeVersion }}
223-
CRI_TOOLS_RELEASE="v1.29.0"
224-
{{- else if semverCompare "~1.30.0" .KubeVersion }}
222+
{{- if semverCompare "~1.30.0" .KubeVersion }}
225223
CRI_TOOLS_RELEASE="v1.30.1"
226224
{{- else if semverCompare "~1.31.0" .KubeVersion }}
227225
CRI_TOOLS_RELEASE="v1.31.1"

‎deploy/osps/default/osp-flatcar-cloud-init.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ spec:
105105
chown -R root:root "$cni_bin_dir"
106106
107107
{{- /* # cri-tools variables */}}
108-
{{- if semverCompare "~1.29.0" .KubeVersion }}
109-
CRI_TOOLS_RELEASE="v1.29.0"
110-
{{- else if semverCompare "~1.30.0" .KubeVersion }}
108+
{{- if semverCompare "~1.30.0" .KubeVersion }}
111109
CRI_TOOLS_RELEASE="v1.30.1"
112110
{{- else if semverCompare "~1.31.0" .KubeVersion }}
113111
CRI_TOOLS_RELEASE="v1.31.1"

‎deploy/osps/default/osp-flatcar.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,7 @@ spec:
274274
chown -R root:root "$cni_bin_dir"
275275
276276
{{- /* # cri-tools variables */}}
277-
{{- if semverCompare "~1.29.0" .KubeVersion }}
278-
CRI_TOOLS_RELEASE="v1.29.0"
279-
{{- else if semverCompare "~1.30.0" .KubeVersion }}
277+
{{- if semverCompare "~1.30.0" .KubeVersion }}
280278
CRI_TOOLS_RELEASE="v1.30.1"
281279
{{- else if semverCompare "~1.31.0" .KubeVersion }}
282280
CRI_TOOLS_RELEASE="v1.31.1"

‎deploy/osps/default/osp-rhel.yaml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,7 @@ spec:
226226
chown -R root:root "$cni_bin_dir"
227227
228228
{{- /* # cri-tools variables */}}
229-
{{- if semverCompare "~1.29.0" .KubeVersion }}
230-
CRI_TOOLS_RELEASE="v1.29.0"
231-
{{- else if semverCompare "~1.30.0" .KubeVersion }}
229+
{{- if semverCompare "~1.30.0" .KubeVersion }}
232230
CRI_TOOLS_RELEASE="v1.30.1"
233231
{{- else if semverCompare "~1.31.0" .KubeVersion }}
234232
CRI_TOOLS_RELEASE="v1.31.1"
@@ -237,7 +235,6 @@ spec:
237235
CRI_TOOLS_RELEASE="v1.31.1"
238236
{{- end }}
239237
240-
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
241238
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
242239
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
243240
@@ -591,10 +588,6 @@ spec:
591588
--cert-dir=/etc/kubernetes/pki \
592589
{{- if .ExternalCloudProvider }}
593590
--cloud-provider=external \
594-
{{- /* In-tree cloud providers have been disabled starting from k8s 1.29. For more information: https://github.com/kubernetes/kubernetes/pull/117503 */}}
595-
{{- else if and (.InTreeCCMAvailable) (semverCompare "<1.29" .KubeVersion) }}
596-
--cloud-provider={{- .CloudProviderName }} \
597-
--cloud-config=/etc/kubernetes/cloud-config \
598591
{{- end }}
599592
{{- if ne .CloudProviderName "aws" }}
600593
--hostname-override=${KUBELET_HOSTNAME} \

‎deploy/osps/default/osp-rockylinux.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,7 @@ spec:
230230
chown -R root:root "$cni_bin_dir"
231231
232232
{{- /* # cri-tools variables */}}
233-
{{- if semverCompare "~1.29.0" .KubeVersion }}
234-
CRI_TOOLS_RELEASE="v1.29.0"
235-
{{- else if semverCompare "~1.30.0" .KubeVersion }}
233+
{{- if semverCompare "~1.30.0" .KubeVersion }}
236234
CRI_TOOLS_RELEASE="v1.30.1"
237235
{{- else if semverCompare "~1.31.0" .KubeVersion }}
238236
CRI_TOOLS_RELEASE="v1.31.1"

‎deploy/osps/default/osp-ubuntu.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,7 @@ spec:
273273
chown -R root:root "$cni_bin_dir"
274274
275275
{{- /* # cri-tools variables */}}
276-
{{- if semverCompare "~1.29.0" .KubeVersion }}
277-
CRI_TOOLS_RELEASE="v1.29.0"
278-
{{- else if semverCompare "~1.30.0" .KubeVersion }}
276+
{{- if semverCompare "~1.30.0" .KubeVersion }}
279277
CRI_TOOLS_RELEASE="v1.30.1"
280278
{{- else if semverCompare "~1.31.0" .KubeVersion }}
281279
CRI_TOOLS_RELEASE="v1.31.1"

‎docs/compatibility-matrix.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Currently supported K8S versions are:
66

77
- 1.31
88
- 1.30
9-
- 1.29
109

1110
## Operating System
1211

‎pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ spec:
362362
chown -R root:root "$cni_bin_dir"
363363
CRI_TOOLS_RELEASE="v1.31.1"
364364
365-
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
366365
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
367366
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
368367
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"

‎pkg/controllers/osc/testdata/osc-rhel-8.x-cloud-init-modules.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@ spec:
356356
rm -f "$cni_filename"
357357
cd -
358358
chown -R root:root "$cni_bin_dir"
359+
CRI_TOOLS_RELEASE="v1.31.1"
359360
360-
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
361361
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
362362
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
363363
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"

‎pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ spec:
336336
rm -f "$cni_filename"
337337
cd -
338338
chown -R root:root "$cni_bin_dir"
339-
CRI_TOOLS_RELEASE="v1.29.0"
339+
CRI_TOOLS_RELEASE="v1.31.1"
340340
341341
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
342342
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"

0 commit comments

Comments
 (0)