build(deps): bump linkerd/dev from 45 to 46

.github/workflows/actions.yml

@@ -15,13 +15,13 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: just action-lint
 
   devcontainer-versions:
     runs-on: ubuntu-22.04
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: just action-dev-check

.github/workflows/cni-plugin-integration.yml

@@ -21,7 +21,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-22.04
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Run CNI integration tests
         env:
@@ -32,16 +32,16 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-22.04
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Run CNI ordering tests
         run: just cni-plugin-test-ordering
   repair-controller:
     timeout-minutes: 15
     runs-on: ubuntu-22.04
     steps:
-      - uses: linkerd/dev/actions/setup-rust@v45
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-rust@v46
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Run repair-controller tests
         run: just cni-repair-controller-integration

.github/workflows/integration.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-22.04
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Run proxy-init integration tests
         run: just proxy-init-test-integration

.github/workflows/release-cni-plugin.yml

@@ -40,7 +40,7 @@ jobs:
           restore-keys: cni-plugin-${{ needs.meta.outputs.mode }}-
 
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: |
           just cni-plugin-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \

.github/workflows/release-proxy-init.yml

@@ -40,7 +40,7 @@ jobs:
           restore-keys: proxy-init-${{ needs.meta.outputs.mode }}-
 
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: |
           just proxy-init-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \

.github/workflows/shell.yml

@@ -15,6 +15,6 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-22.04
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v45
+      - uses: linkerd/dev/actions/setup-tools@v46
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - run: just sh-lint

cni-plugin/integration/manifests/flannel/linkerd-cni.yaml

@@ -4,7 +4,7 @@
 ##
 ## `linkerd install-cni \
 ##    --dest-cni-net-dir "/var/lib/rancher/k3s/agent/etc/cni/net.d/" \
-##    --dest-cni-bin-dir "/bin"`
+##    --dest-cni-bin-dir "/var/lib/rancher/k3s/data/cni"`
 ## These flags are meant to enable cni to work properly with k3d/k3s.
 ## Also the log level is set to debug to simplify development.
 ##
@@ -61,7 +61,7 @@ metadata:
     linkerd.io/cni-resource: "true"
 data:
   dest_cni_net_dir: "/var/lib/rancher/k3s/agent/etc/cni/net.d"
-  dest_cni_bin_dir: "/bin"
+  dest_cni_bin_dir: "/var/lib/rancher/k3s/data/cni"
   # The CNI network configuration to install on each node. The special
   # values in this config will be automatically populated.
   cni_network_config: |-
@@ -160,7 +160,7 @@ spec:
               - -c
               - kill -15 1; sleep 15s
         volumeMounts:
-        - mountPath: /host/bin
+        - mountPath: /host/var/lib/rancher/k3s/data/cni
           name: cni-bin-dir
         - mountPath: /host/var/lib/rancher/k3s/agent/etc/cni/net.d
           name: cni-net-dir
@@ -172,7 +172,7 @@ spec:
       volumes:
       - name: cni-bin-dir
         hostPath:
-          path: /bin
+          path: /var/lib/rancher/k3s/data/cni
       - name: cni-net-dir
         hostPath:
           path: /var/lib/rancher/k3s/agent/etc/cni/net.d

justfile

@@ -208,7 +208,7 @@ cni-plugin-test-integration-cilium:
 cni-plugin-test-ordering: build-cni-plugin-image
     @{{ just_executable() }} K3D_CLUSTER_NAME='l5d-calico-ordering-test' _cni-plugin-test-ordering-run
 
-_cni-plugin-test-ordering-run:
+_cni-plugin-test-ordering-run $K3S_IMAGES_JSON='./cni-plugin/integration/calico-k3s-images.json':
     @{{ just_executable() }} K3D_CREATE_FLAGS='{{ _K3D_CREATE_FLAGS_NO_CNI }}' _k3d-cni-create
     @just-k3d import {{ cni-plugin-image }}
     ./cni-plugin/integration/run-ordering.sh