Skip to content

Commit ea4c729

Browse files
committed
scheme.Builder is deprecated
1 parent a32bb4d commit ea4c729

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎api/v1/clusterwidenetworkpolicy_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,3 @@ func validateIPBlocks(blocks []networking.IPBlock) error {
287287
}
288288
return errors.Join(errs...)
289289
}
290-
291-
func init() {
292-
SchemeBuilder.Register(&ClusterwideNetworkPolicy{}, &ClusterwideNetworkPolicyList{})
293-
}

‎api/v1/groupversion_info.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,28 @@
44
package v1
55

66
import (
7+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8+
runtime "k8s.io/apimachinery/pkg/runtime"
79
"k8s.io/apimachinery/pkg/runtime/schema"
8-
"sigs.k8s.io/controller-runtime/pkg/scheme"
910
)
1011

1112
var (
1213
// GroupVersion is group version used to register these objects
1314
GroupVersion = schema.GroupVersion{Group: "metal-stack.io", Version: "v1"}
1415

1516
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
16-
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
17+
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
1718

1819
// AddToScheme adds the types in this group-version to the given scheme.
1920
AddToScheme = SchemeBuilder.AddToScheme
2021
)
2122

22-
func init() {
23-
SchemeBuilder.Register(
23+
func addKnownTypes(scheme *runtime.Scheme) error {
24+
scheme.AddKnownTypes(GroupVersion,
2425
&ClusterwideNetworkPolicy{},
2526
&ClusterwideNetworkPolicyList{},
2627
)
28+
29+
metav1.AddToGroupVersion(scheme, GroupVersion)
30+
return nil
2731
}

0 commit comments

Comments
 (0)