Add multus test

.github/workflows/e2e.yaml

@@ -51,7 +51,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        etest: [btrfs, embeddedmirror, externalip, privateregistry, rootless, s3, startup, wasm]
+        # etest: [btrfs, embeddedmirror, externalip, privateregistry, rootless, s3, startup, wasm]
+        etest: [ multus ]
       max-parallel: 5
     steps:
       - name: "Checkout"
@@ -116,102 +117,4 @@ jobs:
           flags: e2etests # optional
           verbose: true # optional (default = false)
 
-  build-go-tests:
-    name: "Build Go Tests"
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
-    runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
-    outputs:
-      channel: ${{ steps.channel_step.outputs.channel }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v5
-    - name: Install Go
-      uses: ./.github/actions/setup-go
-    - name: Build Go Tests
-      run: |
-        mkdir -p ./dist/artifacts
-        go test -c -ldflags="-w -s" -o ./dist/artifacts ./tests/docker/...
-    - name: Upload Go Tests
-      uses: actions/upload-artifact@v4
-      with:
-        name: docker-go-tests-${{ matrix.arch }}
-        path: ./dist/artifacts/*.test
-        compression-level: 9
-        retention-days: 1
-    # For upgrade and skew tests, we need to know the channel this run is based off.
-    # Since this is predetermined, we can run this step before the actual test job, saving time.
-    - name: Determine channel
-      id: channel_step
-      run: |
-        . ./scripts/version.sh
-        MINOR_VER=$(echo $VERSION_TAG | cut -d'.' -f1,2)
-        echo "CHANNEL=$MINOR_VER" >> $GITHUB_OUTPUT 
-    # channel name should be v1.XX or latest
-    - name: Fail if channel name does not match pattern
-      run: |
-        if [[ ! ${{ steps.channel_step.outputs.channel }} =~ ^v1\.[0-9]+$|latest$ ]]; then
-          echo "Channel name ${{ steps.channel_step.outputs.channel }} does not match pattern"
-          exit 1
-        fi
-
-  docker-go:
-    needs: [build, build-arm64, build-go-tests]
-    name: Docker
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        dtest: [autoimport, basics, bootstraptoken, cacerts, etcd, hardened, lazypull, skew, secretsencryption, snapshotrestore, svcpoliciesandfirewall, token, upgrade]
-        arch: [amd64, arm64]
-        exclude:
-          - dtest: autoimport
-            arch: arm64
-          - dtest: secretsencryption
-            arch: arm64
-          - dtest: snapshotrestore
-            arch: arm64
-          - dtest: svcpoliciesandfirewall
-            arch: arm64
-    runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
-    env:
-      CHANNEL: ${{ needs.build-go-tests.outputs.channel }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v5
-    - name: "Download K3s image"
-      uses: actions/download-artifact@v5
-      with:
-        name: k3s-${{ matrix.arch }}
-        path: ./dist/artifacts
-    - name: Load and set K3s image
-      run: |
-        if [ ${{ matrix.arch }} = "arm64" ]; then
-          mv ./dist/artifacts/k3s-arm64 ./dist/artifacts/k3s
-        fi
-        chmod +x ./dist/artifacts/k3s
-        docker image load -i ./dist/artifacts/k3s-image.tar
-        IMAGE_TAG=$(docker image ls --format '{{.Repository}}:{{.Tag}}' | grep 'rancher/k3s')
-        echo "K3S_IMAGE=$IMAGE_TAG" >> $GITHUB_ENV
-    - name: Download Go Tests
-      uses: actions/download-artifact@v5
-      with:
-        name: docker-go-tests-${{ matrix.arch }}
-        path: ./dist/artifacts
-    - name: Run ${{ matrix.dtest }} Test
-      # Put the compiled test binary back in the same place as the test source
-      run: |
-        chmod +x ./dist/artifacts/${{ matrix.dtest }}.test
-        mv ./dist/artifacts/${{ matrix.dtest }}.test ./tests/docker/${{ matrix.dtest }}/
-        cd ./tests/docker/${{ matrix.dtest }}
-
-        # These tests use rancher/systemd-node and have different flags.
-        CI_TESTS="autoimport hardened secretsencryption snapshotrestore svcpoliciesandfirewall token"
-        if [ ${{ matrix.dtest }} = "upgrade" ] || [ ${{ matrix.dtest }} = "skew" ]; then
-          ./${{ matrix.dtest }}.test -test.timeout=0 -test.v -ginkgo.v -k3sImage=$K3S_IMAGE -channel=$CHANNEL
-        elif [[ $CI_TESTS =~ ${{ matrix.dtest }} ]]; then
-          ./${{ matrix.dtest }}.test -test.timeout=0 -test.v -ginkgo.v -ci
-        else
-          ./${{ matrix.dtest }}.test -test.timeout=0 -test.v -ginkgo.v -k3sImage=$K3S_IMAGE
-        fi
+

tests/e2e/amd64_resource_files/multus_network_attach.yaml

@@ -0,0 +1,18 @@
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: macvlan-whereabouts
+spec:
+  config: |-
+    {
+      "cniVersion": "1.0.0",
+      "type": "macvlan",
+      "master": "eth2",
+      "mode": "bridge",
+      "ipam": {
+        "type": "whereabouts",
+        "range": "172.17.0.0/24",
+        "gateway": "172.17.0.1",
+        "configuration_path": "/var/lib/rancher/k3s/agent/etc/cni/net.d/whereabouts.d/whereabouts.conf"
+      }
+    }

tests/e2e/amd64_resource_files/multus_pod_client.yaml

@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: multus-demo
+  labels:
+    app: multus-demo
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: multus-demo
+  template:
+    metadata:
+      annotations:
+        k8s.v1.cni.cncf.io/networks: macvlan-whereabouts
+      labels:
+        app: multus-demo
+    spec:
+      containers:
+      - image: wbitt/network-multitool:extra
+        imagePullPolicy: Always
+        name: network-multitool
+        env:
+        - name: HTTP_PORT
+          value: "1180"
+        - name: HTTPS_PORT
+          value: "11443"
+        ports:
+        - containerPort: 1180
+          name: http-port
+        - containerPort: 11443
+          name: https-port
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - multus-demo
+            topologyKey: kubernetes.io/hostname