Skip to content

Commit 1561059

Browse files
Merge pull request #651 from bshephar/controller-runtime-update
Update controller-runtime and dependencies
2 parents b11d885 + ce810eb commit 1561059

18 files changed

+692
-830
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: tools
33
namespace: openstack-k8s-operators
4-
tag: ci-build-root-golang-1.19-sdk-1.31
4+
tag: ci-build-root-golang-1.20-sdk-1.31

.github/workflows/build-openstack-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main
1616
with:
1717
operator_name: openstack
18-
go_version: 1.19.x
18+
go_version: 1.20.x
1919
operator_sdk_version: 1.31.0
2020
bundle_dockerfile: ./custom-bundle.Dockerfile
2121
catalog_extra_bundles_script: ./hack/pin-bundle-images.sh

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG_BUILDER=golang:1.19
1+
ARG GOLANG_BUILDER=golang:1.20
22
ARG OPERATOR_BASE_IMAGE=gcr.io/distroless/static:nonroot
33

44
# Build the manager binary
@@ -47,12 +47,12 @@ ARG IMAGE_TAGS="cn-openstack openstack"
4747

4848
# Labels required by upstream and osbs build system
4949
LABEL com.redhat.component="${IMAGE_COMPONENT}" \
50-
name="${IMAGE_NAME}" \
51-
version="${IMAGE_VERSION}" \
52-
summary="${IMAGE_SUMMARY}" \
53-
io.k8s.name="${IMAGE_NAME}" \
54-
io.k8s.description="${IMAGE_DESC}" \
55-
io.openshift.tags="${IMAGE_TAGS}"
50+
name="${IMAGE_NAME}" \
51+
version="${IMAGE_VERSION}" \
52+
summary="${IMAGE_SUMMARY}" \
53+
io.k8s.name="${IMAGE_NAME}" \
54+
io.k8s.description="${IMAGE_DESC}" \
55+
io.openshift.tags="${IMAGE_TAGS}"
5656
### DO NOT EDIT LINES ABOVE
5757

5858
ENV USER_UID=$USER_ID

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OPERATOR_SDK_VERSION ?= v1.31.0
5454
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/openstack-operator:latest
5555
IMG ?= $(DEFAULT_IMG)
5656
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
57-
ENVTEST_K8S_VERSION = 1.25.0
57+
ENVTEST_K8S_VERSION = 1.28.0
5858

5959
CRDDESC_OVERRIDE ?= :maxDescLen=0
6060

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 115 additions & 56 deletions
Large diffs are not rendered by default.

apis/client/v1beta1/openstackclient_webhook.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
ctrl "sigs.k8s.io/controller-runtime"
2525
logf "sigs.k8s.io/controller-runtime/pkg/log"
2626
"sigs.k8s.io/controller-runtime/pkg/webhook"
27+
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2728
)
2829

2930
// OpenStackClientDefaults -
@@ -73,25 +74,25 @@ func (spec *OpenStackClientSpec) Default() {
7374
var _ webhook.Validator = &OpenStackClient{}
7475

7576
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
76-
func (r *OpenStackClient) ValidateCreate() error {
77+
func (r *OpenStackClient) ValidateCreate() (admission.Warnings, error) {
7778
openstackclientlog.Info("validate create", "name", r.Name)
7879

7980
// TODO(user): fill in your validation logic upon object creation.
80-
return nil
81+
return nil, nil
8182
}
8283

8384
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
84-
func (r *OpenStackClient) ValidateUpdate(old runtime.Object) error {
85+
func (r *OpenStackClient) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
8586
openstackclientlog.Info("validate update", "name", r.Name)
8687

8788
// TODO(user): fill in your validation logic upon object update.
88-
return nil
89+
return nil, nil
8990
}
9091

9192
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type
92-
func (r *OpenStackClient) ValidateDelete() error {
93+
func (r *OpenStackClient) ValidateDelete() (admission.Warnings, error) {
9394
openstackclientlog.Info("validate delete", "name", r.Name)
9495

9596
// TODO(user): fill in your validation logic upon object deletion.
96-
return nil
97+
return nil, nil
9798
}

apis/client/v1beta1/webhook_suite_test.go

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import (
2626
. "github.com/onsi/gomega"
2727

2828
admissionv1beta1 "k8s.io/api/admission/v1beta1"
29+
kscheme "k8s.io/client-go/kubernetes/scheme"
30+
2931
//+kubebuilder:scaffold:imports
3032
"k8s.io/apimachinery/pkg/runtime"
3133
"k8s.io/client-go/rest"
@@ -34,16 +36,21 @@ import (
3436
"sigs.k8s.io/controller-runtime/pkg/envtest"
3537
logf "sigs.k8s.io/controller-runtime/pkg/log"
3638
"sigs.k8s.io/controller-runtime/pkg/log/zap"
39+
"sigs.k8s.io/controller-runtime/pkg/webhook"
40+
41+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3742
)
3843

3944
// These tests use Ginkgo (BDD-style Go testing framework). Refer to
4045
// http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
4146

42-
var cfg *rest.Config
43-
var k8sClient client.Client
44-
var testEnv *envtest.Environment
45-
var ctx context.Context
46-
var cancel context.CancelFunc
47+
var (
48+
cfg *rest.Config
49+
k8sClient client.Client
50+
testEnv *envtest.Environment
51+
ctx context.Context
52+
cancel context.CancelFunc
53+
)
4754

4855
func TestAPIs(t *testing.T) {
4956
RegisterFailHandler(Fail)
@@ -87,12 +94,20 @@ var _ = BeforeSuite(func() {
8794
// start webhook server using Manager
8895
webhookInstallOptions := &testEnv.WebhookInstallOptions
8996
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
90-
Scheme: scheme,
91-
Host: webhookInstallOptions.LocalServingHost,
92-
Port: webhookInstallOptions.LocalServingPort,
93-
CertDir: webhookInstallOptions.LocalServingCertDir,
94-
LeaderElection: false,
95-
MetricsBindAddress: "0",
97+
Scheme: kscheme.Scheme,
98+
// NOTE(gibi): disable metrics reporting in test to allow
99+
// parallel test execution. Otherwise each instance would like to
100+
// bind to the same port
101+
Metrics: metricsserver.Options{
102+
BindAddress: "0",
103+
},
104+
WebhookServer: webhook.NewServer(
105+
webhook.Options{
106+
Host: webhookInstallOptions.LocalServingHost,
107+
Port: webhookInstallOptions.LocalServingPort,
108+
CertDir: webhookInstallOptions.LocalServingCertDir,
109+
}),
110+
LeaderElection: false,
96111
})
97112
Expect(err).NotTo(HaveOccurred())
98113

@@ -118,7 +133,6 @@ var _ = BeforeSuite(func() {
118133
conn.Close()
119134
return nil
120135
}).Should(Succeed())
121-
122136
})
123137

124138
var _ = AfterSuite(func() {

apis/core/v1beta1/openstackcontrolplane_webhook.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
ctrl "sigs.k8s.io/controller-runtime"
2727
logf "sigs.k8s.io/controller-runtime/pkg/log"
2828
"sigs.k8s.io/controller-runtime/pkg/webhook"
29+
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2930
)
3031

3132
// OpenStackControlPlaneDefaults -
@@ -56,7 +57,7 @@ func (r *OpenStackControlPlane) SetupWebhookWithManager(mgr ctrl.Manager) error
5657
var _ webhook.Validator = &OpenStackControlPlane{}
5758

5859
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
59-
func (r *OpenStackControlPlane) ValidateCreate() error {
60+
func (r *OpenStackControlPlane) ValidateCreate() (admission.Warnings, error) {
6061
openstackcontrolplanelog.Info("validate create", "name", r.Name)
6162

6263
var allErrs field.ErrorList
@@ -66,21 +67,21 @@ func (r *OpenStackControlPlane) ValidateCreate() error {
6667
}
6768

6869
if len(allErrs) != 0 {
69-
return apierrors.NewInvalid(
70+
return nil, apierrors.NewInvalid(
7071
schema.GroupKind{Group: "core.openstack.org", Kind: "OpenStackControlPlane"},
7172
r.Name, allErrs)
7273
}
7374

74-
return nil
75+
return nil, nil
7576
}
7677

7778
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
78-
func (r *OpenStackControlPlane) ValidateUpdate(old runtime.Object) error {
79+
func (r *OpenStackControlPlane) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
7980
openstackcontrolplanelog.Info("validate update", "name", r.Name)
8081

8182
oldControlPlane, ok := old.(*OpenStackControlPlane)
8283
if !ok || oldControlPlane == nil {
83-
return apierrors.NewInternalError(fmt.Errorf("unable to convert existing object"))
84+
return nil, apierrors.NewInternalError(fmt.Errorf("unable to convert existing object"))
8485
}
8586

8687
var allErrs field.ErrorList
@@ -90,24 +91,23 @@ func (r *OpenStackControlPlane) ValidateUpdate(old runtime.Object) error {
9091
}
9192

9293
if len(allErrs) != 0 {
93-
return apierrors.NewInvalid(
94+
return nil, apierrors.NewInvalid(
9495
schema.GroupKind{Group: "core.openstack.org", Kind: "OpenStackControlPlane"},
9596
r.Name, allErrs)
9697
}
9798

98-
return nil
99+
return nil, nil
99100
}
100101

101102
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type
102-
func (r *OpenStackControlPlane) ValidateDelete() error {
103+
func (r *OpenStackControlPlane) ValidateDelete() (admission.Warnings, error) {
103104
openstackcontrolplanelog.Info("validate delete", "name", r.Name)
104105

105-
return nil
106+
return nil, nil
106107
}
107108

108109
// checkDepsEnabled - returns a non-empty string if required services are missing (disabled) for "name" service
109110
func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {
110-
111111
// "msg" will hold any dependency validation error we might find
112112
msg := ""
113113
// "reqs" will be set to the required services for "name" service

apis/go.mod

Lines changed: 55 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,104 @@
11
module github.com/openstack-k8s-operators/openstack-operator/apis
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/onsi/ginkgo/v2 v2.14.0
77
github.com/onsi/gomega v1.30.0
8-
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240205082437-655a181feae0
9-
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240207124115-6572d1bc92c9
10-
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240205082155-620a93388acf
11-
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240206110918-d3646fda9535
12-
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240205114610-35cd4930ad3b
13-
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240205092507-ddc6aa0dcf47
14-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240205163532-e4efedde5776
15-
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240202131833-8b6a4ca3bdc5
16-
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240202140528-34883c60812b
17-
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240129151020-c9467a8fbbfc
18-
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240212073017-91c953f42846
19-
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240201121152-3dcb5d5b24f7
20-
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240205081907-ca38cd1c0fd7
21-
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240206080218-0a39e8ee1c07
22-
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240205082155-fca054830e06
23-
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240206110402-41e2d7f8870e
24-
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240209144511-533e51daa424
25-
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240206105420-de58be701128
26-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240205163246-3add3edb159c
8+
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240215104355-15c0bf58484e
9+
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240215104410-018f30fae19d
10+
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240215100610-bb5d6ca25ab6
11+
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240215100236-2171e1054c96
12+
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240215094429-f61fb5c56095
13+
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240215094438-6ce4220335c2
14+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240214153927-179defb96a33
15+
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240215100551-d4f47335d87e
16+
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240215143819-e3820696d660
17+
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240214144842-5dcac51e5b36
18+
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240215104417-c6d1b337f267
19+
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240215091212-cbf2ad281f43
20+
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240215104837-f2f7715f20b4
21+
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240215094959-ae7ad704ab84
22+
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240215100511-492a87cdffa3
23+
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240215101225-3b8e40e6879d
24+
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240215095019-608567b1a0f1
25+
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240215100245-513a47c8f96f
26+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240215101232-18efcbf25ef5
2727
github.com/rabbitmq/cluster-operator/v2 v2.5.0
28-
k8s.io/apimachinery v0.27.7
29-
sigs.k8s.io/controller-runtime v0.15.1
28+
k8s.io/apimachinery v0.28.6
29+
sigs.k8s.io/controller-runtime v0.16.4
3030
)
3131

3232
require (
33-
github.com/go-logr/zapr v1.2.4 // indirect
33+
github.com/go-logr/zapr v1.3.0 // indirect
3434
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
35+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
3536
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
37+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3638
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 // indirect
3739
github.com/rhobs/observability-operator v0.0.20 // indirect
3840
go.uber.org/multierr v1.11.0 // indirect
3941
go.uber.org/zap v1.26.0 // indirect
40-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
41-
golang.org/x/tools v0.17.0 // indirect
42+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
43+
golang.org/x/tools v0.18.0 // indirect
4244
)
4345

4446
require (
4547
github.com/beorn7/perks v1.0.1 // indirect
4648
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4749
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
48-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
49-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
50-
github.com/fsnotify/fsnotify v1.6.0 // indirect
50+
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
51+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
52+
github.com/fsnotify/fsnotify v1.7.0 // indirect
5153
github.com/go-logr/logr v1.4.1 // indirect
52-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
53-
github.com/go-openapi/jsonreference v0.20.2 // indirect
54-
github.com/go-openapi/swag v0.22.4 // indirect
54+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
55+
github.com/go-openapi/jsonreference v0.20.4 // indirect
56+
github.com/go-openapi/swag v0.22.9 // indirect
5557
github.com/gogo/protobuf v1.3.2 // indirect
5658
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5759
github.com/golang/protobuf v1.5.3 // indirect
58-
github.com/google/gnostic v0.6.9 // indirect
5960
github.com/google/go-cmp v0.6.0 // indirect
6061
github.com/google/gofuzz v1.2.0 // indirect
6162
github.com/google/uuid v1.6.0 // indirect
62-
github.com/gophercloud/gophercloud v1.8.0 // indirect
63+
github.com/gophercloud/gophercloud v1.9.0 // indirect
6364
github.com/imdario/mergo v0.3.16 // indirect
6465
github.com/josharian/intern v1.0.0 // indirect
6566
github.com/json-iterator/go v1.1.12 // indirect
6667
github.com/mailru/easyjson v0.7.7 // indirect
67-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6868
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6969
github.com/modern-go/reflect2 v1.0.2 // indirect
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7171
github.com/openshift/api v3.9.0+incompatible // indirect
72-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240129151020-c9467a8fbbfc //indirect
73-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240129151020-c9467a8fbbfc
72+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240214144842-5dcac51e5b36 //indirect
73+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240214144842-5dcac51e5b36
7474
github.com/pkg/errors v0.9.1 // indirect
75-
github.com/prometheus/client_golang v1.16.0 // indirect
76-
github.com/prometheus/client_model v0.4.0 // indirect
77-
github.com/prometheus/common v0.44.0 // indirect
78-
github.com/prometheus/procfs v0.11.0 // indirect
75+
github.com/prometheus/client_golang v1.18.0 // indirect
76+
github.com/prometheus/client_model v0.5.0 // indirect
77+
github.com/prometheus/common v0.46.0 // indirect
78+
github.com/prometheus/procfs v0.12.0 // indirect
7979
github.com/spf13/pflag v1.0.5 // indirect
80-
golang.org/x/net v0.20.0 // indirect
81-
golang.org/x/oauth2 v0.10.0 // indirect
82-
golang.org/x/sys v0.16.0 // indirect
83-
golang.org/x/term v0.16.0 // indirect
80+
golang.org/x/net v0.21.0 // indirect
81+
golang.org/x/oauth2 v0.17.0 // indirect
82+
golang.org/x/sys v0.17.0 // indirect
83+
golang.org/x/term v0.17.0 // indirect
8484
golang.org/x/text v0.14.0 // indirect
85-
golang.org/x/time v0.3.0 // indirect
85+
golang.org/x/time v0.5.0 // indirect
8686
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
87-
google.golang.org/appengine v1.6.7 // indirect
88-
google.golang.org/protobuf v1.31.0 // indirect
87+
google.golang.org/appengine v1.6.8 // indirect
88+
google.golang.org/protobuf v1.32.0 // indirect
8989
gopkg.in/inf.v0 v0.9.1 // indirect
9090
gopkg.in/yaml.v2 v2.4.0 // indirect
9191
gopkg.in/yaml.v3 v3.0.1 // indirect
92-
k8s.io/api v0.27.7
93-
k8s.io/apiextensions-apiserver v0.27.7 //indirect
94-
k8s.io/client-go v0.27.7
95-
k8s.io/component-base v0.27.7 //indirect
96-
k8s.io/klog/v2 v2.100.1 // indirect
97-
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 //indirect
92+
k8s.io/api v0.28.6
93+
k8s.io/apiextensions-apiserver v0.28.3 //indirect
94+
k8s.io/client-go v0.28.6
95+
k8s.io/component-base v0.28.3 //indirect
96+
k8s.io/klog/v2 v2.120.1 // indirect
97+
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 //indirect
9898
k8s.io/utils v0.0.0-20240102154912-e7106e64919e //indirect
9999
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd //indirect
100-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
101-
sigs.k8s.io/yaml v1.3.0 // indirect
102-
)
103-
104-
replace ( //allow-merging
105-
// pin to k8s 0.26.x for now
106-
k8s.io/api => k8s.io/api v0.26.9
107-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.9
108-
k8s.io/client-go => k8s.io/client-go v0.26.9
109-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.6
100+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
101+
sigs.k8s.io/yaml v1.4.0 // indirect
110102
)
111103

112104
// mschuppert: map to latest commit from release-4.13 tag

0 commit comments

Comments
 (0)