Skip to content

Commit 7237820

Browse files
committed
fix: replace schemebuilder
On-behalf-of: @SAP robert.graeff@sap.com Signed-off-by: Robert Graeff (SAP) <robert.graeff@sap.com>
1 parent f25f39e commit 7237820

10 files changed

Lines changed: 55 additions & 13 deletions

api/core/v1alpha1/apiserver_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
56
)
67

78
type APIServerType string
@@ -123,5 +124,8 @@ type APIServerList struct {
123124
}
124125

125126
func init() {
126-
SchemeBuilder.Register(&APIServer{}, &APIServerList{})
127+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
128+
scheme.AddKnownTypes(GroupVersion, &APIServer{}, &APIServerList{})
129+
return nil
130+
})
127131
}

api/core/v1alpha1/authentication_types.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package v1alpha1
22

3-
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3+
import (
4+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
6+
)
47

58
const (
69
// Well-known oidc-login parameters
@@ -130,5 +133,8 @@ type AuthenticationList struct {
130133
}
131134

132135
func init() {
133-
SchemeBuilder.Register(&Authentication{}, &AuthenticationList{})
136+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
137+
scheme.AddKnownTypes(GroupVersion, &Authentication{}, &AuthenticationList{})
138+
return nil
139+
})
134140
}

api/core/v1alpha1/authorization_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
56
)
67

78
const (
@@ -188,5 +189,8 @@ type ClusterAdminList struct {
188189
}
189190

190191
func init() {
191-
SchemeBuilder.Register(&Authorization{}, &AuthorizationList{}, &ClusterAdmin{}, &ClusterAdminList{})
192+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
193+
scheme.AddKnownTypes(GroupVersion, &Authorization{}, &AuthorizationList{}, &ClusterAdmin{}, &ClusterAdminList{})
194+
return nil
195+
})
192196
}

api/core/v1alpha1/cloudorchestrator_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
56
)
67

78
// CloudOrchestratorConfiguration contains the configuration for setting up the CloudOrchestrator component in a ManagedControlPlane.
@@ -76,7 +77,10 @@ type CloudOrchestratorList struct {
7677
}
7778

7879
func init() {
79-
SchemeBuilder.Register(&CloudOrchestrator{}, &CloudOrchestratorList{})
80+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
81+
scheme.AddKnownTypes(GroupVersion, &CloudOrchestrator{}, &CloudOrchestratorList{})
82+
return nil
83+
})
8084
}
8185

8286
// CrossplaneConfig defines the configuration of Crossplane

api/core/v1alpha1/groupversion_info.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
package v1alpha1
55

66
import (
7+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8+
"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: "core.openmcp.cloud", Version: "v1alpha1"}
1415

1516
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
16-
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
17+
SchemeBuilder = runtime.NewSchemeBuilder(func(scheme *runtime.Scheme) error {
18+
metav1.AddToGroupVersion(scheme, GroupVersion)
19+
return nil
20+
})
1721

1822
// AddToScheme adds the types in this group-version to the given scheme.
1923
AddToScheme = SchemeBuilder.AddToScheme

api/core/v1alpha1/internalconfiguration_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
56
)
67

78
// InternalConfigurationComponents defines the components that are part of the internal configuration.
@@ -37,5 +38,8 @@ type InternalConfigurationList struct {
3738
}
3839

3940
func init() {
40-
SchemeBuilder.Register(&InternalConfiguration{}, &InternalConfigurationList{})
41+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
42+
scheme.AddKnownTypes(GroupVersion, &InternalConfiguration{}, &InternalConfigurationList{})
43+
return nil
44+
})
4145
}

api/core/v1alpha1/landscaper_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
56
)
67

78
// LandscaperConfiguration contains the configuration which is required for setting up a LaaS instance.
@@ -64,5 +65,8 @@ type LandscaperList struct {
6465
}
6566

6667
func init() {
67-
SchemeBuilder.Register(&Landscaper{}, &LandscaperList{})
68+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
69+
scheme.AddKnownTypes(GroupVersion, &Landscaper{}, &LandscaperList{})
70+
return nil
71+
})
6872
}

api/core/v1alpha1/managedcomponent_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
56
)
67

78
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -40,5 +41,8 @@ type ManagedComponentList struct {
4041
}
4142

4243
func init() {
43-
SchemeBuilder.Register(&ManagedComponent{}, &ManagedComponentList{})
44+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
45+
scheme.AddKnownTypes(GroupVersion, &ManagedComponent{}, &ManagedComponentList{})
46+
return nil
47+
})
4448
}

api/core/v1alpha1/managedcontrolplane_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"k8s.io/apimachinery/pkg/runtime"
56
)
67

78
// ManagedControlPlaneComponents contains the configuration for the components of a ManagedControlPlane.
@@ -119,5 +120,8 @@ type ManagedControlPlaneList struct {
119120
}
120121

121122
func init() {
122-
SchemeBuilder.Register(&ManagedControlPlane{}, &ManagedControlPlaneList{})
123+
SchemeBuilder.Register(func(scheme *runtime.Scheme) error {
124+
scheme.AddKnownTypes(GroupVersion, &ManagedControlPlane{}, &ManagedControlPlaneList{})
125+
return nil
126+
})
123127
}

api/v1alpha1/groupversion_info.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
package v1alpha1
55

66
import (
7+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8+
"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: "openmcp.cloud", Version: "v1alpha1"}
1415

1516
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
16-
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
17+
SchemeBuilder = runtime.NewSchemeBuilder(func(scheme *runtime.Scheme) error {
18+
metav1.AddToGroupVersion(scheme, GroupVersion)
19+
return nil
20+
})
1721

1822
// AddToScheme adds the types in this group-version to the given scheme.
1923
AddToScheme = SchemeBuilder.AddToScheme

0 commit comments

Comments
 (0)