Skip to content

Commit f8c37cd

Browse files
committed
Upgrade to go 1.20
1 parent 4eefb76 commit f8c37cd

File tree

9 files changed

+287
-399
lines changed

9 files changed

+287
-399
lines changed

OWNERS_ALIASES

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ aliases:
7676
- fahlmant
7777
- dustman9000
7878
- wanghaoran1988
79+
sre-group-leads:
80+
- apahim
81+
- maorfr
82+
- rogbas
7983
srep-architects:
8084
- jewzaam
8185
- jharrington22
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a48d90919cb9a4fe3b4bbd51ac6ef71ea1b49ed6
1+
b5fef8ffb9b790d2d886bf522161a205f9ef043f

boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ aliases:
7676
- fahlmant
7777
- dustman9000
7878
- wanghaoran1988
79+
sre-group-leads:
80+
- apahim
81+
- maorfr
82+
- rogbas
7983
srep-architects:
8084
- jewzaam
8185
- jharrington22

build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY . .
88
RUN make go-build
99

1010
####
11-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1108
11+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1108.1705420507
1212

1313
ENV USER_UID=1001 \
1414
USER_NAME=managed-upgrade-operator

build/Dockerfile.olm-registry

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests
44
RUN initializer --permissive
55

66
# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
7-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1108
7+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1108.1705420507
88

99
COPY --from=builder /bin/registry-server /bin/registry-server
1010
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe

docs/development.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ This document should entail all you need to develop this operator locally.
2424

2525
### golang
2626

27-
A recent Go distribution (>=1.19) with enabled Go modules.
27+
A recent Go distribution (>=1.20) with enabled Go modules.
2828

2929
```shell
3030
$ go version
31-
go version go1.19.7 linux/amd64
31+
go version go1.20.13 linux/amd64
3232
```
3333

3434
### operator-sdk

go.mod

+78-76
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,124 @@
11
module github.com/openshift/managed-upgrade-operator
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/go-logr/logr v1.2.4
8-
github.com/go-openapi/runtime v0.25.0
9-
github.com/go-openapi/strfmt v0.21.3
10-
github.com/go-resty/resty/v2 v2.7.0
11-
github.com/golang/mock v1.5.0
12-
github.com/google/uuid v1.3.0
7+
github.com/go-logr/logr v1.4.1
8+
github.com/go-openapi/runtime v0.26.2
9+
github.com/go-openapi/strfmt v0.22.0
10+
github.com/go-resty/resty/v2 v2.11.0
11+
github.com/golang/mock v1.6.0
12+
github.com/google/uuid v1.5.0
1313
github.com/hashicorp/go-multierror v1.1.1
1414
github.com/jarcoal/httpmock v1.3.0
1515
github.com/jpillora/backoff v1.0.0
1616
github.com/onsi/ginkgo v1.16.5
17-
github.com/onsi/ginkgo/v2 v2.9.5
18-
github.com/onsi/gomega v1.27.7
19-
github.com/openshift/api v0.0.0-20230330150608-05635858d40f
20-
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
17+
github.com/onsi/ginkgo/v2 v2.14.0
18+
github.com/onsi/gomega v1.30.0
19+
github.com/openshift/api v0.0.0-20240118221011-59fa376de7cb
20+
github.com/openshift/client-go v0.0.0-20231218140158-47f6d749b9d9
2121
github.com/openshift/cluster-version-operator v1.0.1-0.20230322131514-c659e6ccaca7
22-
github.com/openshift/library-go v0.0.0-20230112164258-24668b1349e6
22+
github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c
2323
github.com/openshift/machine-config-operator v0.0.1-0.20230330142923-2832f049b3f4
2424
github.com/openshift/operator-custom-metrics v0.5.1
2525
github.com/openshift/osde2e-common v0.0.0-20230830054343-f487e353dac0
26-
github.com/operator-framework/operator-lib v0.9.0
27-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.64.0
28-
github.com/prometheus-operator/prometheus-operator/pkg/client v0.64.0
29-
github.com/prometheus/alertmanager v0.25.0
30-
github.com/prometheus/client_golang v1.15.1
26+
github.com/operator-framework/operator-lib v0.12.0
27+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.0
28+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.71.0
29+
github.com/prometheus/alertmanager v0.26.0
30+
github.com/prometheus/client_golang v1.18.0
3131
github.com/sykesm/zap-logfmt v0.0.4
32-
go.uber.org/zap v1.24.0
32+
go.uber.org/mock v0.4.0
33+
go.uber.org/zap v1.26.0
3334
gopkg.in/yaml.v2 v2.4.0
34-
k8s.io/api v0.27.2
35-
k8s.io/apimachinery v0.27.2
36-
k8s.io/client-go v0.27.2
37-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
38-
sigs.k8s.io/controller-runtime v0.15.0
39-
sigs.k8s.io/controller-tools v0.11.3
35+
k8s.io/api v0.29.1
36+
k8s.io/apimachinery v0.29.1
37+
k8s.io/client-go v0.29.1
38+
k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15
39+
sigs.k8s.io/controller-runtime v0.17.0
40+
sigs.k8s.io/controller-tools v0.14.0
4041
)
4142

4243
require (
43-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
44+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4445
github.com/beorn7/perks v1.0.1 // indirect
4546
github.com/cespare/xxhash/v2 v2.2.0 // indirect
46-
github.com/davecgh/go-spew v1.1.1 // indirect
47-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
48-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
49-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
50-
github.com/fatih/color v1.13.0 // indirect
51-
github.com/fsnotify/fsnotify v1.6.0 // indirect
47+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
48+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
49+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
50+
github.com/evanphx/json-patch/v5 v5.8.1 // indirect
51+
github.com/fatih/color v1.16.0 // indirect
52+
github.com/fsnotify/fsnotify v1.7.0 // indirect
5253
github.com/go-logr/stdr v1.2.2 // indirect
53-
github.com/go-logr/zapr v1.2.4 // indirect
54-
github.com/go-openapi/analysis v0.21.4 // indirect
55-
github.com/go-openapi/errors v0.20.3 // indirect
56-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
57-
github.com/go-openapi/jsonreference v0.20.2 // indirect
58-
github.com/go-openapi/loads v0.21.2 // indirect
59-
github.com/go-openapi/spec v0.20.7 // indirect
60-
github.com/go-openapi/swag v0.22.3 // indirect
61-
github.com/go-openapi/validate v0.22.0 // indirect
54+
github.com/go-logr/zapr v1.3.0 // indirect
55+
github.com/go-openapi/analysis v0.22.2 // indirect
56+
github.com/go-openapi/errors v0.21.0 // indirect
57+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
58+
github.com/go-openapi/jsonreference v0.20.4 // indirect
59+
github.com/go-openapi/loads v0.21.5 // indirect
60+
github.com/go-openapi/spec v0.20.14 // indirect
61+
github.com/go-openapi/swag v0.22.7 // indirect
62+
github.com/go-openapi/validate v0.22.6 // indirect
6263
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
63-
github.com/gobuffalo/flect v0.3.0 // indirect
64+
github.com/gobuffalo/flect v1.0.2 // indirect
6465
github.com/gogo/protobuf v1.3.2 // indirect
6566
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6667
github.com/golang/protobuf v1.5.3 // indirect
67-
github.com/google/gnostic v0.6.9 // indirect
68-
github.com/google/go-cmp v0.5.9 // indirect
68+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
69+
github.com/google/go-cmp v0.6.0 // indirect
6970
github.com/google/gofuzz v1.2.0 // indirect
70-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
71+
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
72+
github.com/gorilla/websocket v1.5.0 // indirect
7173
github.com/hashicorp/errwrap v1.1.0 // indirect
72-
github.com/imdario/mergo v0.3.13 // indirect
73-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
74+
github.com/imdario/mergo v0.3.16 // indirect
75+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7476
github.com/josharian/intern v1.0.0 // indirect
7577
github.com/json-iterator/go v1.1.12 // indirect
7678
github.com/mailru/easyjson v0.7.7 // indirect
7779
github.com/mattn/go-colorable v0.1.13 // indirect
78-
github.com/mattn/go-isatty v0.0.16 // indirect
79-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
80+
github.com/mattn/go-isatty v0.0.20 // indirect
8081
github.com/mitchellh/mapstructure v1.5.0 // indirect
8182
github.com/moby/spdystream v0.2.0 // indirect
8283
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8384
github.com/modern-go/reflect2 v1.0.2 // indirect
8485
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
85-
github.com/nxadm/tail v1.4.8 // indirect
86+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
87+
github.com/nxadm/tail v1.4.11 // indirect
8688
github.com/oklog/ulid v1.3.1 // indirect
8789
github.com/opentracing/opentracing-go v1.2.0 // indirect
8890
github.com/pkg/errors v0.9.1 // indirect
89-
github.com/prometheus/client_model v0.4.0 // indirect
90-
github.com/prometheus/common v0.43.0 // indirect
91-
github.com/prometheus/procfs v0.9.0 // indirect
92-
github.com/spf13/cobra v1.6.1 // indirect
91+
github.com/prometheus/client_model v0.5.0 // indirect
92+
github.com/prometheus/common v0.46.0 // indirect
93+
github.com/prometheus/procfs v0.12.0 // indirect
94+
github.com/spf13/cobra v1.8.0 // indirect
9395
github.com/spf13/pflag v1.0.5 // indirect
94-
go.mongodb.org/mongo-driver v1.11.1 // indirect
95-
go.opentelemetry.io/otel v1.11.1 // indirect
96-
go.opentelemetry.io/otel/trace v1.11.1 // indirect
97-
go.uber.org/atomic v1.10.0 // indirect
98-
go.uber.org/mock v0.3.0 // indirect
99-
go.uber.org/multierr v1.8.0 // indirect
100-
golang.org/x/mod v0.11.0 // indirect
101-
golang.org/x/net v0.10.0 // indirect
102-
golang.org/x/oauth2 v0.7.0 // indirect
103-
golang.org/x/sys v0.8.0 // indirect
104-
golang.org/x/term v0.8.0 // indirect
105-
golang.org/x/text v0.9.0 // indirect
106-
golang.org/x/time v0.3.0 // indirect
107-
golang.org/x/tools v0.9.1 // indirect
108-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
109-
google.golang.org/appengine v1.6.7 // indirect
110-
google.golang.org/protobuf v1.30.0 // indirect
96+
go.mongodb.org/mongo-driver v1.13.1 // indirect
97+
go.opentelemetry.io/otel v1.22.0 // indirect
98+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
99+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
100+
go.uber.org/multierr v1.11.0 // indirect
101+
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
102+
golang.org/x/mod v0.14.0 // indirect
103+
golang.org/x/net v0.20.0 // indirect
104+
golang.org/x/oauth2 v0.16.0 // indirect
105+
golang.org/x/sys v0.16.0 // indirect
106+
golang.org/x/term v0.16.0 // indirect
107+
golang.org/x/text v0.14.0 // indirect
108+
golang.org/x/time v0.5.0 // indirect
109+
golang.org/x/tools v0.17.0 // indirect
110+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
111+
google.golang.org/appengine v1.6.8 // indirect
112+
google.golang.org/protobuf v1.32.0 // indirect
111113
gopkg.in/inf.v0 v0.9.1 // indirect
112114
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
113115
gopkg.in/yaml.v3 v3.0.1 // indirect
114-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
115-
k8s.io/component-base v0.27.2 // indirect
116-
k8s.io/klog/v2 v2.90.1 // indirect
117-
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
116+
k8s.io/apiextensions-apiserver v0.29.1 // indirect
117+
k8s.io/component-base v0.29.1 // indirect
118+
k8s.io/klog/v2 v2.120.1 // indirect
119+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
118120
sigs.k8s.io/e2e-framework v0.2.0 // indirect
119121
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
120-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
121-
sigs.k8s.io/yaml v1.3.0 // indirect
122+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
123+
sigs.k8s.io/yaml v1.4.0 // indirect
122124
)

0 commit comments

Comments
 (0)