Skip to content

Commit 9a71d14

Browse files
archupsarchups
authored
Add support for Kubernetes 1.32 and 1.33 (#465)
* Add support for Kubernetes 1.32 Signed-off-by: archups <[email protected]> * Add support for k8s 1.33 Signed-off-by: archups <[email protected]> * Update fixtures Signed-off-by: archups <[email protected]> * Updated docs Signed-off-by: archups <[email protected]> * Update fixtures Signed-off-by: archups <[email protected]> --------- Signed-off-by: archups <[email protected]>
1 parent ff93675 commit 9a71d14

14 files changed

+43
-13
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,13 @@ spec:
223223
CRI_TOOLS_RELEASE="v1.30.1"
224224
{{- else if semverCompare "~1.31.0" .KubeVersion }}
225225
CRI_TOOLS_RELEASE="v1.31.1"
226+
{{- else if semverCompare "~1.32.0" .KubeVersion }}
227+
CRI_TOOLS_RELEASE="v1.32.0"
228+
{{- else if semverCompare "~1.33.0" .KubeVersion }}
229+
CRI_TOOLS_RELEASE="v1.33.0"
226230
{{- else }}
227231
{{- /* Fallback to the latest version */}}
228-
CRI_TOOLS_RELEASE="v1.31.1"
232+
CRI_TOOLS_RELEASE="v1.33.0"
229233
{{- end }}
230234
231235
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,13 @@ spec:
109109
CRI_TOOLS_RELEASE="v1.30.1"
110110
{{- else if semverCompare "~1.31.0" .KubeVersion }}
111111
CRI_TOOLS_RELEASE="v1.31.1"
112+
{{- else if semverCompare "~1.32.0" .KubeVersion }}
113+
CRI_TOOLS_RELEASE="v1.32.0"
114+
{{- else if semverCompare "~1.33.0" .KubeVersion }}
115+
CRI_TOOLS_RELEASE="v1.33.0"
112116
{{- else }}
113117
{{- /* Fallback to the latest version */}}
114-
CRI_TOOLS_RELEASE="v1.31.1"
118+
CRI_TOOLS_RELEASE="v1.33.0"
115119
{{- end }}
116120
117121
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,13 @@ spec:
278278
CRI_TOOLS_RELEASE="v1.30.1"
279279
{{- else if semverCompare "~1.31.0" .KubeVersion }}
280280
CRI_TOOLS_RELEASE="v1.31.1"
281+
{{- else if semverCompare "~1.32.0" .KubeVersion }}
282+
CRI_TOOLS_RELEASE="v1.32.0"
283+
{{- else if semverCompare "~1.33.0" .KubeVersion }}
284+
CRI_TOOLS_RELEASE="v1.33.0"
281285
{{- else }}
282286
{{- /* Fallback to the latest version */}}
283-
CRI_TOOLS_RELEASE="v1.31.1"
287+
CRI_TOOLS_RELEASE="v1.33.0"
284288
{{- end }}
285289
286290
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,13 @@ spec:
230230
CRI_TOOLS_RELEASE="v1.30.1"
231231
{{- else if semverCompare "~1.31.0" .KubeVersion }}
232232
CRI_TOOLS_RELEASE="v1.31.1"
233+
{{- else if semverCompare "~1.32.0" .KubeVersion }}
234+
CRI_TOOLS_RELEASE="v1.32.0"
235+
{{- else if semverCompare "~1.33.0" .KubeVersion }}
236+
CRI_TOOLS_RELEASE="v1.33.0"
233237
{{- else }}
234238
{{- /* Fallback to the latest version */}}
235-
CRI_TOOLS_RELEASE="v1.31.1"
239+
CRI_TOOLS_RELEASE="v1.33.0"
236240
{{- end }}
237241
238242
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,13 @@ spec:
234234
CRI_TOOLS_RELEASE="v1.30.1"
235235
{{- else if semverCompare "~1.31.0" .KubeVersion }}
236236
CRI_TOOLS_RELEASE="v1.31.1"
237+
{{- else if semverCompare "~1.32.0" .KubeVersion }}
238+
CRI_TOOLS_RELEASE="v1.32.0"
239+
{{- else if semverCompare "~1.33.0" .KubeVersion }}
240+
CRI_TOOLS_RELEASE="v1.33.0"
237241
{{- else }}
238242
{{- /* Fallback to the latest version */}}
239-
CRI_TOOLS_RELEASE="v1.31.1"
243+
CRI_TOOLS_RELEASE="v1.33.0"
240244
{{- end }}
241245
242246
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,13 @@ spec:
277277
CRI_TOOLS_RELEASE="v1.30.1"
278278
{{- else if semverCompare "~1.31.0" .KubeVersion }}
279279
CRI_TOOLS_RELEASE="v1.31.1"
280+
{{- else if semverCompare "~1.32.0" .KubeVersion }}
281+
CRI_TOOLS_RELEASE="v1.32.0"
282+
{{- else if semverCompare "~1.33.0" .KubeVersion }}
283+
CRI_TOOLS_RELEASE="v1.33.0"
280284
{{- else }}
281285
{{- /* Fallback to the latest version */}}
282-
CRI_TOOLS_RELEASE="v1.31.1"
286+
CRI_TOOLS_RELEASE="v1.33.0"
283287
{{- end }}
284288
285289
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"

‎docs/compatibility-matrix.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
Currently supported K8S versions are:
66

7+
- 1.33
8+
- 1.32
79
- 1.31
810
- 1.30
911

‎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.31.1"
339+
CRI_TOOLS_RELEASE="v1.33.0"
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"

‎pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml‎

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

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

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

0 commit comments

Comments
 (0)