Skip to content

Commit 134ccee

Browse files
tmshorttmshort
authored
Update to k8s v0.28.5 and other operator-framework components (#3155)
* Update k8s to v0.28.5 This also updates to the latest operator-framework api and operator-registry kind is still at v0.20.0 (k8s 1.27.3) as it's the latest version Signed-off-by: Todd Short <[email protected]> * Update code for k8s v0.28.5 compatibility Fix unit-tests as well Signed-off-by: Todd Short <[email protected]> * Update codegen Hack `scripts/update_codegen.sh` script to continue to generate code using the deprecated scripts. The deprecated scripts now call into each other, and unfortunately, `go mod vendor` doesn't keep permission bits around. So, we need to update the execute permissions on a vendored script. The new `kube_codegen.sh` doesn't work when the repository path is outside the package name, see: https://github.com/kubernetes/code-generator/issues/165 The workaround is to create symlinked directories to fool `kube_codegen.sh` into thinking the path is correct. But first we'd have to start using the new script. Once `kube_codegen.sh` is fixed, we should migrate to it (which is a non-trivial task). Signed-off-by: Todd Short <[email protected]> --------- Signed-off-by: Todd Short <[email protected]>
1 parent 5299830 commit 134ccee

File tree

790 files changed

+53940
-21472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

790 files changed

+53940
-21472
lines changed

‎cmd/olm/manager.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"sigs.k8s.io/controller-runtime/pkg/cache"
1818
"sigs.k8s.io/controller-runtime/pkg/client"
1919
"sigs.k8s.io/controller-runtime/pkg/log/zap"
20+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2021

2122
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
2223
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
@@ -54,8 +55,8 @@ func Manager(ctx context.Context, debug bool) (ctrl.Manager, error) {
5455

5556
setupLog.Info("configuring manager")
5657
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
57-
Scheme: scheme,
58-
MetricsBindAddress: "0", // TODO(njhale): Enable metrics on non-conflicting port (not 8080)
58+
Scheme: scheme,
59+
Metrics: metricsserver.Options{BindAddress: "0"},
5960
Cache: cache.Options{
6061
ByObject: map[client.Object]cache.ByObject{
6162
&appsv1.Deployment{}: {

‎deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 18 additions & 9 deletions
Large diffs are not rendered by default.

‎go.mod

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.20
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/coreos/go-semver v0.3.0
7+
github.com/coreos/go-semver v0.3.1
88
github.com/distribution/distribution v2.7.1+incompatible
99
github.com/evanphx/json-patch v5.6.0+incompatible
1010
github.com/fsnotify/fsnotify v1.6.0
@@ -20,39 +20,39 @@ require (
2020
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
2121
github.com/mitchellh/hashstructure v1.0.0
2222
github.com/mitchellh/mapstructure v1.5.0
23-
github.com/onsi/ginkgo/v2 v2.12.0
24-
github.com/onsi/gomega v1.27.10
23+
github.com/onsi/ginkgo/v2 v2.13.2
24+
github.com/onsi/gomega v1.29.0
2525
github.com/openshift/api v3.9.0+incompatible
2626
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
27-
github.com/operator-framework/api v0.20.0
28-
github.com/operator-framework/operator-registry v1.33.0
29-
github.com/otiai10/copy v1.12.0
27+
github.com/operator-framework/api v0.21.0
28+
github.com/operator-framework/operator-registry v1.35.0
29+
github.com/otiai10/copy v1.14.0
3030
github.com/pkg/errors v0.9.1
31-
github.com/prometheus/client_golang v1.15.1
31+
github.com/prometheus/client_golang v1.16.0
3232
github.com/prometheus/client_model v0.4.0
33-
github.com/prometheus/common v0.42.0
33+
github.com/prometheus/common v0.44.0
3434
github.com/sirupsen/logrus v1.9.3
3535
github.com/spf13/cobra v1.7.0
3636
github.com/spf13/pflag v1.0.5
3737
github.com/stretchr/testify v1.8.4
38-
golang.org/x/net v0.17.0
39-
golang.org/x/sync v0.4.0
38+
golang.org/x/net v0.20.0
39+
golang.org/x/sync v0.5.0
4040
golang.org/x/time v0.3.0
4141
google.golang.org/grpc v1.60.1
4242
gopkg.in/yaml.v2 v2.4.0
4343
helm.sh/helm/v3 v3.12.2
44-
k8s.io/api v0.27.7
45-
k8s.io/apiextensions-apiserver v0.27.7
46-
k8s.io/apimachinery v0.27.7
47-
k8s.io/apiserver v0.27.7
48-
k8s.io/client-go v0.27.7
49-
k8s.io/code-generator v0.27.7
50-
k8s.io/component-base v0.27.7
44+
k8s.io/api v0.28.5
45+
k8s.io/apiextensions-apiserver v0.28.5
46+
k8s.io/apimachinery v0.28.5
47+
k8s.io/apiserver v0.28.5
48+
k8s.io/client-go v0.28.5
49+
k8s.io/code-generator v0.28.5
50+
k8s.io/component-base v0.28.5
5151
k8s.io/klog v1.0.0
52-
k8s.io/kube-aggregator v0.25.3
53-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
54-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
55-
sigs.k8s.io/controller-runtime v0.15.0
52+
k8s.io/kube-aggregator v0.28.5
53+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
54+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
55+
sigs.k8s.io/controller-runtime v0.16.3
5656
sigs.k8s.io/controller-tools v0.8.0
5757
sigs.k8s.io/kind v0.20.0
5858
)
@@ -94,17 +94,17 @@ require (
9494
github.com/davecgh/go-spew v1.1.1 // indirect
9595
github.com/docker/cli v24.0.6+incompatible // indirect
9696
github.com/docker/distribution v2.8.2+incompatible // indirect
97-
github.com/docker/docker v24.0.6+incompatible // indirect
97+
github.com/docker/docker v24.0.7+incompatible // indirect
9898
github.com/docker/docker-credential-helpers v0.8.0 // indirect
9999
github.com/docker/go-connections v0.4.0 // indirect
100100
github.com/docker/go-metrics v0.0.1 // indirect
101101
github.com/docker/go-units v0.5.0 // indirect
102-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
102+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
103103
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
104104
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
105105
github.com/fatih/color v1.15.0 // indirect
106106
github.com/felixge/httpsnoop v1.0.3 // indirect
107-
github.com/fvbommel/sortorder v1.0.1 // indirect
107+
github.com/fvbommel/sortorder v1.1.0 // indirect
108108
github.com/go-errors/errors v1.4.2 // indirect
109109
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
110110
github.com/go-logr/stdr v1.2.2 // indirect
@@ -118,23 +118,23 @@ require (
118118
github.com/goccy/go-yaml v1.8.1 // indirect
119119
github.com/gofrs/flock v0.8.1 // indirect
120120
github.com/gogo/protobuf v1.3.2 // indirect
121-
github.com/golang-migrate/migrate/v4 v4.16.1 // indirect
121+
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
122122
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
123123
github.com/golang/protobuf v1.5.3 // indirect
124124
github.com/google/btree v1.0.1 // indirect
125-
github.com/google/cel-go v0.15.3 // indirect
126-
github.com/google/gnostic v0.5.7-v3refs // indirect
125+
github.com/google/cel-go v0.16.1 // indirect
126+
github.com/google/gnostic-models v0.6.8 // indirect
127127
github.com/google/gofuzz v1.2.0 // indirect
128128
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
129129
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
130130
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
131-
github.com/google/uuid v1.3.1 // indirect
131+
github.com/google/uuid v1.4.0 // indirect
132132
github.com/gorilla/mux v1.8.0 // indirect
133133
github.com/gosuri/uitable v0.0.4 // indirect
134134
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
135135
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
136136
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
137-
github.com/h2non/filetype v1.1.1 // indirect
137+
github.com/h2non/filetype v1.1.3 // indirect
138138
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
139139
github.com/hashicorp/errwrap v1.1.0 // indirect
140140
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -158,10 +158,10 @@ require (
158158
github.com/mattn/go-colorable v0.1.13 // indirect
159159
github.com/mattn/go-isatty v0.0.17 // indirect
160160
github.com/mattn/go-runewidth v0.0.15 // indirect
161-
github.com/mattn/go-sqlite3 v1.14.17 // indirect
161+
github.com/mattn/go-sqlite3 v1.14.19 // indirect
162162
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
163163
github.com/mitchellh/copystructure v1.2.0 // indirect
164-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
164+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
165165
github.com/mitchellh/reflectwalk v1.0.2 // indirect
166166
github.com/moby/locker v1.0.1 // indirect
167167
github.com/moby/spdystream v0.2.0 // indirect
@@ -181,7 +181,7 @@ require (
181181
github.com/pelletier/go-toml v1.9.5 // indirect
182182
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
183183
github.com/pmezard/go-difflib v1.0.0 // indirect
184-
github.com/prometheus/procfs v0.9.0 // indirect
184+
github.com/prometheus/procfs v0.10.1 // indirect
185185
github.com/rivo/uniseg v0.4.4 // indirect
186186
github.com/rubenv/sql-migrate v1.3.1 // indirect
187187
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -194,11 +194,11 @@ require (
194194
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
195195
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
196196
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
197-
github.com/xlab/treeprint v1.1.0 // indirect
198-
go.etcd.io/bbolt v1.3.7 // indirect
199-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
200-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
201-
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
197+
github.com/xlab/treeprint v1.2.0 // indirect
198+
go.etcd.io/bbolt v1.3.8 // indirect
199+
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
200+
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
201+
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
202202
go.opencensus.io v0.24.0 // indirect
203203
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
204204
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
@@ -209,43 +209,42 @@ require (
209209
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
210210
go.opentelemetry.io/otel/trace v1.20.0 // indirect
211211
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
212-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
213-
go.uber.org/atomic v1.7.0 // indirect
214-
go.uber.org/multierr v1.6.0 // indirect
215-
go.uber.org/zap v1.24.0 // indirect
216-
golang.org/x/crypto v0.17.0 // indirect
212+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
213+
go.uber.org/multierr v1.11.0 // indirect
214+
go.uber.org/zap v1.25.0 // indirect
215+
golang.org/x/crypto v0.18.0 // indirect
217216
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
218217
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
219-
golang.org/x/mod v0.12.0 // indirect
220-
golang.org/x/oauth2 v0.13.0 // indirect
221-
golang.org/x/sys v0.15.0 // indirect
222-
golang.org/x/term v0.15.0 // indirect
218+
golang.org/x/mod v0.14.0 // indirect
219+
golang.org/x/oauth2 v0.14.0 // indirect
220+
golang.org/x/sys v0.16.0 // indirect
221+
golang.org/x/term v0.16.0 // indirect
223222
golang.org/x/text v0.14.0 // indirect
224-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
223+
golang.org/x/tools v0.16.1 // indirect
225224
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
226-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
225+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
227226
google.golang.org/appengine v1.6.8 // indirect
228-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
229-
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
230-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
227+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
228+
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
229+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
231230
google.golang.org/protobuf v1.31.0 // indirect
232231
gopkg.in/inf.v0 v0.9.1 // indirect
233-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
232+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
234233
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
235234
gopkg.in/yaml.v3 v3.0.1 // indirect
236-
k8s.io/cli-runtime v0.27.7 // indirect
235+
k8s.io/cli-runtime v0.28.5 // indirect
237236
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
238-
k8s.io/klog/v2 v2.90.1 // indirect
239-
k8s.io/kms v0.27.7 // indirect
240-
k8s.io/kubectl v0.27.7 // indirect
237+
k8s.io/klog/v2 v2.100.1 // indirect
238+
k8s.io/kms v0.28.5 // indirect
239+
k8s.io/kubectl v0.28.5 // indirect
241240
oras.land/oras-go v1.2.4 // indirect
242241
rsc.io/letsencrypt v0.0.3 // indirect
243242
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
244243
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
245-
sigs.k8s.io/kustomize/api v0.13.2 // indirect
246-
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
244+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
245+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
247246
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
248-
sigs.k8s.io/yaml v1.3.0 // indirect
247+
sigs.k8s.io/yaml v1.4.0 // indirect
249248
)
250249

251250
replace (

0 commit comments

Comments
 (0)