Skip to content

Commit 3d89b8a

Browse files
tmshorttmshort
committed
Update dependencies
Update k8s to v0.27.2 Update controller-runtime to v0.15.0 Update code to support new APIs Signed-off-by: Todd Short <[email protected]>
1 parent 4564b26 commit 3d89b8a

File tree

1,252 files changed

+61238
-33836
lines changed

Some content is hidden

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

1,252 files changed

+61238
-33836
lines changed

‎cmd/olm/manager.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"k8s.io/apimachinery/pkg/selection"
1111
ctrl "sigs.k8s.io/controller-runtime"
1212
"sigs.k8s.io/controller-runtime/pkg/cache"
13+
"sigs.k8s.io/controller-runtime/pkg/client"
1314
"sigs.k8s.io/controller-runtime/pkg/log/zap"
1415

1516
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -50,16 +51,16 @@ func Manager(ctx context.Context, debug bool) (ctrl.Manager, error) {
5051
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
5152
Scheme: scheme,
5253
MetricsBindAddress: "0", // TODO(njhale): Enable metrics on non-conflicting port (not 8080)
53-
NewCache: cache.BuilderWithOptions(cache.Options{
54-
SelectorsByObject: cache.SelectorsByObject{
54+
Cache: cache.Options{
55+
ByObject: map[client.Object]cache.ByObject{
5556
&corev1.Secret{}: {
5657
Label: labels.SelectorFromValidatedSet(map[string]string{install.OLMManagedLabelKey: install.OLMManagedLabelValue}),
5758
},
5859
&operatorsv1alpha1.ClusterServiceVersion{}: {
5960
Label: copiedLabelDoesNotExist,
6061
},
6162
},
62-
}),
63+
},
6364
})
6465
if err != nil {
6566
return nil, err

‎go.mod

+44-44
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/ghodss/yaml v1.0.0
1212
github.com/go-air/gini v1.0.4
1313
github.com/go-bindata/go-bindata/v3 v3.1.3
14-
github.com/go-logr/logr v1.2.3
14+
github.com/go-logr/logr v1.2.4
1515
github.com/golang/mock v1.6.0
1616
github.com/google/go-cmp v0.5.9
1717
github.com/googleapis/gnostic v0.5.5
@@ -20,38 +20,38 @@ 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.4.1
23-
github.com/onsi/ginkgo/v2 v2.6.0
24-
github.com/onsi/gomega v1.24.1
23+
github.com/onsi/ginkgo/v2 v2.9.5
24+
github.com/onsi/gomega v1.27.7
2525
github.com/openshift/api v3.9.0+incompatible
2626
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
2727
github.com/operator-framework/api v0.17.6
2828
github.com/operator-framework/operator-registry v1.17.5
2929
github.com/otiai10/copy v1.2.0
3030
github.com/pkg/errors v0.9.1
31-
github.com/prometheus/client_golang v1.14.0
32-
github.com/prometheus/client_model v0.3.0
33-
github.com/prometheus/common v0.37.0
31+
github.com/prometheus/client_golang v1.15.1
32+
github.com/prometheus/client_model v0.4.0
33+
github.com/prometheus/common v0.42.0
3434
github.com/sirupsen/logrus v1.9.0
3535
github.com/spf13/cobra v1.6.1
3636
github.com/spf13/pflag v1.0.5
3737
github.com/stretchr/testify v1.8.2
38-
golang.org/x/net v0.7.0
38+
golang.org/x/net v0.10.0
3939
golang.org/x/time v0.3.0
4040
google.golang.org/grpc v1.52.0
4141
gopkg.in/yaml.v2 v2.4.0
4242
helm.sh/helm/v3 v3.11.1
43-
k8s.io/api v0.26.1
44-
k8s.io/apiextensions-apiserver v0.26.1
45-
k8s.io/apimachinery v0.26.1
46-
k8s.io/apiserver v0.26.1
47-
k8s.io/client-go v0.26.1
48-
k8s.io/code-generator v0.26.1
49-
k8s.io/component-base v0.26.1
43+
k8s.io/api v0.27.2
44+
k8s.io/apiextensions-apiserver v0.27.2
45+
k8s.io/apimachinery v0.27.2
46+
k8s.io/apiserver v0.27.2
47+
k8s.io/client-go v0.27.2
48+
k8s.io/code-generator v0.27.2
49+
k8s.io/component-base v0.27.2
5050
k8s.io/klog v1.0.0
5151
k8s.io/kube-aggregator v0.25.3
52-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
53-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
54-
sigs.k8s.io/controller-runtime v0.14.5
52+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
53+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
54+
sigs.k8s.io/controller-runtime v0.15.0
5555
sigs.k8s.io/controller-tools v0.8.0
5656
sigs.k8s.io/kind v0.16.0
5757
)
@@ -77,13 +77,13 @@ require (
7777
github.com/beorn7/perks v1.0.1 // indirect
7878
github.com/blang/semver v3.5.1+incompatible // indirect
7979
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
80-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
80+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8181
github.com/chai2010/gettext-go v1.0.2 // indirect
8282
github.com/containerd/cgroups v1.0.4 // indirect
8383
github.com/containerd/containerd v1.6.18 // indirect
8484
github.com/containerd/continuity v0.3.0 // indirect
8585
github.com/containerd/ttrpc v1.1.0 // indirect
86-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
86+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
8787
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
8888
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
8989
github.com/docker/cli v20.10.21+incompatible // indirect
@@ -103,19 +103,19 @@ require (
103103
github.com/go-errors/errors v1.0.1 // indirect
104104
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
105105
github.com/go-logr/stdr v1.2.2 // indirect
106-
github.com/go-logr/zapr v1.2.3 // indirect
107-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
108-
github.com/go-openapi/jsonreference v0.20.0 // indirect
109-
github.com/go-openapi/swag v0.19.14 // indirect
110-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
106+
github.com/go-logr/zapr v1.2.4 // indirect
107+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
108+
github.com/go-openapi/jsonreference v0.20.1 // indirect
109+
github.com/go-openapi/swag v0.22.3 // indirect
110+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
111111
github.com/gobuffalo/flect v0.2.3 // indirect
112112
github.com/gobwas/glob v0.2.3 // indirect
113113
github.com/goccy/go-yaml v1.8.1 // indirect
114114
github.com/gofrs/flock v0.8.1 // indirect
115115
github.com/gogo/protobuf v1.3.2 // indirect
116116
github.com/golang-migrate/migrate/v4 v4.6.2 // indirect
117117
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
118-
github.com/golang/protobuf v1.5.2 // indirect
118+
github.com/golang/protobuf v1.5.3 // indirect
119119
github.com/google/btree v1.0.1 // indirect
120120
github.com/google/cel-go v0.12.6 // indirect
121121
github.com/google/gnostic v0.5.7-v3refs // indirect
@@ -145,7 +145,7 @@ require (
145145
github.com/lestrrat-go/strftime v1.0.1 // indirect
146146
github.com/lib/pq v1.10.7 // indirect
147147
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
148-
github.com/mailru/easyjson v0.7.6 // indirect
148+
github.com/mailru/easyjson v0.7.7 // indirect
149149
github.com/mattn/go-colorable v0.1.12 // indirect
150150
github.com/mattn/go-isatty v0.0.14 // indirect
151151
github.com/mattn/go-runewidth v0.0.9 // indirect
@@ -169,7 +169,7 @@ require (
169169
github.com/pelletier/go-toml v1.9.5 // indirect
170170
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
171171
github.com/pmezard/go-difflib v1.0.0 // indirect
172-
github.com/prometheus/procfs v0.8.0 // indirect
172+
github.com/prometheus/procfs v0.9.0 // indirect
173173
github.com/rubenv/sql-migrate v1.2.0 // indirect
174174
github.com/russross/blackfriday/v2 v2.1.0 // indirect
175175
github.com/shopspring/decimal v1.2.0 // indirect
@@ -180,12 +180,12 @@ require (
180180
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
181181
github.com/xlab/treeprint v1.1.0 // indirect
182182
go.etcd.io/bbolt v1.3.6 // indirect
183-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
184-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
185-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
183+
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
184+
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
185+
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
186186
go.opencensus.io v0.23.0 // indirect
187187
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
188-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
188+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
189189
go.opentelemetry.io/otel v1.12.0 // indirect
190190
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect
191191
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0 // indirect
@@ -200,31 +200,31 @@ require (
200200
go.uber.org/zap v1.24.0 // indirect
201201
golang.org/x/crypto v0.5.0 // indirect
202202
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
203-
golang.org/x/mod v0.6.0 // indirect
204-
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
205-
golang.org/x/sync v0.1.0 // indirect
206-
golang.org/x/sys v0.5.0 // indirect
207-
golang.org/x/term v0.5.0 // indirect
208-
golang.org/x/text v0.7.0 // indirect
209-
golang.org/x/tools v0.2.0 // indirect
203+
golang.org/x/mod v0.10.0 // indirect
204+
golang.org/x/oauth2 v0.5.0 // indirect
205+
golang.org/x/sync v0.2.0 // indirect
206+
golang.org/x/sys v0.8.0 // indirect
207+
golang.org/x/term v0.8.0 // indirect
208+
golang.org/x/text v0.9.0 // indirect
209+
golang.org/x/tools v0.9.1 // indirect
210210
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
211-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
211+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
212212
google.golang.org/appengine v1.6.7 // indirect
213213
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
214-
google.golang.org/protobuf v1.28.1 // indirect
214+
google.golang.org/protobuf v1.30.0 // indirect
215215
gopkg.in/inf.v0 v0.9.1 // indirect
216216
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
217217
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
218218
gopkg.in/yaml.v3 v3.0.1 // indirect
219219
k8s.io/cli-runtime v0.26.0 // indirect
220220
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
221-
k8s.io/klog/v2 v2.80.1 // indirect
222-
k8s.io/kms v0.26.1 // indirect
221+
k8s.io/klog/v2 v2.90.1 // indirect
222+
k8s.io/kms v0.27.2 // indirect
223223
k8s.io/kubectl v0.26.0 // indirect
224224
oras.land/oras-go v1.2.2 // indirect
225225
rsc.io/letsencrypt v0.0.3 // indirect
226-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
227-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
226+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
227+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
228228
sigs.k8s.io/kustomize/api v0.12.1 // indirect
229229
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
230230
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)