diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 5b2261ea..314f8599 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -20,8 +20,8 @@ jobs: with: provider: lxd juju-channel: 3.3/stable - chaos-enabled: false load-test-enabled: false zap-enabled: false trivy-fs-enabled: true trivy-image-config: "trivy.yaml" + tmate-debug: true diff --git a/charms/worker/charmcraft.yaml b/charms/worker/charmcraft.yaml index aecd6372..10f225f0 100644 --- a/charms/worker/charmcraft.yaml +++ b/charms/worker/charmcraft.yaml @@ -18,7 +18,7 @@ description: | * containerd links: contact: https://launchpad.net/~containers - documentation: https://discourse.charmhub.io + documentation: https://discourse.charmhub.io/t/k8s-worker-docs-index/13135 issues: - https://github.com/canonical/k8s-operator/issues source: diff --git a/charms/worker/icon.svg b/charms/worker/icon.svg new file mode 100644 index 00000000..42951eab --- /dev/null +++ b/charms/worker/icon.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charms/worker/k8s/charmcraft.yaml b/charms/worker/k8s/charmcraft.yaml index 27b9ebff..b1ef991f 100644 --- a/charms/worker/k8s/charmcraft.yaml +++ b/charms/worker/k8s/charmcraft.yaml @@ -27,7 +27,7 @@ description: |- * A Kubernetes CNI links: contact: https://launchpad.net/~containers - documentation: https://discourse.charmhub.io + documentation: https://discourse.charmhub.io/t/k8s-docs-index/13134 issues: - https://github.com/canonical/k8s-operator/issues source: diff --git a/charms/worker/k8s/icon.svg b/charms/worker/k8s/icon.svg new file mode 100644 index 00000000..6337ec58 --- /dev/null +++ b/charms/worker/k8s/icon.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/charms/worker/k8s/src/charm.py b/charms/worker/k8s/src/charm.py index 8b39c11e..a672607b 100755 --- a/charms/worker/k8s/src/charm.py +++ b/charms/worker/k8s/src/charm.py @@ -79,8 +79,7 @@ def _apply_snap_requirements(self): """ status.add(ops.MaintenanceStatus("Applying K8s requirements")) commands = [ - "/snap/k8s/current/k8s/connect-interfaces.sh", - "/snap/k8s/current/k8s/network-requirements.sh", + "/snap/k8s/current/k8s/hack/init.sh", ] for c in commands: subprocess.check_call(shlex.split(c))