diff --git a/concierge.yaml b/concierge.yaml index 0d2bbc8c7a..2729483876 100644 --- a/concierge.yaml +++ b/concierge.yaml @@ -2,13 +2,13 @@ juju: model-defaults: logging-config: =INFO; unit=DEBUG providers: - microk8s: + k8s: enable: true bootstrap: true - addons: - - dns - - hostpath-storage - - rbac + features: + local-storage: {} + network: {} + dns: {} host: snaps: jhack: diff --git a/spread.yaml b/spread.yaml index be564d141d..aee84ac63a 100644 --- a/spread.yaml +++ b/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,9 @@ backends: ADDRESS localhost - sudo mkdir -p /var/snap/microk8s/common/default-storage - sudo mount --bind /mnt /var/snap/microk8s/common/default-storage + # Remove Docker/containerd from the runner so k8s can bootstrap cleanly. + # sudo apt-get remove -y docker-ce docker-ce-cli containerd.io + # sudo rm -rf /run/containerd # HACK: spread does not pass environment variables set on runner # Manually pass specific environment variables environment: @@ -118,6 +119,9 @@ prepare: | # Install charmcraft & pipx (on lxd-vm backend) concierge prepare --trace + sudo k8s status + sudo k8s get dns + pipx install tox poetry prepare-each: | cd "$SPREAD_PATH" diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py index f56fcfc7c8..58bc85fca4 100644 --- a/tests/integration/helpers.py +++ b/tests/integration/helpers.py @@ -59,7 +59,7 @@ class SecretNotFoundError(Exception): check_call(["kubectl", "version", "--client=true"]) KUBECTL = "kubectl" except FileNotFoundError: - KUBECTL = "microk8s kubectl" + KUBECTL = "sudo k8s kubectl" logger = logging.getLogger(__name__)