Merge pull request #323 from adrianchiris/bump-golang-123

bump golang to 1.23

Author: adrianchiris

.github/workflows/buildtest.yml

@@ -9,7 +9,7 @@ jobs:
   build-test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.23.x]
         os: [ubuntu-latest]
         goos: [linux]
         goarch: [amd64, arm64, ppc64le]
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.22.x
+          go-version: 1.23.x
 
       - name: Check out code
         uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
         run: podman build -t ghaction-sriov-cni:pr-${{github.event.pull_request.number}} .
 
       - name: Check out sriov operator's code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: k8snetworkplumbingwg/sriov-network-operator
           path: sriov-network-operator-wc

.github/workflows/image-push-master.yml

@@ -8,111 +8,41 @@ on:
     branches:
       - master
 jobs:
-  build-and-push-amd64-sriov-cni:
-    name: Image Push AMD64
-    runs-on: ubuntu-20.04
+  build-and-push-image-master:
+    name: image build and push
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Docker
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push sriov-cni
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64
-          tags: |
-            ${{ env.IMAGE_NAME }}:latest-amd64
-            ${{ env.IMAGE_NAME }}:${{ github.sha }}
-          file: ./Dockerfile
-
-  build-and-push-arm64-sriov-cni:
-    name: Image Push ARM64
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push sriov-cni
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          platforms: linux/arm64
-          tags: |
-            ${{ env.IMAGE_NAME }}:latest-arm64
-          file: ./Dockerfile.arm64
-
-  build-and-push-ppc64le-sriov-cni:
-    name: Image Push ppc64le
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Docker
-        uses: docker/login-action@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          images: ${{ env.IMAGE_NAME }}
 
       - name: Build and push sriov-cni
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          platforms: linux/ppc64le
+          platforms: linux/amd64,linux/arm64,linux/ppc64le
           tags: |
-            ${{ env.IMAGE_NAME }}:latest-ppc64le
-          file: ./Dockerfile.ppc64le
-
-  push-manifest:
-    runs-on: ubuntu-20.04
-    needs: [build-and-push-amd64-sriov-cni,build-and-push-arm64-sriov-cni,build-and-push-ppc64le-sriov-cni]
-    steps:
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Create manifest for multi-arch images
-      run: |
-        docker buildx imagetools create -t ${{ env.IMAGE_NAME }}:latest \
-        ${{ env.IMAGE_NAME }}:latest-amd64 \
-        ${{ env.IMAGE_NAME }}:latest-arm64 \
-        ${{ env.IMAGE_NAME }}:latest-ppc64le
+            ${{ env.IMAGE_NAME }}:latest
+            ${{ env.IMAGE_NAME }}:${{ github.sha }}
+          labels: |
+            ${{ steps.meta.outputs.labels }}
+          file: ./Dockerfile

.github/workflows/image-push-release.yml

@@ -8,26 +8,29 @@ on:
     tags:
       - v*
 jobs:
-  build-and-push-amd64-sriov-cni:
-    runs-on: ubuntu-20.04
-    name: Image push AMD64
+  build-and-push-image-release:
+    runs-on: ubuntu-24.04
+    name: image build and push on release
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+  
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_NAME }}
           flavor: |
@@ -36,116 +39,13 @@ jobs:
             type=ref,event=tag
 
       - name: Build and push sriov-cni
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64,linux/ppc64le
           tags: |
-            ${{ steps.docker_meta.outputs.tags }}-amd64
+            ${{ steps.docker_meta.outputs.tags }}
+          labels: |
+            ${{ steps.meta.outputs.labels }}
           file: ./Dockerfile
-
-  build-and-push-arm64-sriov-cni:
-    runs-on: ubuntu-20.04
-    name: Image push ARM64
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Docker
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=tag
-
-      - name: Build and push sriov-cni
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          platforms: linux/arm64
-          tags: |
-            ${{ steps.docker_meta.outputs.tags }}-arm64
-          file: ./Dockerfile.arm64
-
-  build-and-push-ppc64le-sriov-cni:
-    runs-on: ubuntu-20.04
-    name: Image push ppc64le
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Docker
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=tag
-
-      - name: Build and push sriov-cni
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          platforms: linux/ppc64le
-          tags: |
-            ${{ steps.docker_meta.outputs.tags }}-ppc64le
-          file: ./Dockerfile.ppc64le
-
-  push-manifest:
-    runs-on: ubuntu-20.04
-    needs: [build-and-push-amd64-sriov-cni,build-and-push-arm64-sriov-cni,build-and-push-ppc64le-sriov-cni]
-    steps:
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Docker meta
-      id: docker_meta
-      uses: docker/metadata-action@v4
-      with:
-        images: ${{ env.IMAGE_NAME }}
-        flavor: |
-          latest=false
-        tags: |
-          type=ref,event=tag
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Create manifest for multi-arch images
-      run: |
-        docker buildx imagetools create -t ${{ steps.docker_meta.outputs.tags }} \
-        ${{ steps.docker_meta.outputs.tags }}-amd64 \
-        ${{ steps.docker_meta.outputs.tags }}-arm64 \
-        ${{ steps.docker_meta.outputs.tags }}-ppc64le

.github/workflows/static-scan.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.23"
       - uses: actions/checkout@v3
       - name: run make lint
         run: make lint

.golangci.yml

@@ -1,3 +1,11 @@
+linters-settings:
+  revive:
+    rules:
+    - name: dot-imports
+      arguments:
+      - allowedPackages:
+        - "github.com/onsi/ginkgo/v2"
+        - "github.com/onsi/gomega"
 linters:
   enable:
     - revive

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1.23-alpine as builder
 
 COPY . /usr/src/sriov-cni
 

Dockerfile.arm64

@@ -54,7 +54,7 @@ build: | $(BUILDDIR) ; $(info Building $(BINARY_NAME)...) @ ## Build SR-IOV CNI
 
 # Tools
 GOLANGCI_LINT = $(BINDIR)/golangci-lint
-GOLANGCI_LINT_VERSION = v1.52.2
+GOLANGCI_LINT_VERSION = v1.64.7
 $(GOLANGCI_LINT): | $(BINDIR) ; $(info  Installing golangci-lint...)
 	$Q GOBIN=$(BINDIR) $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)