From 29b58448e13d9c841683acf194a2aa70cff3a49c Mon Sep 17 00:00:00 2001 From: SuperQ Date: Mon, 23 May 2022 13:33:14 +0200 Subject: [PATCH] Update Go minimum version * Set Go minimum version to 1.17. * Update go.mod format for 1.17. * Remove unecessary exclude block for k8s.io/client-go. * Remove unecessary retract section. Signed-off-by: SuperQ --- go.mod | 196 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 95 insertions(+), 101 deletions(-) diff --git a/go.mod b/go.mod index 9144728eee0..5f603764012 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,14 @@ module github.com/prometheus/prometheus -go 1.16 +go 1.17 require ( github.com/Azure/azure-sdk-for-go v63.0.0+incompatible github.com/Azure/go-autorest/autorest v0.11.25 github.com/Azure/go-autorest/autorest/adal v0.9.18 - github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect - github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 - github.com/armon/go-metrics v0.3.3 // indirect github.com/aws/aws-sdk-go v1.43.31 github.com/cespare/xxhash/v2 v2.1.2 - github.com/containerd/containerd v1.6.1 // indirect github.com/dennwc/varint v1.0.0 github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245 github.com/digitalocean/godo v1.78.0 @@ -32,19 +28,15 @@ require ( github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/hashicorp/consul/api v1.12.0 - github.com/hashicorp/go-hclog v0.12.2 // indirect - github.com/hashicorp/go-immutable-radix v1.2.0 // indirect github.com/hetznercloud/hcloud-go v1.33.1 github.com/ionos-cloud/sdk-go/v6 v6.0.5851 github.com/json-iterator/go v1.1.12 github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b github.com/linode/linodego v1.4.1 github.com/miekg/dns v1.1.48 - github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f github.com/oklog/run v1.1.0 github.com/oklog/ulid v1.3.1 - github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pkg/errors v0.9.1 github.com/prometheus/alertmanager v0.24.0 github.com/prometheus/client_golang v1.12.1 @@ -86,6 +78,100 @@ require ( k8s.io/klog/v2 v2.40.1 ) +require ( + cloud.google.com/go/compute v1.6.0 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // 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/Microsoft/go-winio v0.5.1 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect + github.com/armon/go-metrics v0.3.3 // indirect + github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.2 // indirect + github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect + github.com/containerd/containerd v1.6.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-kit/kit v0.10.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/analysis v0.21.2 // indirect + github.com/go-openapi/errors v0.20.2 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.6 // indirect + github.com/go-openapi/loads v0.21.1 // indirect + github.com/go-openapi/spec v0.20.4 // indirect + github.com/go-openapi/swag v0.21.1 // indirect + github.com/go-openapi/validate v0.21.0 // indirect + github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect + github.com/go-stack/stack v1.8.1 // indirect + github.com/golang-jwt/jwt/v4 v4.2.0 // indirect + github.com/golang/glog v1.0.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.7 // indirect + github.com/google/go-querystring v1.0.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/googleapis/gax-go/v2 v2.3.0 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.1 // indirect + github.com/hashicorp/go-hclog v0.12.2 // indirect + github.com/hashicorp/go-immutable-radix v1.2.0 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/hashicorp/serf v0.9.6 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/jpillora/backoff v1.0.0 // indirect + github.com/julienschmidt/httprouter v1.3.0 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.mongodb.org/mongo-driver v1.8.3 // indirect + go.opencensus.io v0.23.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1 // indirect + go.opentelemetry.io/otel/metric v0.28.0 // indirect + go.opentelemetry.io/proto/otlp v0.12.1 // indirect + golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect + golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect + google.golang.org/appengine v1.6.7 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) + replace ( k8s.io/klog => github.com/simonpasquier/klog-gokit v0.3.0 k8s.io/klog/v2 => github.com/simonpasquier/klog-gokit/v3 v3.0.0 @@ -99,95 +185,3 @@ exclude ( github.com/grpc-ecosystem/grpc-gateway v1.14.7 google.golang.org/api v0.30.0 ) - -// Exclude pre-go-mod kubernetes tags, as they are older -// than v0.x releases but are picked when we update the dependencies. -exclude ( - k8s.io/client-go v1.4.0 - k8s.io/client-go v1.4.0+incompatible - k8s.io/client-go v1.5.0 - k8s.io/client-go v1.5.0+incompatible - k8s.io/client-go v1.5.1 - k8s.io/client-go v1.5.1+incompatible - k8s.io/client-go v10.0.0+incompatible - k8s.io/client-go v11.0.0+incompatible - k8s.io/client-go v2.0.0+incompatible - k8s.io/client-go v2.0.0-alpha.1+incompatible - k8s.io/client-go v3.0.0+incompatible - k8s.io/client-go v3.0.0-beta.0+incompatible - k8s.io/client-go v4.0.0+incompatible - k8s.io/client-go v4.0.0-beta.0+incompatible - k8s.io/client-go v5.0.0+incompatible - k8s.io/client-go v5.0.1+incompatible - k8s.io/client-go v6.0.0+incompatible - k8s.io/client-go v7.0.0+incompatible - k8s.io/client-go v8.0.0+incompatible - k8s.io/client-go v9.0.0+incompatible - k8s.io/client-go v9.0.0-invalid+incompatible -) - -retract ( - v2.5.0+incompatible - v2.5.0-rc.2+incompatible - v2.5.0-rc.1+incompatible - v2.5.0-rc.0+incompatible - v2.4.3+incompatible - v2.4.2+incompatible - v2.4.1+incompatible - v2.4.0+incompatible - v2.4.0-rc.0+incompatible - v2.3.2+incompatible - v2.3.1+incompatible - v2.3.0+incompatible - v2.2.1+incompatible - v2.2.0+incompatible - v2.2.0-rc.1+incompatible - v2.2.0-rc.0+incompatible - v2.1.0+incompatible - v2.0.0+incompatible - v2.0.0-rc.3+incompatible - v2.0.0-rc.2+incompatible - v2.0.0-rc.1+incompatible - v2.0.0-rc.0+incompatible - v2.0.0-beta.5+incompatible - v2.0.0-beta.4+incompatible - v2.0.0-beta.3+incompatible - v2.0.0-beta.2+incompatible - v2.0.0-beta.1+incompatible - v2.0.0-beta.0+incompatible - v2.0.0-alpha.3+incompatible - v2.0.0-alpha.2+incompatible - v2.0.0-alpha.1+incompatible - v2.0.0-alpha.0+incompatible - v1.8.2 - v1.8.1 - v1.8.0 - v1.7.2 - v1.7.1 - v1.7.0 - v1.6.3 - v1.6.2 - v1.6.1 - v1.6.0 - v1.5.3 - v1.5.2 - v1.5.1 - v1.5.0 - v1.4.1 - v1.4.0 - v1.3.1 - v1.3.0 - v1.3.0-beta.0 - v1.2.3 - v1.2.2 - v1.2.1 - v1.2.0 - v1.1.3 - v1.1.2 - v1.1.1 - v1.1.0 - v1.0.2 - v1.0.1 - v1.0.0 - v1.0.0-rc.0 -)