Skip to content

Commit 63b8c84

Browse files
lyarwoodlyarwood
committed
WIP chore: Update controller-runtime to v0.15.0
https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.15.0 * Make `*http.Client` configurable and use/share the same client by default kubernetes-sigs/controller-runtime#2122 * Remove dependency injection functions kubernetes-sigs/controller-runtime#2134, kubernetes-sigs/controller-runtime#2120 * Add context to EventHandler(s) kubernetes-sigs/controller-runtime#2139 * `Validator` and `CustomValidator` interfaces have been modified to allow returning warnings kubernetes-sigs/controller-runtime#2014 * operator-framework is also pinned to ecb9be48837 until a new release is cut supporting controller-runtime v0.15.0 Signed-off-by: Lee Yarwood <[email protected]>
1 parent b376a3f commit 63b8c84

File tree

296 files changed

+9592
-7187
lines changed

Some content is hidden

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

296 files changed

+9592
-7187
lines changed

‎Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,3 @@ GOLANGCI_LINT_VERSION ?= v1.51.1
320320
.PHONY: lint
321321
lint:
322322
test -s $(GOLANGCI_LINT) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(LOCALBIN) $(GOLANGCI_LINT_VERSION)
323-
$(GOLANGCI_LINT) run --timeout 5m

‎controllers/ssp_controller.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import (
4343
"sigs.k8s.io/controller-runtime/pkg/handler"
4444
"sigs.k8s.io/controller-runtime/pkg/predicate"
4545
"sigs.k8s.io/controller-runtime/pkg/reconcile"
46-
"sigs.k8s.io/controller-runtime/pkg/source"
4746

4847
ssp "kubevirt.io/ssp-operator/api/v1beta2"
4948
"kubevirt.io/ssp-operator/internal/common"
@@ -724,10 +723,7 @@ func watchSspResource(bldr *ctrl.Builder) {
724723
func watchNamespacedResources(builder *ctrl.Builder, crdList crd_watch.CrdList, sspOperands []operands.Operand, eventHandlerHook handler_hook.HookFunc) {
725724
watchResources(builder,
726725
crdList,
727-
&handler.EnqueueRequestForOwner{
728-
IsController: true,
729-
OwnerType: &ssp.SSP{},
730-
},
726+
handler.EnqueueRequestForOwner(common.Scheme, nil, &ssp.SSP{}, handler.OnlyControllerOwner()),
731727
sspOperands,
732728
operands.Operand.WatchTypes,
733729
eventHandlerHook,
@@ -776,7 +772,7 @@ func watchResources(ctrlBuilder *ctrl.Builder, crdList crd_watch.CrdList, handle
776772
}
777773

778774
ctrlBuilder.Watches(
779-
&source.Kind{Type: watchType.Object},
775+
watchType.Object,
780776
handler_hook.New(handler, hookFunc),
781777
builder.WithPredicates(predicates...),
782778
)

‎go.mod

+21-21
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/fsnotify/fsnotify v1.6.0
88
github.com/go-logr/logr v1.2.4
9-
github.com/onsi/ginkgo/v2 v2.9.1
10-
github.com/onsi/gomega v1.27.4
9+
github.com/onsi/ginkgo/v2 v2.9.5
10+
github.com/onsi/gomega v1.27.7
1111
github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183 // release-4.13
1212
github.com/openshift/custom-resource-status v1.1.2
1313
github.com/openshift/library-go v0.0.0-20230228181805-0899dfdba7d2 // release-4.13
14-
github.com/operator-framework/api v0.17.3
15-
github.com/operator-framework/operator-lib v0.11.0
14+
github.com/operator-framework/api v0.17.4-0.20230223191600-0131a6301e42
15+
github.com/operator-framework/operator-lib v0.11.1-0.20230607132417-ecb9be488378
1616
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.63.0
17-
github.com/prometheus/client_golang v1.14.0
18-
github.com/prometheus/client_model v0.3.0
19-
github.com/prometheus/common v0.41.0
17+
github.com/prometheus/client_golang v1.15.1
18+
github.com/prometheus/client_model v0.4.0
19+
github.com/prometheus/common v0.42.0
2020
github.com/spf13/cobra v1.6.1
2121
github.com/spf13/pflag v1.0.5
2222
github.com/tektoncd/pipeline v0.41.2
23-
gomodules.xyz/jsonpatch/v2 v2.2.0
23+
gomodules.xyz/jsonpatch/v2 v2.3.0
2424
k8s.io/api v0.27.3
2525
k8s.io/apiextensions-apiserver v0.27.3
2626
k8s.io/apimachinery v0.27.3
@@ -32,7 +32,7 @@ require (
3232
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4
3333
kubevirt.io/qe-tools v0.1.8
3434
kubevirt.io/ssp-operator/api v0.0.0
35-
sigs.k8s.io/controller-runtime v0.14.5
35+
sigs.k8s.io/controller-runtime v0.15.0
3636
sigs.k8s.io/kustomize/api v0.13.1
3737
sigs.k8s.io/kustomize/kyaml v0.14.0
3838
sigs.k8s.io/yaml v1.3.0
@@ -44,27 +44,27 @@ require (
4444
github.com/beorn7/perks v1.0.1 // indirect
4545
github.com/blendle/zapdriver v1.3.1 // indirect
4646
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
47-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
47+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4848
github.com/davecgh/go-spew v1.1.1 // indirect
4949
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
5050
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
5151
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5252
github.com/go-errors/errors v1.4.2 // indirect
5353
github.com/go-kit/log v0.2.1 // indirect
5454
github.com/go-logfmt/logfmt v0.5.1 // indirect
55-
github.com/go-logr/zapr v1.2.3 // indirect
55+
github.com/go-logr/zapr v1.2.4 // indirect
5656
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5757
github.com/go-openapi/jsonreference v0.20.1 // indirect
5858
github.com/go-openapi/swag v0.22.3 // indirect
59-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
59+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6060
github.com/gogo/protobuf v1.3.2 // indirect
6161
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6262
github.com/golang/protobuf v1.5.3 // indirect
6363
github.com/google/gnostic v0.5.7-v3refs // indirect
6464
github.com/google/go-cmp v0.5.9 // indirect
6565
github.com/google/go-containerregistry v0.12.0 // indirect
6666
github.com/google/gofuzz v1.2.0 // indirect
67-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
67+
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
6868
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6969
github.com/google/uuid v1.3.0 // indirect
7070
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
@@ -86,7 +86,7 @@ require (
8686
github.com/opencontainers/go-digest v1.0.0 // indirect
8787
github.com/pborman/uuid v1.2.1 // indirect
8888
github.com/pkg/errors v0.9.1 // indirect
89-
github.com/prometheus/procfs v0.8.0 // indirect
89+
github.com/prometheus/procfs v0.9.0 // indirect
9090
github.com/prometheus/statsd_exporter v0.21.0 // indirect
9191
github.com/sirupsen/logrus v1.9.0 // indirect
9292
github.com/xlab/treeprint v1.1.0 // indirect
@@ -95,19 +95,19 @@ require (
9595
go.uber.org/atomic v1.10.0 // indirect
9696
go.uber.org/multierr v1.8.0 // indirect
9797
go.uber.org/zap v1.24.0 // indirect
98-
golang.org/x/net v0.8.0 // indirect
98+
golang.org/x/net v0.10.0 // indirect
9999
golang.org/x/oauth2 v0.5.0 // indirect
100-
golang.org/x/sync v0.1.0 // indirect
101-
golang.org/x/sys v0.6.0 // indirect
102-
golang.org/x/term v0.6.0 // indirect
103-
golang.org/x/text v0.8.0 // indirect
100+
golang.org/x/sync v0.2.0 // indirect
101+
golang.org/x/sys v0.8.0 // indirect
102+
golang.org/x/term v0.8.0 // indirect
103+
golang.org/x/text v0.9.0 // indirect
104104
golang.org/x/time v0.3.0 // indirect
105-
golang.org/x/tools v0.7.0 // indirect
105+
golang.org/x/tools v0.9.1 // indirect
106106
google.golang.org/api v0.100.0 // indirect
107107
google.golang.org/appengine v1.6.7 // indirect
108108
google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a // indirect
109109
google.golang.org/grpc v1.51.0 // indirect
110-
google.golang.org/protobuf v1.28.1 // indirect
110+
google.golang.org/protobuf v1.30.0 // indirect
111111
gopkg.in/inf.v0 v0.9.1 // indirect
112112
gopkg.in/yaml.v2 v2.4.0 // indirect
113113
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)