sync lxd-profile between k-c-p and k-w

.github/workflows/main.yml

@@ -26,14 +26,15 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: '3.10'
       - name: Setup operator environment
         uses: charmed-kubernetes/actions-operator@main
         with:
           provider: vsphere
+          juju-channel: 3.1/stable
           credentials-yaml: ${{ secrets.CREDENTIALS_YAML }}
           clouds-yaml: ${{ secrets.CLOUDS_YAML }}
           bootstrap-constraints: "arch=amd64 cores=2 mem=4G"
           bootstrap-options: "${{ secrets.JAMMY_BOOTSTRAP_OPTIONS }} --model-default datastore=vsanDatastore --model-default primary-network=VLAN_2763"
       - name: Run test
-        run: tox -e integration
+        run: tox -e integration -- --basetemp=/home/ubuntu/pytest

build-cni-resources.sh

@@ -5,7 +5,7 @@ set -eux
 # When changing CNI_VERSION, it should be updated in both
 # charm-kubernetes-control-plane/build-cni-resources.sh and
 # charm-kubernetes-worker/build-cni-resources.sh
-CNI_VERSION="${CNI_VERSION:-v0.7.5}"
+CNI_VERSION="${CNI_VERSION:-v1.2.0}"
 ARCH="${ARCH:-amd64 arm64 s390x}"
 
 build_script_commit="$(git show --oneline -q)"
@@ -29,8 +29,8 @@ mkdir "$temp_dir"
       -e GOOS=linux \
       -e GOARCH="$arch" \
       -v "$temp_dir"/cni-plugins:/cni \
-      golang:1.15 \
-      /bin/bash -c "cd /cni && ./build.sh && chown -R ${USER_ID}:${GROUP_ID} /cni"
+      golang:1.17 \
+      /bin/bash -c "cd /cni && ./build_linux.sh && chown -R ${USER_ID}:${GROUP_ID} /cni"
 
     (cd cni-plugins/bin
       echo "cni-$arch $CNI_VERSION" >> BUILD_INFO

config.yaml

@@ -11,7 +11,7 @@ options:
         juju run --application kubernetes-worker -- open-port 80 && open-port 443
   channel:
     type: string
-    default: "1.27/edge"
+    default: "1.28/edge"
     description: |
       Snap channel to install Kubernetes worker services from
   require-manual-upgrade:

lxd-profile.yaml

@@ -1,6 +1,6 @@
 name: juju-default-k8s-deployment-0
 config:
-  linux.kernel_modules: ip_tables,ip6_tables,netlink_diag,nf_nat,overlay
+  linux.kernel_modules: ip_tables,ip6_tables,netlink_diag,nf_nat,overlay,rbd,ip_vs,ip_vs_rr,ip_vs_wrr,ip_vs_sh
   raw.lxc: |
     lxc.apparmor.profile=unconfined
     lxc.mount.auto=proc:rw sys:rw
@@ -14,3 +14,7 @@ devices:
     path: /dev/kmsg
     source: /dev/kmsg
     type: unix-char
+  sysfsbpf:
+    path: /sys/fs/bpf
+    source: /sys/fs/bpf
+    type: disk

tox.ini

@@ -35,7 +35,7 @@ deps =
     pytest
     pytest-operator
     ipdb
-    juju < 3.1
+    juju
 commands = pytest --tb native --show-capture=no --log-cli-level=INFO -s {posargs} {toxinidir}/tests/integration
 
 [testenv:lint]