From 4426cd671794443671402aca862f1270e4aa5900 Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Thu, 28 Oct 2021 00:08:05 +0200 Subject: [PATCH] Update Go to v1.17 Signed-off-by: Aurel Canciu --- .github/workflows/e2e.yaml | 2 +- Dockerfile | 2 +- api/go.mod | 18 +++++- api/v1beta1/zz_generated.deepcopy.go | 1 + go.mod | 82 ++++++++++++++++++++++++++-- 5 files changed, 98 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index dd688bfa4..f9bfe5d58 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -39,7 +39,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.17.x - name: Setup Kubernetes uses: engineerd/setup-kind@v0.5.0 with: diff --git a/Dockerfile b/Dockerfile index 8bfdfeae0..b36ab30b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG XX_VERSION=1.0.0-rc.2 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx -FROM --platform=$BUILDPLATFORM golang:1.16-alpine as builder +FROM --platform=$BUILDPLATFORM golang:1.17-alpine as builder # Copy the build utilities. COPY --from=xx / / diff --git a/api/go.mod b/api/go.mod index 85438106e..a900dcae6 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,9 +1,25 @@ module github.com/fluxcd/notification-controller/api -go 1.16 +go 1.17 require ( github.com/fluxcd/pkg/apis/meta v0.10.0 k8s.io/apimachinery v0.21.3 sigs.k8s.io/controller-runtime v0.9.5 ) + +require ( + github.com/go-logr/logr v0.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect + golang.org/x/text v0.3.6 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/klog/v2 v2.8.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect +) diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index 569925c36..f1a49a635 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/go.mod b/go.mod index dee0fe38d..661b67f72 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,12 @@ module github.com/fluxcd/notification-controller -go 1.16 +go 1.17 replace github.com/fluxcd/notification-controller/api => ./api require ( github.com/Azure/azure-amqp-common-go/v3 v3.1.0 github.com/Azure/azure-event-hubs-go/v3 v3.3.7 - github.com/Azure/azure-sdk-for-go v53.4.0+incompatible // indirect - github.com/Azure/go-amqp v0.13.6 // indirect github.com/containrrr/shoutrrr v0.4.4 github.com/fluxcd/notification-controller/api v0.18.1 github.com/fluxcd/pkg/apis/meta v0.10.0 @@ -19,7 +17,6 @@ require ( github.com/hashicorp/go-retryablehttp v0.6.8 github.com/ktrysmt/go-bitbucket v0.9.26 github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5 - github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/onsi/ginkgo v1.16.4 github.com/onsi/gomega v1.14.0 github.com/sethvargo/go-limiter v0.7.2 @@ -34,3 +31,80 @@ require ( k8s.io/client-go v0.21.3 sigs.k8s.io/controller-runtime v0.9.5 ) + +require ( + cloud.google.com/go v0.54.0 // indirect + github.com/Azure/azure-sdk-for-go v53.4.0+incompatible // indirect + github.com/Azure/go-amqp v0.13.6 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/devigned/tab v0.1.1 // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/fatih/color v1.10.0 // indirect + github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-logr/zapr v0.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.1.5 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/hashicorp/go-cleanhttp v0.5.1 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/jpillora/backoff v1.0.0 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/k0kubun/pp v2.3.0+incompatible // indirect + github.com/klauspost/compress v1.11.7 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.26.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.18.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gosrc.io/xmpp v0.5.1 // indirect + k8s.io/apiextensions-apiserver v0.21.3 // indirect + k8s.io/component-base v0.21.3 // indirect + k8s.io/klog/v2 v2.8.0 // indirect + k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect + k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471 // indirect + nhooyr.io/websocket v1.8.6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +)