Skip to content

Commit

Permalink
Remove k8s 1.27 support (#401)
Browse files Browse the repository at this point in the history 
Signed-off-by: Waleed Malik <[email protected]>
  • Loading branch information
@ahmedwaleedmalik
ahmedwaleedmalik authored Jul 8, 2024
1 parent 4b2af13 commit 204a5bf
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 @@ -221,9 +221,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
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 @@ -241,9 +241,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
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.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
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.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
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 @@ -231,9 +231,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
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 @@ -236,9 +236,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
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 @@ -264,9 +264,7 @@ spec:
chown -R root:root "$cni_bin_dir"
{{- /* # cri-tools variables */}}
{{- if semverCompare "~1.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
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.30
- 1.29
- 1.28
- 1.27

## 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.27.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.27.1"
{{- else if semverCompare "~1.28.0" .KubeVersion }}
{{- if semverCompare "~1.28.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.28.0"
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
Expand Down

0 comments on commit 204a5bf

Please sign in to comment.