Skip to content

Upgrade controller-runtime to v0.24.0 and k8s.io/* to v1.36 #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
felix-kaestner wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Upgrade controller-runtime to v0.24.0 and k8s.io/* to v1.36 #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8e775
Upgrade controller-runtime to v0.24.0 and k8s.io/* to v1.36
felix-kaestner May 5, 2026
832dff5
Replace deprecated scheme.Builder with runtime.NewSchemeBuilder
felix-kaestner May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/bgpconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

v1alpha1 "github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -79,5 +80,8 @@ type BGPConfigList struct {
// itself as a dependency for the BGP core type.
func init() {
v1alpha1.RegisterBGPDependency(GroupVersion.WithKind("BGPConfig"))
SchemeBuilder.Register(&BGPConfig{}, &BGPConfigList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &BGPConfig{}, &BGPConfigList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/bordergateway_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -206,5 +207,8 @@ type BorderGatewayList struct {
}

func init() {
SchemeBuilder.Register(&BorderGateway{}, &BorderGatewayList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &BorderGateway{}, &BorderGatewayList{})
return nil
})
}
8 changes: 6 additions & 2 deletions api/cisco/nx/v1alpha1/groupversion_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects.
GroupVersion = schema.GroupVersion{Group: "nx.cisco.networking.metal.ironcore.dev", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
SchemeBuilder = runtime.NewSchemeBuilder(func(s *runtime.Scheme) error {
metav1.AddToGroupVersion(s, GroupVersion)
return nil
})

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
Expand Down
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/interfaceconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -106,5 +107,8 @@ type InterfaceConfigList struct {

func init() {
v1alpha1.RegisterInterfaceDependency(GroupVersion.WithKind("InterfaceConfig"))
SchemeBuilder.Register(&InterfaceConfig{}, &InterfaceConfigList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &InterfaceConfig{}, &InterfaceConfigList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/lldpconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

v1alpha1 "github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -55,5 +56,8 @@ type LLDPConfigList struct {
// itself as a dependency for the LLDP core type.
func init() {
v1alpha1.RegisterLLDPDependency(GroupVersion.WithKind("LLDPConfig"))
SchemeBuilder.Register(&LLDPConfig{}, &LLDPConfigList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &LLDPConfig{}, &LLDPConfigList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/managementaccessconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -71,5 +72,8 @@ type ManagementAccessConfigList struct {

func init() {
v1alpha1.RegisterManagementAccessDependency(GroupVersion.WithKind("ManagementAccessConfig"))
SchemeBuilder.Register(&ManagementAccessConfig{}, &ManagementAccessConfigList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &ManagementAccessConfig{}, &ManagementAccessConfigList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/nveconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

v1alpha1 "github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -81,5 +82,8 @@ type NetworkVirtualizationEdgeConfigList struct {
// itself as a dependency for the NetworkVirtualizationEdge core type.
func init() {
v1alpha1.RegisterNetworkVirtualizationEdgeDependency(GroupVersion.WithKind("NetworkVirtualizationEdgeConfig"))
SchemeBuilder.Register(&NetworkVirtualizationEdgeConfig{}, &NetworkVirtualizationEdgeConfigList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &NetworkVirtualizationEdgeConfig{}, &NetworkVirtualizationEdgeConfigList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/system_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -100,5 +101,8 @@ type SystemList struct {
}

func init() {
SchemeBuilder.Register(&System{}, &SystemList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &System{}, &SystemList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/cisco/nx/v1alpha1/vpcdomain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/ironcore-dev/network-operator/api/core/v1alpha1"
)
Expand Down Expand Up @@ -316,5 +317,8 @@ type VPCDomainList struct {
}

func init() {
SchemeBuilder.Register(&VPCDomain{}, &VPCDomainList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &VPCDomain{}, &VPCDomainList{})
return nil
})
}
8 changes: 6 additions & 2 deletions api/cisco/xe/v1alpha1/groupversion_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects.
GroupVersion = schema.GroupVersion{Group: "xe.cisco.networking.metal.ironcore.dev", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
SchemeBuilder = runtime.NewSchemeBuilder(func(s *runtime.Scheme) error {
metav1.AddToGroupVersion(s, GroupVersion)
return nil
})

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
Expand Down
8 changes: 6 additions & 2 deletions api/cisco/xr/v1alpha1/groupversion_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects.
GroupVersion = schema.GroupVersion{Group: "xr.cisco.networking.metal.ironcore.dev", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
SchemeBuilder = runtime.NewSchemeBuilder(func(s *runtime.Scheme) error {
metav1.AddToGroupVersion(s, GroupVersion)
return nil
})

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
Expand Down
6 changes: 5 additions & 1 deletion api/core/v1alpha1/acl_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -172,5 +173,8 @@ func RegisterAccessControlListDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&AccessControlList{}, &AccessControlListList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &AccessControlList{}, &AccessControlListList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/banner_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -117,5 +118,8 @@ func RegisterBannerDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&Banner{}, &BannerList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &Banner{}, &BannerList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/bgp_peer_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/intstr"
)
Expand Down Expand Up @@ -292,5 +293,8 @@ func RegisterBGPPeerDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&BGPPeer{}, &BGPPeerList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &BGPPeer{}, &BGPPeerList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/bgp_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/intstr"
)
Expand Down Expand Up @@ -232,5 +233,8 @@ func RegisterBGPDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&BGP{}, &BGPList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &BGP{}, &BGPList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/certificate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -107,5 +108,8 @@ func RegisterCertificateDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&Certificate{}, &CertificateList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &Certificate{}, &CertificateList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/device_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"strings"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)

// DeviceSpec defines the desired state of Device.
Expand Down Expand Up @@ -353,5 +354,8 @@ type DeviceList struct {
}

func init() {
SchemeBuilder.Register(&Device{}, &DeviceList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &Device{}, &DeviceList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/dhcprelay_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -121,5 +122,8 @@ func RegisterDHCPRelayDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&DHCPRelay{}, &DHCPRelayList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &DHCPRelay{}, &DHCPRelayList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/dns_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -133,5 +134,8 @@ func RegisterDNSDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&DNS{}, &DNSList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &DNS{}, &DNSList{})
return nil
})
}
6 changes: 5 additions & 1 deletion api/core/v1alpha1/evpninstance_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"sync"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down Expand Up @@ -169,5 +170,8 @@ func RegisterEVPNInstanceDependency(gvk schema.GroupVersionKind) {
}

func init() {
SchemeBuilder.Register(&EVPNInstance{}, &EVPNInstanceList{})
SchemeBuilder.Register(func(s *runtime.Scheme) error {
s.AddKnownTypes(GroupVersion, &EVPNInstance{}, &EVPNInstanceList{})
return nil
})
}
8 changes: 6 additions & 2 deletions api/core/v1alpha1/groupversion_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects.
GroupVersion = schema.GroupVersion{Group: "networking.metal.ironcore.dev", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
SchemeBuilder = runtime.NewSchemeBuilder(func(s *runtime.Scheme) error {
metav1.AddToGroupVersion(s, GroupVersion)
return nil
})

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
Expand Down
Loading
Loading