Merge pull request #409 from andyzhangx/fix-buildx

fix: buildx issue with provenance disabled

Author: andyzhangx

.github/workflows/trivy.yaml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: ^1.16
+          go-version: ^1.19
 
       - name: Build an image from Dockerfile
         run: |

Makefile

@@ -87,11 +87,13 @@ nfs-armv7:
 .PHONY: container-build
 container-build:
 	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
+		--provenance=false --sbom=false \
 		-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) .
 
 .PHONY: container-linux-armv7
 container-linux-armv7:
 	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/arm/v7" \
+		--provenance=false --sbom=false \
 		-t $(IMAGE_TAG)-linux-arm-v7 --build-arg ARCH=arm/v7 .
 
 .PHONY: container

hack/boilerplate/boilerplate.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Kubernetes Authors.
 #
@@ -199,4 +199,4 @@ def main():
     return 0
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main())

test/external-e2e/run.sh

@@ -20,8 +20,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel)
 DRIVER="test"
 
 install_ginkgo () {
-    apt update -y
-    apt install -y golang-ginkgo-dev
+    go install github.com/onsi/ginkgo/[email protected]
 }
 
 setup_e2e_binaries() {