Skip to content

Commit 4ea6d99

Browse files
anoopcs9mergify[bot]
authored andcommitted
hack: Update controller-gen to v0.19.0
With go1.25, there's a breaking change[1] from golang.org/x/tools pulled in by controller tools for which a fix is available in either v0.24.1 (and above) or v0.25.1 (and above). This minimum version of golang.org/x/tools is only included from controller tools v0.16.4. We make use of this opportunity to fetch the latest version. Since `spec.network.publish` property is marked as required for SmbCommonConfig we make it explicit while creating the custom resource in scheduling_test.go to avoid any mising value errors. [1] golang/go#74462 Signed-off-by: Anoop C S <[email protected]>
1 parent 507dd40 commit 4ea6d99

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

hack/install-tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _install_kustomize() {
3636
}
3737

3838
_install_controller_gen() {
39-
_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
39+
_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0
4040
}
4141

4242
_install_revive() {

tests/integration/scheduling_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ func (s *NodeSelectorSuite) createSmbCommonConfig(ctx context.Context) {
193193
"mytestid": s.testID,
194194
},
195195
},
196+
Network: sambaoperatorv1alpha1.SmbCommonNetworkSpec{
197+
Publish: "external",
198+
},
196199
},
197200
}
198201
err := s.tc.TypedObjectClient().Create(ctx, cc)
@@ -274,6 +277,9 @@ func (s *AffinityBasedSelectorSuite) createSmbCommonConfig(ctx context.Context)
274277
},
275278
},
276279
},
280+
Network: sambaoperatorv1alpha1.SmbCommonNetworkSpec{
281+
Publish: "external",
282+
},
277283
},
278284
}
279285
err := s.tc.TypedObjectClient().Create(ctx, cc)

0 commit comments

Comments
 (0)