-
Notifications
You must be signed in to change notification settings - Fork 261
Bump go to v1.17 #922
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump go to v1.17 #922
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.16-alpine | ||
| FROM golang:1.17-alpine | ||
|
|
||
| RUN apk update && \ | ||
| apk add make git protobuf | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,19 @@ | ||
| module github.com/operator-framework/operator-registry | ||
|
|
||
| go 1.16 | ||
| go 1.17 | ||
|
|
||
| require ( | ||
| github.com/Microsoft/hcsshim v0.8.9 // indirect | ||
| github.com/adrg/xdg v0.4.0 | ||
| github.com/blang/semver/v4 v4.0.0 | ||
| github.com/bugsnag/bugsnag-go v1.5.3 // indirect | ||
| github.com/bugsnag/panicwrap v1.2.0 // indirect | ||
| github.com/containerd/containerd v1.4.11 | ||
| github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect | ||
| github.com/containerd/ttrpc v1.0.1 // indirect | ||
| github.com/docker/cli v20.10.12+incompatible | ||
| github.com/docker/distribution v2.7.1+incompatible | ||
| github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce | ||
| github.com/docker/docker-credential-helpers v0.6.3 // indirect | ||
| github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect | ||
| github.com/docker/go-metrics v0.0.1 // indirect | ||
| github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect | ||
| github.com/garyburd/redigo v1.6.0 // indirect | ||
| github.com/ghodss/yaml v1.0.0 | ||
| github.com/gofrs/uuid v3.3.0+incompatible // indirect | ||
| github.com/golang-migrate/migrate/v4 v4.6.2 | ||
| github.com/golang/mock v1.5.0 | ||
| github.com/golang/protobuf v1.5.2 | ||
| github.com/google/go-cmp v0.5.6 | ||
| github.com/gorilla/handlers v1.4.2 // indirect | ||
| github.com/grpc-ecosystem/grpc-health-probe v0.3.2 | ||
| github.com/h2non/filetype v1.1.1 | ||
| github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c | ||
|
|
@@ -44,9 +32,6 @@ require ( | |
| github.com/sirupsen/logrus v1.8.1 | ||
| github.com/spf13/cobra v1.2.1 | ||
| github.com/stretchr/testify v1.7.0 | ||
| github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect | ||
| github.com/yvasiyarov/gorelic v0.0.7 // indirect | ||
| github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect | ||
| go.etcd.io/bbolt v1.3.6 | ||
| golang.org/x/mod v0.4.2 | ||
| golang.org/x/net v0.0.0-20210825183410-e898025ed96a | ||
|
|
@@ -65,5 +50,118 @@ require ( | |
| sigs.k8s.io/yaml v1.2.0 | ||
| ) | ||
|
|
||
| require ( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks funny -- should we have two
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This kind of pattern is more-or-less standard now with how Go 1.17 handles go.mod files now: https://go.dev/doc/go1.17#go-command.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Odd, going to look into this. /hold
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok thanks for the info 👍 |
||
| github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect | ||
| github.com/BurntSushi/toml v0.3.1 // indirect | ||
| github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect | ||
| github.com/Microsoft/go-winio v0.4.16 // indirect | ||
| github.com/Microsoft/hcsshim v0.8.9 // indirect | ||
| github.com/PuerkitoBio/purell v1.1.1 // indirect | ||
| github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect | ||
| github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect | ||
| github.com/alessio/shellescape v1.4.1 // indirect | ||
| github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect | ||
| github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/blang/semver v3.5.1+incompatible // indirect | ||
| github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect | ||
| github.com/bugsnag/bugsnag-go v1.5.3 // indirect | ||
| github.com/bugsnag/panicwrap v1.2.0 // indirect | ||
| github.com/cespare/xxhash/v2 v2.1.1 // indirect | ||
| github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f // indirect | ||
| github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect | ||
| github.com/containerd/ttrpc v1.0.1 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/docker/docker-credential-helpers v0.6.3 // indirect | ||
| github.com/docker/go-connections v0.4.0 // indirect | ||
| github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect | ||
| github.com/docker/go-metrics v0.0.1 // indirect | ||
| github.com/docker/go-units v0.4.0 // indirect | ||
| github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect | ||
| github.com/evanphx/json-patch v4.11.0+incompatible // indirect | ||
| github.com/evanphx/json-patch/v5 v5.2.0 // indirect | ||
| github.com/felixge/httpsnoop v1.0.1 // indirect | ||
| github.com/fsnotify/fsnotify v1.4.9 // indirect | ||
| github.com/garyburd/redigo v1.6.0 // indirect | ||
| github.com/go-git/gcfg v1.5.0 // indirect | ||
| github.com/go-git/go-billy/v5 v5.1.0 // indirect | ||
| github.com/go-git/go-git/v5 v5.3.0 // indirect | ||
| github.com/go-logr/logr v0.4.0 // indirect | ||
| github.com/go-openapi/jsonpointer v0.19.5 // indirect | ||
| github.com/go-openapi/jsonreference v0.19.5 // indirect | ||
| github.com/go-openapi/swag v0.19.14 // indirect | ||
| github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect | ||
| github.com/gofrs/uuid v3.3.0+incompatible // indirect | ||
| github.com/gogo/protobuf v1.3.2 // indirect | ||
| github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
| github.com/google/cel-go v0.9.0 // indirect | ||
| github.com/google/gofuzz v1.1.0 // indirect | ||
| github.com/googleapis/gnostic v0.5.5 // indirect | ||
| github.com/gorilla/handlers v1.4.2 // indirect | ||
| github.com/gorilla/mux v1.7.2 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect | ||
| github.com/imdario/mergo v0.3.12 // indirect | ||
| github.com/inconshreveable/mousetrap v1.0.0 // indirect | ||
| github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect | ||
| github.com/josharian/intern v1.0.0 // indirect | ||
| github.com/json-iterator/go v1.1.11 // indirect | ||
| github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect | ||
| github.com/mailru/easyjson v0.7.6 // 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/go-wordwrap v1.0.0 // indirect | ||
| github.com/mitchellh/mapstructure v1.4.1 // indirect | ||
| github.com/moby/spdystream v0.2.0 // indirect | ||
| github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.1 // indirect | ||
| github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect | ||
| github.com/nxadm/tail v1.4.8 // indirect | ||
| github.com/pelletier/go-toml v1.9.3 // 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 | ||
| github.com/russross/blackfriday v1.5.2 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| github.com/stoewer/go-strcase v1.2.0 // indirect | ||
| github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect | ||
| github.com/yvasiyarov/gorelic v0.0.7 // indirect | ||
| github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect | ||
| go.opencensus.io v0.23.0 // indirect | ||
| go.opentelemetry.io/contrib v0.20.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect | ||
| go.opentelemetry.io/otel v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/metric v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect | ||
| go.opentelemetry.io/otel/trace v0.20.0 // indirect | ||
| go.opentelemetry.io/proto/otlp v0.7.0 // indirect | ||
| golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect | ||
| golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect | ||
| golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect | ||
| golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect | ||
| golang.org/x/text v0.3.7 // indirect | ||
| golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect | ||
| golang.org/x/tools v0.1.5 // indirect | ||
| golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect | ||
| gopkg.in/warnings.v0 v0.1.2 // indirect | ||
| gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect | ||
| k8s.io/apiserver v0.22.1 // indirect | ||
| k8s.io/component-base v0.22.1 // indirect | ||
| k8s.io/klog/v2 v2.9.0 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect | ||
| k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect | ||
| sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect | ||
| sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect | ||
| ) | ||
|
|
||
| // latest tag resolves to a very old version. this is only used for spinning up local test registries | ||
| replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d | ||
dinhxuanvu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| //go:build ignore | ||
| // +build ignore | ||
|
|
||
| package buildahregistry | ||
|
|
||
| import ( | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| //go:build ignore | ||
| // +build ignore | ||
|
|
||
| package buildahregistry | ||
|
|
||
| import ( | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| //go:build kind | ||
| // +build kind | ||
|
|
||
| package ctx | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| //go:build !kind | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. unrelated: This points to the need for a shared operator-framework/test-infra repository so we're not de-duplicating work across the registry and OLM repositories. |
||
| // +build !kind | ||
|
|
||
| package ctx | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| //go:build tools | ||
| // +build tools | ||
|
|
||
| package tools | ||
|
|
||
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TIL we still have this Dockerfile and it was missed when we were separating out the downstream builds. Maybe this is something we can rework in the future to avoid using non-external images? cc @joelanford
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, in general I think there's a bunch of cleanup of Dockerfiles and quay build triggers we can do in this repo now.
Do we need anything other than the
quay.io/operator-framework/opmimage at this point?