From dde783b2b3b3148f835d6c4afa1ba26f756b2a65 Mon Sep 17 00:00:00 2001
From: wallyworld <ian.booth@canonical.com>
Date: Mon, 2 Mar 2026 09:07:18 +1000
Subject: [PATCH 1/2] chore: declare 26.04 support in charmcraft Needs
 chaermcraft 4.x to work with 26.04.

---
 .github/workflows/ci.yml | 8 ++++++--
 CONTRIBUTING.md          | 2 +-
 charmcraft.yaml          | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff622b5..bef2b56 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,7 +65,9 @@ jobs:
           newgrp lxd
 
       - name: Install charmcraft
-        run: sudo snap install charmcraft --classic --channel=3.x/stable
+        # We use latest because there's no 4.x track yet.
+        # We currently need edge to get 26.04 support.
+        run: sudo snap install charmcraft --classic --channel=latest/edge
 
       - name: Pack charm
         run: sg lxd -c "charmcraft pack"
@@ -133,7 +135,9 @@ jobs:
         env:
           CHARMCRAFT_AUTH: ${{ secrets.CHARMCRAFT_AUTH }}
         run: |
-          sudo snap install charmcraft --channel 3.x/stable --classic
+          # We use latest because there's no 4.x track yet.
+          # We currently need edge to get 26.04 support.
+          sudo snap install charmcraft --channel latest/stable --classic
           for FILE in *.charm; do
             echo "Uploading: $FILE"
             charmcraft upload --name "$CHARM_NAME" --release "${{ needs.channel.outputs.test }}" "$FILE" 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 914fcfd..0e3684b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 You will need to have Python 3, Charmcraft and [uv](https://docs.astral.sh/uv/) installed.
 ```
-sudo snap install charmcraft --classic
+sudo snap install charmcraft --classic --channel latest/stable
 sudo snap install astral-uv --classic
 ```
 
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 28f90d2..5254b7f 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -20,3 +20,7 @@ platforms:
   ubuntu@24.04:arm64:
   ubuntu@24.04:s390x:
   ubuntu@24.04:ppc64el:
+  ubuntu@26.04:amd64:
+  ubuntu@26.04:arm64:
+  ubuntu@26.04:s390x:
+  ubuntu@26.04:ppc64el:

From e53f0bf31c0abf64b4d3c324037450a89fe2dae1 Mon Sep 17 00:00:00 2001
From: wallyworld <ian.booth@canonical.com>
Date: Mon, 2 Mar 2026 11:41:36 +1000
Subject: [PATCH 2/2] chore: use microk8s 1.35, add extra debug on failure

---
 .github/workflows/ci.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bef2b56..0a68043 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -170,7 +170,7 @@ jobs:
       if: matrix.cloud == 'microk8s'
       uses: balchua/microk8s-actions@v0.4.2
       with:
-        channel: "1.25-strict/stable"
+        channel: "1.35-strict/stable"
         addons: '["dns", "hostpath-storage"]'
 
     - name: Install Juju
@@ -188,6 +188,7 @@ jobs:
       run: |
         sg snap_microk8s <<EOF
           juju bootstrap microk8s c \
+            --config agent-stream=proposed \
             --controller-charm-channel=${{ needs.channel.outputs.test }}
         EOF
 
@@ -215,7 +216,11 @@ jobs:
       run: |
         set -x
         set +e
-        juju status
+        juju status -m controller
         juju debug-log -m controller --replay
+        sg snap_microk8s <<EOF
+          microk8s.kubectl -n controller-c get all
+          microk8s.kubectl -n controller-c get -o yaml pod/controller-0
+        EOF
 
     # TODO: test integration with dashboard / ha-proxy