diff --git a/README.md b/README.md index 56673f0..f533438 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ the environment variable version will always take precedent. The equivalents are | Flag | Env Var | | :------------------------: | :--------------------------------: | | `--juju-channel` | `CONCIERGE_JUJU_CHANNEL` | +| `--canonical-k8s-channel` | `CONCIERGE_CANONICAL_K8S_CHANNEL` | | `--microk8s-channel` | `CONCIERGE_MICROK8S_CHANNEL` | | `--lxd-channel` | `CONCIERGE_LXD_CHANNEL` | | `--charmcraft-channel` | `CONCIERGE_CHARMCRAFT_CHANNEL` | @@ -139,21 +140,6 @@ juju: # (Required): Define the providers to be installed and bootstrapped. providers: - # (Optional) Canonical K8s provider configuration. - canonical-k8s: - # (Optional) Enable or disable Canonical K8s. - enable: true | false - # (Optional) Whether or not to bootstrap a controller onto Canonical K8s. - bootstrap: true | false - # (Optional): Channel from which to install Canonical K8s. - channel: - # (Optional): Canonical K8s addons to enable. - features: - # (Optional) Name of the Canonical K8s feature. E.g. `load-balancer`. - : - # (Optional) Feature configuration key/value - : - # (Optional) MicroK8s provider configuration. microk8s: # (Optional) Enable or disable MicroK8s. @@ -260,19 +246,9 @@ juju: automatically-retry-hooks: "false" providers: - canonical-k8s: + microk8s: enable: true bootstrap: true - channel: 1.31/candidate - features: - local-storage: - load-balancer: - l2-mode: true - cidrs: 10.64.140.43/32 - - microk8s: - enable: false - bootstrap: false channel: 1.31-strict/stable addons: - hostpath-storage @@ -354,7 +330,7 @@ To run any of the tests on a locally provisioned machine, use the `github-ci` ba ```bash # List available tests -$ spread -list github-ci: +$ spread --list github-ci: # Run all of the tests $ spread -v github-ci: # Run a particular test