Merge remote-tracking branch 'upstream/master' into sync-2023-06-27

SchSeba · Jun 27, 2023 · e7d6dfc · e7d6dfc
2 parents aba72e6 + b3aea76
commit e7d6dfc
Show file tree

Hide file tree

Showing 383 changed files with 36,474 additions and 6,555 deletions.
diff --git a/.github/workflows/build-test-lint.yml b/.github/workflows/build-test-lint.yml
@@ -5,7 +5,7 @@ jobs:
     name: build
     strategy:
       matrix:
-        go-version: [1.17.x, 1.18.x]
+        go-version: [1.20.x]
         goarch: [amd64]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
@@ -41,7 +41,7 @@ jobs:
         run: sudo apt-get install hwdata -y
 
       - name: Go test
-        run: make test
+        run: make test-race
 
   test-coverage:
     runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
 
       - uses: actions/checkout@v3
 
@@ -74,13 +74,13 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.46.2
+          version: v1.52.2
 
   shellcheck:
     name: Shellcheck
@@ -104,10 +104,6 @@ jobs:
       with:
        dockerfile: ./images/Dockerfile
        ignore: DL3018 # DL3018: GH issue 368
-    - uses: brpaz/[email protected]
-      with:
-        dockerfile: Dockerfile.rhel7
-        ignore: DL3018 DL3033 # DL3018/DL3033: GH issue 368
 
   go-check:
     runs-on: ubuntu-latest
@@ -117,7 +113,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.20.x
 
     # if this fails, run go mod tidy
     - name: Check if module files are consistent with code

diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml
@@ -5,7 +5,6 @@ on:
       - master
 jobs:
   build-and-push-amd64-device-plugin:
-    if: github.repository_owner == 'k8snetworkplumbingwg'
     name: Image push AMD64
     runs-on: ubuntu-20.04
     env:
@@ -36,7 +35,6 @@ jobs:
           file: images/Dockerfile
 
   build-and-push-arm64-device-plugin:
-    if: github.repository_owner == 'k8snetworkplumbingwg'
     name: Image push ARM64
     runs-on: ubuntu-20.04
     env:
@@ -69,7 +67,6 @@ jobs:
           file: images/Dockerfile.arm64
 
   build-and-push-ppc64le-device-plugin:
-    if: github.repository_owner == 'k8snetworkplumbingwg'
     name: Image push ppc64le
     runs-on: ubuntu-20.04
     env:
@@ -119,15 +116,7 @@ jobs:
 
     - name: Create manifest for multi-arch images
       run: |
-        # pull
-        docker pull ${{ env.IMAGE_NAME }}:latest-amd64
-        docker pull ${{ env.IMAGE_NAME }}:latest-arm64
-        docker pull ${{ env.IMAGE_NAME }}:latest-ppc64le
-        # create
-        docker manifest create ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:latest-amd64 ${{ env.IMAGE_NAME }}:latest-arm64 ${{ env.IMAGE_NAME }}:latest-ppc64le
-        # annotate
-        docker manifest annotate ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:latest-amd64 --arch amd64
-        docker manifest annotate ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:latest-arm64 --arch arm64
-        docker manifest annotate ${{ env.IMAGE_NAME }}:latest ${{ env.IMAGE_NAME }}:latest-ppc64le --arch ppc64le
-        # push
-        docker manifest push ${{ env.IMAGE_NAME }}:latest
+        docker buildx imagetools create -t ${{ env.IMAGE_NAME }}:latest \
+        ${{ env.IMAGE_NAME }}:latest-amd64 \
+        ${{ env.IMAGE_NAME }}:latest-arm64 \
+        ${{ env.IMAGE_NAME }}:latest-ppc64le
diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml
@@ -5,7 +5,6 @@ on:
       - v*
 jobs:
   build-and-push-amd64-device-plugin:
-    if: github.repository_owner == 'k8snetworkplumbingwg'
     name: Image push AMD64
     runs-on: ubuntu-20.04
     env:
@@ -29,7 +28,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.IMAGE_NAME }}
-          tag-latest: false
+          tags: |
+            type=ref,event=tag
 
       - name: Build and push sriov-network-device-plugin
         uses: docker/build-push-action@v4
@@ -42,7 +42,6 @@ jobs:
           file: images/Dockerfile
 
   build-and-push-arm64-device-plugin:
-    if: github.repository_owner == 'k8snetworkplumbingwg'
     name: Image push ARM64
     runs-on: ubuntu-20.04
     env:
@@ -69,7 +68,9 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.IMAGE_NAME }}
-          tag-latest: false
+          tags: |
+            type=ref,event=tag
+
 
       - name: Build and push sriov-network-device-plugin
         uses: docker/build-push-action@v4
@@ -82,7 +83,6 @@ jobs:
           file: images/Dockerfile.arm64
 
   build-and-push-ppc64le-device-plugin:
-    if: github.repository_owner == 'k8snetworkplumbingwg'
     name: Image push ppc64le
     runs-on: ubuntu-20.04
     env:
@@ -109,7 +109,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.IMAGE_NAME }}
-          tag-latest: false
+          tags: |
+            type=ref,event=tag
 
       - name: Build and push sriov-network-device-plugin
         uses: docker/build-push-action@v4
@@ -133,7 +134,8 @@ jobs:
       uses: docker/metadata-action@v4
       with:
         images: ${{ env.IMAGE_NAME }}
-        tag-latest: false
+        tags: |
+          type=ref,event=tag
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v2
@@ -144,15 +146,7 @@ jobs:
 
     - name: Create manifest for multi-arch images
       run: |
-        # pull
-        docker pull ${{ steps.docker_meta.outputs.tags }}-amd64
-        docker pull ${{ steps.docker_meta.outputs.tags }}-arm64
-        docker pull ${{ steps.docker_meta.outputs.tags }}-ppc64le
-        # create
-        docker manifest create ${{ steps.docker_meta.outputs.tags }} ${{ steps.docker_meta.outputs.tags }}-amd64 ${{ steps.docker_meta.outputs.tags }}-arm64 ${{ steps.docker_meta.outputs.tags }}-ppc64le
-        # annotate
-        docker manifest annotate ${{ steps.docker_meta.outputs.tags }} ${{ steps.docker_meta.outputs.tags }}-amd64 --arch amd64
-        docker manifest annotate ${{ steps.docker_meta.outputs.tags }} ${{ steps.docker_meta.outputs.tags }}-arm64 --arch arm64
-        docker manifest annotate ${{ steps.docker_meta.outputs.tags }} ${{ steps.docker_meta.outputs.tags }}-ppc64le --arch ppc64le
-        # push
-        docker manifest push ${{ steps.docker_meta.outputs.tags }}
+        docker buildx imagetools create -t ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }} \
+        ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }}-amd64 \
+        ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }}-arm64 \
+        ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }}-ppc64le
diff --git a/.travis.yml b/.travis.yml