Update pkg/rancher-desktop/backend/backendHelper.ts

Co-authored-by: Mark Yen <[email protected]> Signed-off-by: Jan Dubois <[email protected]>
rancher-sandbox · Jul 15, 2024 · d2075d5 · d2075d5
1 parent 112f896
commit d2075d5
Showing 1 changed file with 12 additions and 20 deletions.
diff --git 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 {