Apply docker_lxd_clash for anything beyond jammy

charmed-kubernetes · Sep 24, 2024 · 23ec129 · 23ec129
1 parent 5193238
commit 23ec129
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -71,6 +71,7 @@ jobs:
         os:
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
         juju:
           - '2.9/stable'
           - '3.1/stable'
@@ -80,6 +81,11 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Install Python
+        if: ${{ ! contains(fromJson('["ubuntu-20.04", "ubuntu-22.04"]'), matrix.os) }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - uses: ./
         with:
           provider: lxd
@@ -108,12 +114,18 @@ jobs:
         os:
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
         channel:
           - 1.28-strict/stable
           - 1.27-strict/stable
     steps:
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Install Python
+        if: ${{ ! contains(fromJson('["ubuntu-20.04", "ubuntu-22.04"]'), matrix.os) }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - uses: ./
         with:
           provider: microk8s
@@ -133,12 +145,18 @@ jobs:
         os:
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
         channel:
           - 1.28/stable
           - latest/stable
     steps:
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Install Python
+        if: ${{ ! contains(fromJson('["ubuntu-20.04", "ubuntu-22.04"]'), matrix.os) }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - uses: ./
         with:
           provider: microk8s
@@ -212,9 +230,15 @@ jobs:
         os:
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Install Python
+        if: ${{ ! contains(fromJson('["ubuntu-20.04", "ubuntu-22.04"]'), matrix.os) }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - name: Setup k8s controller
         uses: ./
         with:

diff --git a/dist/bootstrap/index.js b/dist/bootstrap/index.js
@@ -5757,7 +5757,8 @@ function run() {
             yield snap(`install juju-bundle --classic ${fixed_revision_args("juju-bundle", juju_bundle_channel, arch)}`);
             yield snap(`install juju-crashdump --classic ${fixed_revision_args("juju-crashdump", juju_crashdump_channel, arch)}`);
             const release = yield os_release();
-            if (release["VERSION_CODENAME"].includes("jammy")) {
+            const version_id = release["VERSION"].split(" ")[0];
+            if (semver_1.default.gte(version_id, '22.04.0')) {
                 yield docker_lxd_clash();
             }
             core.endGroup();

diff --git a/src/bootstrap/index.ts b/src/bootstrap/index.ts
@@ -283,7 +283,8 @@ async function run() {
 
 
         const release = await os_release();
-        if (release["VERSION_CODENAME"].includes("jammy")){
+        const version_id = release["VERSION"].split(" ")[0];
+        if (semver.gte(version_id, '22.04.0')){
             await docker_lxd_clash();
         }