Skip to content

Commit a6f1618

Browse files
awgreeneperdasilva
awgreene
authored and
perdasilva
committed
Bump go to v1.17 (#922)
This commit updates the operator-registry's go version to v1.17. Signed-off-by: Alexander Greene <[email protected]> Upstream-repository: operator-registry Upstream-commit: c970d617ce2d77c096102e2d881a15ef680bacf9
1 parent c2974d2 commit a6f1618

File tree

17 files changed

+134
-29
lines changed

17 files changed

+134
-29
lines changed

‎staging/operator-registry/.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- uses: actions/checkout@v2
1616
- uses: actions/setup-go@v2
1717
with:
18-
go-version: '~1.16'
18+
go-version: '~1.17'
1919
- run: make build

‎staging/operator-registry/.github/workflows/go-apidiff.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: '~1.16'
20+
go-version: '~1.17'
2121
id: go
2222
- name: Check out code into the Go module directory
2323
uses: actions/checkout@v2

‎staging/operator-registry/.github/workflows/goreleaser.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fetch-depth: 0
5656
- uses: actions/setup-go@v2
5757
with:
58-
go-version: '~1.16'
58+
go-version: '~1.17'
5959

6060
- name: "Run GoReleaser"
6161
run: make release
@@ -80,7 +80,7 @@ jobs:
8080

8181
- uses: actions/setup-go@v2
8282
with:
83-
go-version: '~1.16'
83+
go-version: '~1.17'
8484

8585
- name: "Run GoReleaser"
8686
run: make release
@@ -105,7 +105,7 @@ jobs:
105105

106106
- uses: actions/setup-go@v2
107107
with:
108-
go-version: '~1.16'
108+
go-version: '~1.17'
109109

110110
- name: "Install linux cross-compilers"
111111
run: |

‎staging/operator-registry/.github/workflows/sanity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-go@v2
1818
with:
19-
go-version: '~1.16'
19+
go-version: '~1.17'
2020
- name: Install goimports
2121
run: go install golang.org/x/tools/cmd/goimports@latest
2222
- name: Run sanity checks

‎staging/operator-registry/.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: '~1.16'
17+
go-version: '~1.17'
1818
- name: Install podman
1919
run: |
2020
. /etc/os-release

‎staging/operator-registry/.github/workflows/unit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-go@v2
1818
with:
19-
go-version: '~1.16'
19+
go-version: '~1.17'
2020
- run: make unit
2121
- run: sed -i'' "s:^github.com/$GITHUB_REPOSITORY/::" coverage.out
2222
- run: .github/workflows/codecov.sh -Z -f coverage.out

‎staging/operator-registry/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.8 AS builder
22

33
ENV GOPATH /go
44
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

‎staging/operator-registry/codegen.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16-alpine
1+
FROM golang:1.17-alpine
22

33
RUN apk update && \
44
apk add make git protobuf

‎staging/operator-registry/go.mod

Lines changed: 114 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
module github.com/operator-framework/operator-registry
22

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/Microsoft/hcsshim v0.8.9 // indirect
76
github.com/adrg/xdg v0.4.0
87
github.com/blang/semver/v4 v4.0.0
9-
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
10-
github.com/bugsnag/panicwrap v1.2.0 // indirect
118
github.com/containerd/containerd v1.4.11
12-
github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
13-
github.com/containerd/ttrpc v1.0.1 // indirect
149
github.com/docker/cli v20.10.12+incompatible
1510
github.com/docker/distribution v2.7.1+incompatible
1611
github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce
17-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
18-
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
19-
github.com/docker/go-metrics v0.0.1 // indirect
20-
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
21-
github.com/garyburd/redigo v1.6.0 // indirect
2212
github.com/ghodss/yaml v1.0.0
23-
github.com/gofrs/uuid v3.3.0+incompatible // indirect
2413
github.com/golang-migrate/migrate/v4 v4.6.2
2514
github.com/golang/mock v1.5.0
2615
github.com/golang/protobuf v1.5.2
2716
github.com/google/go-cmp v0.5.6
28-
github.com/gorilla/handlers v1.4.2 // indirect
2917
github.com/grpc-ecosystem/grpc-health-probe v0.3.2
3018
github.com/h2non/filetype v1.1.1
3119
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
@@ -44,9 +32,6 @@ require (
4432
github.com/sirupsen/logrus v1.8.1
4533
github.com/spf13/cobra v1.2.1
4634
github.com/stretchr/testify v1.7.0
47-
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
48-
github.com/yvasiyarov/gorelic v0.0.7 // indirect
49-
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
5035
go.etcd.io/bbolt v1.3.6
5136
golang.org/x/mod v0.4.2
5237
golang.org/x/net v0.0.0-20210825183410-e898025ed96a
@@ -65,5 +50,118 @@ require (
6550
sigs.k8s.io/yaml v1.2.0
6651
)
6752

53+
require (
54+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
55+
github.com/BurntSushi/toml v0.3.1 // indirect
56+
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
57+
github.com/Microsoft/go-winio v0.4.16 // indirect
58+
github.com/Microsoft/hcsshim v0.8.9 // indirect
59+
github.com/PuerkitoBio/purell v1.1.1 // indirect
60+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
61+
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
62+
github.com/alessio/shellescape v1.4.1 // indirect
63+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
64+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
65+
github.com/beorn7/perks v1.0.1 // indirect
66+
github.com/blang/semver v3.5.1+incompatible // indirect
67+
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
68+
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
69+
github.com/bugsnag/panicwrap v1.2.0 // indirect
70+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
71+
github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f // indirect
72+
github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
73+
github.com/containerd/ttrpc v1.0.1 // indirect
74+
github.com/davecgh/go-spew v1.1.1 // indirect
75+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
76+
github.com/docker/go-connections v0.4.0 // indirect
77+
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
78+
github.com/docker/go-metrics v0.0.1 // indirect
79+
github.com/docker/go-units v0.4.0 // indirect
80+
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
81+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
82+
github.com/evanphx/json-patch/v5 v5.2.0 // indirect
83+
github.com/felixge/httpsnoop v1.0.1 // indirect
84+
github.com/fsnotify/fsnotify v1.4.9 // indirect
85+
github.com/garyburd/redigo v1.6.0 // indirect
86+
github.com/go-git/gcfg v1.5.0 // indirect
87+
github.com/go-git/go-billy/v5 v5.1.0 // indirect
88+
github.com/go-git/go-git/v5 v5.3.0 // indirect
89+
github.com/go-logr/logr v0.4.0 // indirect
90+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
91+
github.com/go-openapi/jsonreference v0.19.5 // indirect
92+
github.com/go-openapi/swag v0.19.14 // indirect
93+
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
94+
github.com/gofrs/uuid v3.3.0+incompatible // indirect
95+
github.com/gogo/protobuf v1.3.2 // indirect
96+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
97+
github.com/google/cel-go v0.9.0 // indirect
98+
github.com/google/gofuzz v1.1.0 // indirect
99+
github.com/googleapis/gnostic v0.5.5 // indirect
100+
github.com/gorilla/handlers v1.4.2 // indirect
101+
github.com/gorilla/mux v1.7.2 // indirect
102+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
103+
github.com/imdario/mergo v0.3.12 // indirect
104+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
105+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
106+
github.com/josharian/intern v1.0.0 // indirect
107+
github.com/json-iterator/go v1.1.11 // indirect
108+
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
109+
github.com/mailru/easyjson v0.7.6 // indirect
110+
github.com/mattn/go-isatty v0.0.12 // indirect
111+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
112+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
113+
github.com/mitchellh/mapstructure v1.4.1 // indirect
114+
github.com/moby/spdystream v0.2.0 // indirect
115+
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
116+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
117+
github.com/modern-go/reflect2 v1.0.1 // indirect
118+
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
119+
github.com/nxadm/tail v1.4.8 // indirect
120+
github.com/pelletier/go-toml v1.9.3 // indirect
121+
github.com/pmezard/go-difflib v1.0.0 // indirect
122+
github.com/prometheus/client_golang v1.11.0 // indirect
123+
github.com/prometheus/client_model v0.2.0 // indirect
124+
github.com/prometheus/common v0.26.0 // indirect
125+
github.com/prometheus/procfs v0.6.0 // indirect
126+
github.com/russross/blackfriday v1.5.2 // indirect
127+
github.com/spf13/pflag v1.0.5 // indirect
128+
github.com/stoewer/go-strcase v1.2.0 // indirect
129+
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
130+
github.com/yvasiyarov/gorelic v0.0.7 // indirect
131+
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
132+
go.opencensus.io v0.23.0 // indirect
133+
go.opentelemetry.io/contrib v0.20.0 // indirect
134+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
135+
go.opentelemetry.io/otel v0.20.0 // indirect
136+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
137+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
138+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
139+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
140+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
141+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
142+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
143+
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
144+
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
145+
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect
146+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
147+
golang.org/x/text v0.3.7 // indirect
148+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
149+
golang.org/x/tools v0.1.5 // indirect
150+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
151+
google.golang.org/appengine v1.6.7 // indirect
152+
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
153+
gopkg.in/inf.v0 v0.9.1 // indirect
154+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
155+
gopkg.in/warnings.v0 v0.1.2 // indirect
156+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
157+
k8s.io/apiserver v0.22.1 // indirect
158+
k8s.io/component-base v0.22.1 // indirect
159+
k8s.io/klog/v2 v2.9.0 // indirect
160+
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
161+
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
162+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect
163+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
164+
)
165+
68166
// latest tag resolves to a very old version. this is only used for spinning up local test registries
69167
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d

‎staging/operator-registry/pkg/image/buildahregistry/_options.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
//go:build ignore
12
// +build ignore
3+
24
package buildahregistry
35

46
import (

‎staging/operator-registry/pkg/image/buildahregistry/_registry.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
//go:build ignore
12
// +build ignore
3+
24
package buildahregistry
35

46
import (

‎staging/operator-registry/registry.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16-alpine as builder
1+
FROM golang:1.17-alpine as builder
22

33
RUN apk update && apk add sqlite build-base git mercurial bash
44
WORKDIR /build

‎staging/operator-registry/test/e2e/ctx/provisioner_kind.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build kind
12
// +build kind
23

34
package ctx

‎staging/operator-registry/test/e2e/ctx/provisioner_kubeconfig.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !kind
12
// +build !kind
23

34
package ctx

‎staging/operator-registry/tools.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build tools
12
// +build tools
23

34
package tools

‎staging/operator-registry/upstream-builder.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16-alpine as builder
1+
FROM golang:1.17-alpine as builder
22

33
RUN apk update && apk add sqlite build-base git mercurial bash
44
WORKDIR /build

‎staging/operator-registry/upstream-opm-builder.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## GoReleaser to build and push multi-arch images for opm
44
##
55

6-
FROM quay.io/operator-framework/golang:1.16-alpine AS builder
6+
FROM quay.io/operator-framework/golang:1.17-alpine AS builder
77

88
RUN apk update && apk add sqlite build-base git mercurial bash
99
WORKDIR /build

0 commit comments

Comments
 (0)