Revert "Merge branch 'main' from github.com/containernetworking/plugins into 'master'"

.github/actions/retest-action/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.21
+FROM alpine:3.10
 
 RUN apk add --no-cache curl jq
 

.github/actions/retest-action/action.yml

@@ -8,4 +8,4 @@ runs:
   using: 'docker'
   image: 'Dockerfile'
   env:
-    GITHUB_TOKEN: ${{ inputs.token }}
+    GITHUB_TOKEN: ${{ inputs.token }}

.github/actions/retest-action/entrypoint.sh

@@ -27,10 +27,10 @@ curl --request GET \
     --header "authorization: Bearer ${GITHUB_TOKEN}" \
     --header "content-type: application/json" | jq '.workflow_runs | max_by(.run_number)' > run.json
 
-RUN_URL=$(jq -r '.rerun_url' run.json)
+RERUN_URL=$(jq -r '.rerun_url' run.json)
 
 curl --request POST \
-    --url "${RUN_URL}/rerun-failed-jobs" \
+    --url "${RERUN_URL}" \
     --header "authorization: Bearer ${GITHUB_TOKEN}" \
     --header "content-type: application/json"
 
@@ -42,4 +42,4 @@ curl --request POST \
     --header "authorization: Bearer ${GITHUB_TOKEN}" \
     --header "accept: application/vnd.github.squirrel-girl-preview+json" \
     --header "content-type: application/json" \
-    --data '{ "content" : "rocket" }'
+    --data '{ "content" : "rocket" }'

.github/workflows/commands.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Re-Test Action
         uses: ./.github/actions/retest-action

.github/workflows/test.yaml

@@ -1,53 +1,23 @@
 ---
 name: test
 
-on:
-  pull_request: {}
+on: ["push", "pull_request"]
 
 env:
-  LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64"
+  GO_VERSION: "1.22"
+  LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
 
 jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: setup go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: .github/go-version
-      - uses: ibiqlik/action-yamllint@v3
-        with:
-          format: auto
-      - uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.61.0
-          args: -v
-  verify-vendor:
-    name: Verify vendor directory
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: .github/go-version
-      - name: Check module vendoring
-        run: |
-          go mod tidy
-          go mod vendor
-          test -z "$(git status --porcelain)" || (echo "please run 'go mod tidy && go mod vendor', and submit your changes"; exit 1)
   build:
     name: Build all linux architectures
-    needs: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
       - name: setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version-file: .github/go-version
+          go-version: ${{ env.GO_VERSION }}
+      - uses: actions/checkout@v2
+
       - name: Build on all supported architectures
         run: |
           set -e
@@ -56,9 +26,9 @@ jobs:
             GOARCH=$arch ./build_linux.sh
             rm bin/*
           done
+
   test-linux:
     name: Run tests on Linux amd64
-    needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Install kernel module
@@ -67,25 +37,22 @@ jobs:
           sudo apt-get install linux-modules-extra-$(uname -r)
       - name: Install nftables
         run: sudo apt-get install nftables
-      - name: Install dnsmasq(dhcp server)
-        run: |
-          sudo apt-get install dnsmasq
-          sudo systemctl disable --now dnsmasq
-      - uses: actions/checkout@v4
+
       - name: setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version-file: .github/go-version
+          go-version: ${{ env.GO_VERSION }}
       - name: Set up Go for root
         run: |
           sudo ln -sf `which go` `sudo which go` || true
           sudo go version
+      - uses: actions/checkout@v2
 
       - name: Install test binaries
         run: |
-          go install github.com/containernetworking/cni/cnitool@latest
-          go install github.com/mattn/goveralls@latest
-          go install github.com/modocache/gover@latest
+          go install github.com/containernetworking/cni/cnitool@v1.2.2
+          go install github.com/mattn/goveralls@v0.0.12
+          go install github.com/modocache/gover@b58185e
 
       - name: test
         run: PATH=$PATH:$(go env GOPATH)/bin COVERALLS=1 ./test_linux.sh
@@ -97,15 +64,15 @@ jobs:
           PATH=$PATH:$(go env GOPATH)/bin
           gover
           goveralls -coverprofile=gover.coverprofile -service=github
+
   test-win:
     name: Build and run tests on Windows
-    needs: build
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
       - name: setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version-file: .github/go-version
+          go-version: ${{ env.GO_VERSION }}
+      - uses: actions/checkout@v2
       - name: test
         run: bash ./test_windows.sh

OWNERS.md

@@ -7,4 +7,3 @@ This is the official list of the CNI network plugins owners:
 - Matt Dupre <matt@tigera.io> (@matthewdupre)
 - Michael Cambria <mcambria@redhat.com> (@mccv1r0)
 - Piotr Skarmuk <piotr.skarmuk@gmail.com> (@jellonek)
-- Michael Zappa <michael.zappa@gmail.com> (@MikeZappa87)

README.md

@@ -16,14 +16,13 @@ Read [CONTRIBUTING](CONTRIBUTING.md) for build and test instructions.
 * `ptp`: Creates a veth pair.
 * `vlan`: Allocates a vlan device.
 * `host-device`: Move an already-existing device into a container.
-* `dummy`: Creates a new Dummy device in the container.
 #### Windows: Windows specific
 * `win-bridge`: Creates a bridge, adds the host and the container to it.
 * `win-overlay`: Creates an overlay interface to the container.
 ### IPAM: IP address allocation
 * `dhcp`: Runs a daemon on the host to make DHCP requests on behalf of the container
 * `host-local`: Maintains a local database of allocated IPs
-* `static`:  Allocate a single static IPv4/IPv6 address to container. It's useful in debugging purpose.
+* `static`:  Allocate a static IPv4/IPv6 addresses to container and it's useful in debugging purpose.
 
 ### Meta: other plugins
 * `tuning`: Tweaks sysctl parameters of an existing interface

build_linux.sh

@@ -1,8 +1,8 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 set -e
 cd "$(dirname "$0")"
 
-if [ "$(uname)" = "Darwin" ]; then
+if [ "$(uname)" == "Darwin" ]; then
 	export GOOS="${GOOS:-linux}"
 fi