Skip to content

Commit 33ca8a4

Browse files
committed
Replace deprecated method use for CR v0.15.0
This change replaces deprecated method usage with the new standards defined by controller-runtime v0.15.0. The changes are noted in the release notes: https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.15.0 Specifically we are changing: 1. Usage of options.Namespace replaced by options.Cache.Namespaces 2. Usage of MultiNamespacedCacheBuilder replaced by options.Cache{Namespaces} struct. 3. wait.ErrWaitTimeout replaced by wait.Interrupted(err) Signed-off-by: Brendan Shephard <[email protected]>
1 parent 7f4a081 commit 33ca8a4

File tree

1 file changed

+0
-4
lines changed
  • pkg/plugins/hybrid/v1alpha/scaffolds

1 file changed

+0
-4
lines changed

pkg/plugins/hybrid/v1alpha/scaffolds/init.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ import (
3333
"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
3434

3535
kustomizev2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
36-
<<<<<<< HEAD
3736
golangv4 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4/scaffolds"
38-
=======
39-
golangv3 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds"
40-
>>>>>>> 6410ccf (Bump controller-runtime and k8s.io deps)
4137
)
4238

4339
const (

0 commit comments

Comments
 (0)