diff --git a/deploy/osps/default/osp-amzn2.yaml b/deploy/osps/default/osp-amzn2.yaml index d823df7f..fdde12b7 100644 --- a/deploy/osps/default/osp-amzn2.yaml +++ b/deploy/osps/default/osp-amzn2.yaml @@ -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" diff --git a/deploy/osps/default/osp-centos.yaml b/deploy/osps/default/osp-centos.yaml index 37f09a56..cc45c3d2 100644 --- a/deploy/osps/default/osp-centos.yaml +++ b/deploy/osps/default/osp-centos.yaml @@ -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" diff --git a/deploy/osps/default/osp-flatcar-cloud-init.yaml b/deploy/osps/default/osp-flatcar-cloud-init.yaml index 319fe8ca..317147cc 100644 --- a/deploy/osps/default/osp-flatcar-cloud-init.yaml +++ b/deploy/osps/default/osp-flatcar-cloud-init.yaml @@ -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" diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml index 89264ce4..433c7c5b 100644 --- a/deploy/osps/default/osp-flatcar.yaml +++ b/deploy/osps/default/osp-flatcar.yaml @@ -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" diff --git a/deploy/osps/default/osp-rhel.yaml b/deploy/osps/default/osp-rhel.yaml index 879c9e7b..33e00d8c 100644 --- a/deploy/osps/default/osp-rhel.yaml +++ b/deploy/osps/default/osp-rhel.yaml @@ -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" diff --git a/deploy/osps/default/osp-rockylinux.yaml b/deploy/osps/default/osp-rockylinux.yaml index d57ab5c5..20de7929 100644 --- a/deploy/osps/default/osp-rockylinux.yaml +++ b/deploy/osps/default/osp-rockylinux.yaml @@ -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" diff --git a/deploy/osps/default/osp-ubuntu.yaml b/deploy/osps/default/osp-ubuntu.yaml index d3e9c091..1b056d75 100644 --- a/deploy/osps/default/osp-ubuntu.yaml +++ b/deploy/osps/default/osp-ubuntu.yaml @@ -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" diff --git a/docs/compatibility-matrix.md b/docs/compatibility-matrix.md index cec0066b..20a77855 100644 --- a/docs/compatibility-matrix.md +++ b/docs/compatibility-matrix.md @@ -7,7 +7,6 @@ Currently supported K8S versions are: - 1.30 - 1.29 - 1.28 -- 1.27 ## Operating System diff --git a/pkg/controllers/osc/testdata/osp-rhel-aws-cloud-init-modules.yaml b/pkg/controllers/osc/testdata/osp-rhel-aws-cloud-init-modules.yaml index cf5169ae..bc5885c5 100644 --- a/pkg/controllers/osc/testdata/osp-rhel-aws-cloud-init-modules.yaml +++ b/pkg/controllers/osc/testdata/osp-rhel-aws-cloud-init-modules.yaml @@ -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"