Merge pull request #1170 from zeeke/ds/sync20260111

OCPBUGS-66342: Downstream sync 2026-01-11

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.22
+  tag: rhel-9-release-golang-1.25-openshift-4.22

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

@@ -17,7 +17,7 @@ jobs:
           version: latest
 
       - name: Check out the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: update chart
         env:

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4

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

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Add support for more platforms with QEMU (optional)
       # https://github.com/docker/setup-qemu-action
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Add support for more platforms with QEMU (optional)
       # https://github.com/docker/setup-qemu-action
@@ -92,7 +92,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Add support for more platforms with QEMU (optional)
       # https://github.com/docker/setup-qemu-action

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

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Add support for more platforms with QEMU (optional)
       # https://github.com/docker/setup-qemu-action
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Add support for more platforms with QEMU (optional)
       # https://github.com/docker/setup-qemu-action
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Add support for more platforms with QEMU (optional)
       # https://github.com/docker/setup-qemu-action

.github/workflows/test.yml

@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
 
-    - name: Set up Go 1.23
+    - name: Set up Go 1.25
       uses: actions/setup-go@v6
       with:
-        go-version: 1.23.x
+        go-version: 1.25.x
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: fmt
       run: IS_CONTAINER=yes make fmt
@@ -32,13 +32,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
 
-    - name: Set up Go 1.23
+    - name: Set up Go 1.25
       uses: actions/setup-go@v6
       with:
-        go-version: 1.23.x
+        go-version: 1.25.x
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: test pkg on kubernetes
       run: CLUSTER_TYPE=kubernetes make test-pkg
@@ -72,13 +72,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
 
-    - name: Set up Go 1.23
+    - name: Set up Go 1.25
       uses: actions/setup-go@v6
       with:
-        go-version: 1.23.x
+        go-version: 1.25.x
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: check go modules are up to date
       run: make check-deps
@@ -87,8 +87,14 @@ jobs:
     name: check manifests
     runs-on: ubuntu-24.04
     steps:
+
+    - name: Set up Go 1.25
+      uses: actions/setup-go@v6
+      with:
+        go-version: 1.25.x
+
     - name: Check out code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: check if the config/ folder is up to date
       run: make check-manifests
@@ -97,37 +103,57 @@ jobs:
     name: Golangci-lint
     runs-on: ubuntu-24.04
     steps:
-    - name: Set up Go 1.23
+    - name: Set up Go 1.25
       uses: actions/setup-go@v6
       with:
-        go-version: 1.23.x
+        go-version: 1.25.x
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: run lint checks
       run: make lint
 
   shellcheck:
     name: Shellcheck
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
         with:
           severity: error
 
+  hadolint:
+    name: hadolint
+    runs-on: ubuntu-24.04
+    steps:
+    - name: checkout PR 
+      uses: actions/checkout@v5
+    - name: run hadolint on operator dockerfile
+      # using commit sha of the hadolint-action to preserve immutability
+      uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
+      with:
+        dockerfile: Dockerfile
+    - name: run hadolint on config daemon dockerfile
+      uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
+      with:
+        dockerfile: Dockerfile.sriov-network-config-daemon
+        ignore: DL3033
+    - name: run hadolint on webhook dockerfile
+      uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
+      with:
+        dockerfile: Dockerfile.webhook
   test-coverage:
     name: test-coverage
     runs-on: ubuntu-24.04
     steps:
 
-    - name: Set up Go 1.23
+    - name: Set up Go 1.25
       uses: actions/setup-go@v6
       with:
-        go-version: 1.23.x
+        go-version: 1.25.x
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: test pkg on kubernetes
       run: CLUSTER_TYPE=kubernetes make test-pkg
@@ -157,7 +183,7 @@ jobs:
       run: make merge-test-coverage
 
     - name: Coveralls
-      uses: coverallsapp/github-action@v2.3.6
+      uses: coverallsapp/github-action@v2.3.7
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         path-to-lcov: lcov.out
@@ -174,17 +200,17 @@ jobs:
       TEST_REPORT_PATH: k8s-artifacts
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
-      - name: Set up Go 1.23
+      - name: Set up Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: 1.23.x
+          go-version: 1.25.x
 
       - name: run test
         run: make test-e2e-conformance-virtual-k8s-cluster-ci
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: always()
         with:
           name: ${{ env.TEST_REPORT_PATH }}
@@ -208,17 +234,17 @@ jobs:
       TEST_REPORT_PATH: ocp-artifacts
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
-      - name: Set up Go 1.23
+      - name: Set up Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: 1.23.x
+          go-version: 1.25.x
 
       - name: run test
         run: make test-e2e-conformance-virtual-ocp-cluster-ci
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: always()
         with:
           name: ${{ env.TEST_REPORT_PATH }}