[TEST] Test Canonical k8s

concierge.yaml

@@ -2,13 +2,17 @@ juju:
   model-defaults:
     logging-config: <root>=INFO; unit=DEBUG
 providers:
-  microk8s:
+  k8s:
     enable: true
     bootstrap: true
-    addons:
-      - dns
-      - hostpath-storage
-      - rbac
+    features:
+      local-storage:
+      load-balancer:
+        enabled: true
+        l2-mode: true
+        cidrs: 10.20.30.40/32
+    bootstrap-constraints:
+      root-disk: 5G
 host:
   snaps:
     jhack:

spread.yaml

@@ -60,7 +60,7 @@ backends:
       # For example, with microk8s, using `concierge restore` takes twice as long as this (e.g. 6
       # min instead of 3 min between every spread job)
       juju destroy-model --force --no-wait --destroy-storage --no-prompt testing
-      juju kill-controller --no-prompt concierge-microk8s
+      juju kill-controller --no-prompt concierge-k8s
     restore: |
       rm -rf "$SPREAD_PATH"
 
@@ -83,8 +83,11 @@ backends:
 
       ADDRESS localhost
 
-      sudo mkdir -p /var/snap/microk8s/common/default-storage
-      sudo mount --bind /mnt /var/snap/microk8s/common/default-storage
+      # sudo mkdir -p /var/snap/microk8s/common/default-storage
+      # sudo mount --bind /mnt /var/snap/microk8s/common/default-storage
+
+      sudo apt purge containerd.io docker-ce-cli docker-ce
+      sudo rm -r /run/containerd
     # HACK: spread does not pass environment variables set on runner
     # Manually pass specific environment variables
     environment:

tests/integration/helpers.py

@@ -45,7 +45,7 @@
     check_call(["kubectl", "version", "--client=true"])
     KUBECTL = "kubectl"
 except FileNotFoundError:
-    KUBECTL = "microk8s kubectl"
+    KUBECTL = "sudo k8s kubectl"
 
 logger = logging.getLogger(__name__)