diff --git a/deploy/osps/default/osp-amzn2.yaml b/deploy/osps/default/osp-amzn2.yaml index 5e51c032..5ae790fd 100644 --- a/deploy/osps/default/osp-amzn2.yaml +++ b/deploy/osps/default/osp-amzn2.yaml @@ -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" diff --git a/deploy/osps/default/osp-centos.yaml b/deploy/osps/default/osp-centos.yaml index 2f74c667..0b86fae6 100644 --- a/deploy/osps/default/osp-centos.yaml +++ b/deploy/osps/default/osp-centos.yaml @@ -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" diff --git a/deploy/osps/default/osp-flatcar-cloud-init.yaml b/deploy/osps/default/osp-flatcar-cloud-init.yaml index 14a4a736..5f51cb7b 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.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" diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml index 4bc356a2..dd53947a 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.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" diff --git a/deploy/osps/default/osp-rhel.yaml b/deploy/osps/default/osp-rhel.yaml index 244d5459..69de5f23 100644 --- a/deploy/osps/default/osp-rhel.yaml +++ b/deploy/osps/default/osp-rhel.yaml @@ -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" diff --git a/deploy/osps/default/osp-rockylinux.yaml b/deploy/osps/default/osp-rockylinux.yaml index 208d3f11..8c5c450e 100644 --- a/deploy/osps/default/osp-rockylinux.yaml +++ b/deploy/osps/default/osp-rockylinux.yaml @@ -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" diff --git a/deploy/osps/default/osp-ubuntu.yaml b/deploy/osps/default/osp-ubuntu.yaml index 05fb0611..ece12a3e 100644 --- a/deploy/osps/default/osp-ubuntu.yaml +++ b/deploy/osps/default/osp-ubuntu.yaml @@ -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" diff --git a/docs/compatibility-matrix.md b/docs/compatibility-matrix.md index 699c3054..4f2e4ef7 100644 --- a/docs/compatibility-matrix.md +++ b/docs/compatibility-matrix.md @@ -7,7 +7,6 @@ Currently supported K8S versions are: - 1.31 - 1.30 - 1.29 -- 1.28 ## 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 897ad960..d92d377c 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.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"