Skip to content

Commit 996f5a8

Browse files
dependabot[bot]mresvanis
dependabot[bot]
and
mresvanis
authored
Bump sigs.k8s.io/controller-runtime from 0.12.3 to 0.13.1 (kubernetes-sigs#90)
* Bump sigs.k8s.io/controller-runtime from 0.12.3 to 0.13.1 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.12.3 to 0.13.1. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.12.3...v0.13.1) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fixup! Bump sigs.k8s.io/controller-runtime from 0.12.3 to 0.13.1 Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michail Resvanis <[email protected]>
1 parent 0515a58 commit 996f5a8

Some content is hidden

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

56 files changed

+1993
-300
lines changed

‎api/v1beta1/groupversion_info.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ limitations under the License.
1515
*/
1616

1717
// Package v1beta1 contains API Schema definitions for the kmm v1beta1 API group
18-
//+kubebuilder:object:generate=true
19-
//+groupName=kmm.sigs.k8s.io
18+
// +kubebuilder:object:generate=true
19+
// +groupName=kmm.sigs.k8s.io
2020
package v1beta1
2121

2222
import (

‎controllers/imagestream_reconciler_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
v1 "k8s.io/api/core/v1"
1414
"k8s.io/apimachinery/pkg/types"
1515
runtimectrl "sigs.k8s.io/controller-runtime"
16+
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
1617
)
1718

1819
var _ = Describe("ImageStreamReconciler_Reconcile", func() {
@@ -59,7 +60,7 @@ var _ = Describe("ImageStreamReconciler_Reconcile", func() {
5960

6061
gomock.InOrder(
6162
clnt.EXPECT().Get(ctx, nsn, gomock.Any()).DoAndReturn(
62-
func(_ interface{}, _ interface{}, is *imagev1.ImageStream) error {
63+
func(_ interface{}, _ interface{}, is *imagev1.ImageStream, _ ...ctrlclient.GetOption) error {
6364
is.Spec = isSpec
6465
return nil
6566
},

‎controllers/managedclustermodule_reconciler_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/types"
3131
clusterv1 "open-cluster-management.io/api/cluster/v1"
3232
workv1 "open-cluster-management.io/api/work/v1"
33+
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
3334
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3435

3536
kmmv1beta1 "github.com/rh-ecosystem-edge/kernel-module-management/api/v1beta1"
@@ -94,7 +95,7 @@ var _ = Describe("ManagedClusterModuleReconciler_Reconcile", func() {
9495

9596
gomock.InOrder(
9697
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
97-
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule) error {
98+
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule, _ ...ctrlclient.GetOption) error {
9899
m.ObjectMeta = mcm.ObjectMeta
99100
m.Spec = mcm.Spec
100101
return nil
@@ -126,7 +127,7 @@ var _ = Describe("ManagedClusterModuleReconciler_Reconcile", func() {
126127

127128
gomock.InOrder(
128129
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
129-
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule) error {
130+
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule, _ ...ctrlclient.GetOption) error {
130131
m.ObjectMeta = mcm.ObjectMeta
131132
m.Spec = mcm.Spec
132133
return nil
@@ -162,7 +163,7 @@ var _ = Describe("ManagedClusterModuleReconciler_Reconcile", func() {
162163

163164
gomock.InOrder(
164165
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
165-
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule) error {
166+
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule, _ ...ctrlclient.GetOption) error {
166167
m.ObjectMeta = mcm.ObjectMeta
167168
m.Spec = mcm.Spec
168169
return nil
@@ -216,7 +217,7 @@ var _ = Describe("ManagedClusterModuleReconciler_Reconcile", func() {
216217

217218
gomock.InOrder(
218219
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
219-
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule) error {
220+
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule, _ ...ctrlclient.GetOption) error {
220221
m.ObjectMeta = mcm.ObjectMeta
221222
m.Spec = mcm.Spec
222223
return nil
@@ -273,7 +274,7 @@ var _ = Describe("ManagedClusterModuleReconciler_Reconcile", func() {
273274

274275
gomock.InOrder(
275276
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
276-
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule) error {
277+
func(_ interface{}, _ interface{}, m *kmmv1beta1.ManagedClusterModule, _ ...ctrlclient.GetOption) error {
277278
m.ObjectMeta = mcm.ObjectMeta
278279
m.Spec = mcm.Spec
279280
return nil

‎controllers/module_reconciler_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
"k8s.io/apimachinery/pkg/types"
2727
"k8s.io/apimachinery/pkg/util/sets"
28+
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2829
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2930
)
3031

@@ -124,7 +125,7 @@ var _ = Describe("ModuleReconciler_Reconcile", func() {
124125

125126
gomock.InOrder(
126127
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
127-
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module) error {
128+
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module, _ ...ctrlclient.GetOption) error {
128129
m.ObjectMeta = mod.ObjectMeta
129130
m.Spec = mod.Spec
130131
return nil
@@ -198,7 +199,7 @@ var _ = Describe("ModuleReconciler_Reconcile", func() {
198199

199200
gomock.InOrder(
200201
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
201-
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module) error {
202+
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module, _ ...ctrlclient.GetOption) error {
202203
m.ObjectMeta = mod.ObjectMeta
203204
m.Spec = mod.Spec
204205
return nil
@@ -265,7 +266,7 @@ var _ = Describe("ModuleReconciler_Reconcile", func() {
265266

266267
gomock.InOrder(
267268
clnt.EXPECT().Get(ctx, gomock.Any(), gomock.Any()).DoAndReturn(
268-
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module) error {
269+
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module, _ ...ctrlclient.GetOption) error {
269270
m.ObjectMeta = mod.ObjectMeta
270271
m.Spec = mod.Spec
271272
return nil
@@ -342,7 +343,7 @@ var _ = Describe("ModuleReconciler_Reconcile", func() {
342343

343344
gomock.InOrder(
344345
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
345-
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module) error {
346+
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module, _ ...ctrlclient.GetOption) error {
346347
m.ObjectMeta = mod.ObjectMeta
347348
m.Spec = mod.Spec
348349
return nil
@@ -462,7 +463,7 @@ var _ = Describe("ModuleReconciler_Reconcile", func() {
462463

463464
gomock.InOrder(
464465
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
465-
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module) error {
466+
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module, _ ...ctrlclient.GetOption) error {
466467
m.ObjectMeta = mod.ObjectMeta
467468
m.Spec = mod.Spec
468469
return nil
@@ -560,7 +561,7 @@ var _ = Describe("ModuleReconciler_Reconcile", func() {
560561

561562
gomock.InOrder(
562563
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
563-
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module) error {
564+
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module, _ ...ctrlclient.GetOption) error {
564565
m.ObjectMeta = mod.ObjectMeta
565566
m.Spec = mod.Spec
566567
return nil
@@ -676,7 +677,7 @@ var _ = Describe("ModuleReconciler_Reconcile", func() {
676677

677678
gomock.InOrder(
678679
clnt.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
679-
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module) error {
680+
func(_ interface{}, _ interface{}, m *kmmv1beta1.Module, _ ...ctrlclient.GetOption) error {
680681
m.ObjectMeta = mod.ObjectMeta
681682
m.Spec = mod.Spec
682683
return nil

‎controllers/node_kernel_reconciler_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/types"
1616
runtimectrl "sigs.k8s.io/controller-runtime"
17+
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
1718
)
1819

1920
var _ = Describe("NodeKernelReconciler_Reconcile", func() {
@@ -73,7 +74,7 @@ var _ = Describe("NodeKernelReconciler_Reconcile", func() {
7374
ctx := context.Background()
7475
gomock.InOrder(
7576
clnt.EXPECT().Get(ctx, nsn, &v1.Node{}).DoAndReturn(
76-
func(_ interface{}, _ interface{}, n *v1.Node) error {
77+
func(_ interface{}, _ interface{}, n *v1.Node, _ ...ctrlclient.GetOption) error {
7778
n.ObjectMeta = node.ObjectMeta
7879
n.Status = node.Status
7980
return nil
@@ -110,7 +111,7 @@ var _ = Describe("NodeKernelReconciler_Reconcile", func() {
110111
ctx := context.Background()
111112
gomock.InOrder(
112113
clnt.EXPECT().Get(ctx, gomock.Any(), gomock.Any()).DoAndReturn(
113-
func(_ interface{}, _ interface{}, n *v1.Node) error {
114+
func(_ interface{}, _ interface{}, n *v1.Node, _ ...ctrlclient.GetOption) error {
114115
n.ObjectMeta = node.ObjectMeta
115116
n.Status = node.Status
116117
return nil

‎controllers/pod_node_module_reconciler_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ var _ = Describe("PodNodeModuleReconciler", func() {
7070
kubeClient.
7171
EXPECT().
7272
Get(ctx, nn, &pod).
73-
Do(func(_ context.Context, _ types.NamespacedName, o client.Object) {
73+
Do(func(_ context.Context, _ types.NamespacedName, o client.Object, _ ...client.GetOption) {
7474
o.SetLabels(map[string]string{constants.ModuleNameLabel: moduleName})
7575
o.(*v1.Pod).Spec.NodeName = nodeName
7676
}),
7777
mockDC.EXPECT().GetNodeLabelFromPod(&podWithModuleName, moduleName).Return(nodeLabel),
7878
kubeClient.
7979
EXPECT().
8080
Get(ctx, types.NamespacedName{Name: nodeName}, &node).
81-
Do(func(_ context.Context, _ types.NamespacedName, o client.Object) {
81+
Do(func(_ context.Context, _ types.NamespacedName, o client.Object, _ ...client.GetOption) {
8282
o.SetLabels(map[string]string{nodeLabel: ""})
8383
}),
8484
kubeClient.
@@ -121,7 +121,7 @@ var _ = Describe("PodNodeModuleReconciler", func() {
121121
kubeClient.
122122
EXPECT().
123123
Get(ctx, nn, &pod).
124-
Do(func(_ context.Context, _ types.NamespacedName, o client.Object) {
124+
Do(func(_ context.Context, _ types.NamespacedName, o client.Object, _ ...client.GetOption) {
125125
o.SetLabels(map[string]string{constants.ModuleNameLabel: moduleName})
126126
o.(*v1.Pod).Spec.NodeName = nodeName
127127
o.(*v1.Pod).Status.Conditions = []v1.PodCondition{
@@ -180,7 +180,7 @@ var _ = Describe("PodNodeModuleReconciler", func() {
180180
kubeClient.
181181
EXPECT().
182182
Get(ctx, nn, &pod).
183-
Do(func(_ context.Context, _ types.NamespacedName, o client.Object) {
183+
Do(func(_ context.Context, _ types.NamespacedName, o client.Object, _ ...client.GetOption) {
184184
o.SetLabels(map[string]string{constants.ModuleNameLabel: moduleName})
185185
o.(*v1.Pod).Spec.NodeName = nodeName
186186
o.SetDeletionTimestamp(&now)
@@ -190,7 +190,7 @@ var _ = Describe("PodNodeModuleReconciler", func() {
190190
kubeClient.
191191
EXPECT().
192192
Get(ctx, types.NamespacedName{Name: nodeName}, &node).
193-
Do(func(_ context.Context, _ types.NamespacedName, o client.Object) {
193+
Do(func(_ context.Context, _ types.NamespacedName, o client.Object, _ ...client.GetOption) {
194194
o.SetLabels(map[string]string{nodeLabel: ""})
195195
}),
196196
kubeClient.

‎controllers/preflightvalidation_reconciler_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"k8s.io/apimachinery/pkg/runtime/schema"
1818
"k8s.io/apimachinery/pkg/types"
1919
"k8s.io/apimachinery/pkg/util/sets"
20+
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2021
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2122
)
2223

@@ -88,7 +89,7 @@ var _ = Describe("PreflightValidationReconciler_Reconcile", func() {
8889
}
8990
gomock.InOrder(
9091
clnt.EXPECT().Get(context.Background(), nsn, &kmmv1beta1.PreflightValidation{}).DoAndReturn(
91-
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation) error {
92+
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation, _ ...ctrlclient.GetOption) error {
9293
m.ObjectMeta = pv.ObjectMeta
9394
m.Spec.KernelVersion = pv.Spec.KernelVersion
9495
m.Status = pv.Status
@@ -106,7 +107,7 @@ var _ = Describe("PreflightValidationReconciler_Reconcile", func() {
106107
mockSU.EXPECT().PreflightSetVerificationStatus(ctx, &pv, mod.Name, kmmv1beta1.VerificationTrue, "some message").Return(nil),
107108
mockSU.EXPECT().PreflightSetVerificationStage(ctx, &pv, mod.Name, kmmv1beta1.VerificationStageDone).Return(nil),
108109
clnt.EXPECT().Get(context.Background(), nsn, &kmmv1beta1.PreflightValidation{}).DoAndReturn(
109-
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation) error {
110+
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation, _ ...ctrlclient.GetOption) error {
110111
m.Status.CRStatuses = map[string]*kmmv1beta1.CRStatus{mod.Name: &kmmv1beta1.CRStatus{VerificationStatus: "True"}}
111112
return nil
112113
},
@@ -139,7 +140,7 @@ var _ = Describe("PreflightValidationReconciler_Reconcile", func() {
139140
}
140141
gomock.InOrder(
141142
clnt.EXPECT().Get(context.Background(), nsn, &kmmv1beta1.PreflightValidation{}).DoAndReturn(
142-
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation) error {
143+
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation, _ ...ctrlclient.GetOption) error {
143144
m.ObjectMeta = pv.ObjectMeta
144145
m.Spec.KernelVersion = pv.Spec.KernelVersion
145146
m.Status = pv.Status
@@ -157,7 +158,7 @@ var _ = Describe("PreflightValidationReconciler_Reconcile", func() {
157158
mockSU.EXPECT().PreflightSetVerificationStatus(ctx, &pv, mod.Name, kmmv1beta1.VerificationTrue, "some message").Return(nil),
158159
mockSU.EXPECT().PreflightSetVerificationStage(ctx, &pv, mod.Name, kmmv1beta1.VerificationStageDone).Return(nil),
159160
clnt.EXPECT().Get(context.Background(), nsn, &kmmv1beta1.PreflightValidation{}).DoAndReturn(
160-
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation) error {
161+
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation, _ ...ctrlclient.GetOption) error {
161162
m.Status.CRStatuses = map[string]*kmmv1beta1.CRStatus{mod.Name: &kmmv1beta1.CRStatus{VerificationStatus: "False"}}
162163
return nil
163164
},
@@ -418,7 +419,7 @@ var _ = Describe("PreflightValidationReconciler_checkPreflightCompletion", func(
418419
}
419420

420421
clnt.EXPECT().Get(context.Background(), nsn, &kmmv1beta1.PreflightValidation{}).DoAndReturn(
421-
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation) error {
422+
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation, _ ...ctrlclient.GetOption) error {
422423
m.Status.CRStatuses = crStatuses
423424
return nil
424425
},
@@ -436,7 +437,7 @@ var _ = Describe("PreflightValidationReconciler_checkPreflightCompletion", func(
436437
}
437438

438439
clnt.EXPECT().Get(context.Background(), nsn, &kmmv1beta1.PreflightValidation{}).DoAndReturn(
439-
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation) error {
440+
func(_ interface{}, _ interface{}, m *kmmv1beta1.PreflightValidation, _ ...ctrlclient.GetOption) error {
440441
m.Status.CRStatuses = crStatuses
441442
return nil
442443
},

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
k8s.io/kubectl v0.25.4
2323
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
2424
open-cluster-management.io/api v0.9.0
25-
sigs.k8s.io/controller-runtime v0.12.3
25+
sigs.k8s.io/controller-runtime v0.13.1
2626
)
2727

2828
require (
@@ -42,6 +42,7 @@ require (
4242
github.com/docker/docker-credential-helpers v0.7.0 // indirect
4343
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
4444
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
45+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4546
github.com/fsnotify/fsnotify v1.5.4 // indirect
4647
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4748
github.com/go-openapi/jsonreference v0.20.0 // indirect

‎go.sum

+5-3
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
117117
github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
118118
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
119119
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
120+
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
121+
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
120122
github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
121123
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
122124
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -394,7 +396,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe
394396
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
395397
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
396398
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
397-
go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
399+
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
398400
golang.org/x/arch v0.0.0-20180920145803-b19384d3c130/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8=
399401
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
400402
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -783,8 +785,8 @@ open-cluster-management.io/api v0.9.0/go.mod h1:+OEARSAl2jIhuLItUcS30UgLA3khmA9i
783785
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
784786
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
785787
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
786-
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
787-
sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
788+
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
789+
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
788790
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
789791
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
790792
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=

‎internal/auth/auth_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"k8s.io/apimachinery/pkg/types"
1313
"k8s.io/client-go/kubernetes"
1414
"k8s.io/client-go/kubernetes/fake"
15+
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
1516
)
1617

1718
var _ = Describe("registrySecretAuthGetter_GetKeyChain", func() {
@@ -58,7 +59,7 @@ var _ = Describe("registrySecretAuthGetter_GetKeyChain", func() {
5859
It("should fail if the secret doesn't contains auth data", func() {
5960

6061
mockClient.EXPECT().Get(ctx, gomock.Any(), gomock.Any()).DoAndReturn(
61-
func(_ interface{}, _ interface{}, s *v1.Secret) error {
62+
func(_ interface{}, _ interface{}, s *v1.Secret, _ ...ctrlclient.GetOption) error {
6263
s.Type = v1.SecretTypeDockerConfigJson
6364
s.Data = map[string][]byte{
6465
v1.DockerConfigJsonKey: []byte("some data"),

‎internal/build/buildconfig/maker_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
"k8s.io/apimachinery/pkg/types"
2222
"k8s.io/utils/pointer"
23+
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2324
)
2425

2526
var _ = Describe("Maker_MakeBuildTemplate", func() {
@@ -165,7 +166,7 @@ var _ = Describe("Maker_MakeBuildTemplate", func() {
165166
gomock.InOrder(
166167
mockBuildHelper.EXPECT().GetRelevantBuild(mod, mapping).Return(mapping.Build),
167168
clnt.EXPECT().Get(ctx, types.NamespacedName{Name: dockerfileConfigMap.Name, Namespace: mod.Namespace}, gomock.Any()).DoAndReturn(
168-
func(_ interface{}, _ interface{}, cm *v1.ConfigMap) error {
169+
func(_ interface{}, _ interface{}, cm *v1.ConfigMap, _ ...ctrlclient.GetOption) error {
169170
cm.Data = dockerfileCMData
170171
return nil
171172
},
@@ -193,7 +194,7 @@ var _ = Describe("Maker_MakeBuildTemplate", func() {
193194
gomock.InOrder(
194195
mockBuildHelper.EXPECT().GetRelevantBuild(gomock.Any(), gomock.Any()).Return(build),
195196
clnt.EXPECT().Get(ctx, gomock.Any(), gomock.Any()).DoAndReturn(
196-
func(_ interface{}, _ interface{}, cm *v1.ConfigMap) error {
197+
func(_ interface{}, _ interface{}, cm *v1.ConfigMap, _ ...ctrlclient.GetOption) error {
197198
dockerfileData := fmt.Sprintf("FROM %s", dtkBuildArg)
198199
cm.Data = map[string]string{constants.DockerfileCMKey: dockerfileData}
199200
return nil
@@ -224,7 +225,7 @@ var _ = Describe("Maker_MakeBuildTemplate", func() {
224225
gomock.InOrder(
225226
mockBuildHelper.EXPECT().GetRelevantBuild(gomock.Any(), gomock.Any()).Return(build),
226227
clnt.EXPECT().Get(ctx, gomock.Any(), gomock.Any()).DoAndReturn(
227-
func(_ interface{}, _ interface{}, cm *v1.ConfigMap) error {
228+
func(_ interface{}, _ interface{}, cm *v1.ConfigMap, _ ...ctrlclient.GetOption) error {
228229
dockerfileData := fmt.Sprintf("FROM %s", dtkBuildArg)
229230
cm.Data = map[string]string{constants.DockerfileCMKey: dockerfileData}
230231
return nil

0 commit comments

Comments
 (0)