Skip to content

Commit

Permalink
Drop support for Kubernetes v1.28 (#423)
Browse files Browse the repository at this point in the history 
Signed-off-by: Waleed Malik <[email protected]>
  • Loading branch information
@ahmedwaleedmalik
ahmedwaleedmalik authored Oct 18, 2024
1 parent e4459f8 commit 09781bf
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 25 deletions.
4 changes: 1 addition & 3 deletions deploy/osps/default/osp-amzn2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.1"
Expand Down
4 changes: 1 addition & 3 deletions deploy/osps/default/osp-centos.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.1"
Expand Down
4 changes: 1 addition & 3 deletions deploy/osps/default/osp-flatcar-cloud-init.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.1"
Expand Down
4 changes: 1 addition & 3 deletions deploy/osps/default/osp-flatcar.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.1"
Expand Down
4 changes: 1 addition & 3 deletions deploy/osps/default/osp-rhel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.1"
Expand Down
4 changes: 1 addition & 3 deletions deploy/osps/default/osp-rockylinux.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.1"
Expand Down
4 changes: 1 addition & 3 deletions deploy/osps/default/osp-ubuntu.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.1"
Expand Down
1 change: 0 additions & 1 deletion docs/compatibility-matrix.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Currently supported K8S versions are:
- 1.31
- 1.30
- 1.29
- 1.28

## Operating System

Expand Down
4 changes: 1 addition & 3 deletions pkg/controllers/osc/testdata/osp-rhel-aws-cloud-init-modules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
{{- if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
Expand Down

0 comments on commit 09781bf

Please sign in to comment.