From d2075d5ec284cd1d43dc3eb5513151bddd9ec854 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Mon, 15 Jul 2024 14:29:18 -0700 Subject: [PATCH] Update pkg/rancher-desktop/backend/backendHelper.ts Co-authored-by: Mark Yen Signed-off-by: Jan Dubois --- pkg/rancher-desktop/backend/backendHelper.ts | 32 ++++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/pkg/rancher-desktop/backend/backendHelper.ts b/pkg/rancher-desktop/backend/backendHelper.ts index b4582a9eda3..291c687eb47 100644 --- a/pkg/rancher-desktop/backend/backendHelper.ts +++ b/pkg/rancher-desktop/backend/backendHelper.ts @@ -147,26 +147,18 @@ export default class BackendHelper { if (engineName !== ContainerEngine.MOBY) { return false; } - // versions 1.24.1 to 1.24.3 don't support the --docker option - if (semver.gte(kubeVersion, '1.24.1') && semver.lte(kubeVersion, '1.24.3')) { - return true; - } - // cri-dockerd bundled with k3s is not compatible with docker 25.x (using API 1.44) - // see https://github.com/k3s-io/k3s/issues/9279 - if (semver.gte(kubeVersion, '1.26.8') && semver.lte(kubeVersion, '1.26.13')) { - return true; - } - if (semver.gte(kubeVersion, '1.27.5') && semver.lte(kubeVersion, '1.27.10')) { - return true; - } - if (semver.gte(kubeVersion, '1.28.0') && semver.lte(kubeVersion, '1.28.6')) { - return true; - } - if (semver.gte(kubeVersion, '1.29.0') && semver.lte(kubeVersion, '1.29.1')) { - return true; - } - - return false; + const ranges = [ + // versions 1.24.1 to 1.24.3 don't support the --docker option + '1.24.1 - 1.24.3', + // cri-dockerd bundled with k3s is not compatible with docker 25.x (using API 1.44) + // see https://github.com/k3s-io/k3s/issues/9279 + '1.26.8 - 1.26.13', + '1.27.5 - 1.27.10', + '1.28.0 - 1.28.6', + '1.29.0 - 1.29.1', + ]; + + return semver.satisfies(kubeVersion, ranges.join('||')); } static checkForLockedVersion(newVersion: semver.SemVer, cfg: BackendSettings, sv: SettingsValidator): void {