From 2928480a9a9dcb30dfbd5510ed5701c61cb7b145 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 26 Jun 2023 16:22:06 +0300 Subject: [PATCH 1/2] Align go.mod version with Kubernetes Bump Go to 1.20 in go.mod Signed-off-by: Stefan Prodan --- api/go.mod | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/go.mod b/api/go.mod index 21e4b487d..9fb2259b0 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller/api -go 1.18 +go 1.20 require ( github.com/fluxcd/pkg/apis/acl v0.1.0 diff --git a/go.mod b/go.mod index 14970b880..b29cc3a53 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller -go 1.18 +go 1.20 replace github.com/fluxcd/source-controller/api => ./api From 626611958a80488f239bfe68404f92dd55e8229f Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 26 Jun 2023 16:55:43 +0300 Subject: [PATCH 2/2] Install Go 1.20 for oss-fuzz Signed-off-by: Stefan Prodan --- tests/fuzz/Dockerfile.builder | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/fuzz/Dockerfile.builder b/tests/fuzz/Dockerfile.builder index 293a261df..5eafa0e59 100644 --- a/tests/fuzz/Dockerfile.builder +++ b/tests/fuzz/Dockerfile.builder @@ -1,5 +1,11 @@ FROM gcr.io/oss-fuzz-base/base-builder-go +RUN wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz \ + && mkdir temp-go \ + && rm -rf /root/.go/* \ + && tar -C temp-go/ -xzf go1.20.5.linux-amd64.tar.gz \ + && mv temp-go/go/* /root/.go/ + ENV SRC=$GOPATH/src/github.com/fluxcd/source-controller ENV FLUX_CI=true