Merge pull request #12697 from k8s-infra-cherrypick-robot/cherry-pick-12687-to-release-1.11

k8s-ci-robot · web-flow · commit 771c4812b5d6 · 2025-08-27T08:32:09.000-07:00
[release-1.11] 🐛 Register conversion funcs in schemes
diff --git a/api/addons/v1beta1/groupversion_info.go b/api/addons/v1beta1/groupversion_info.go
@@ -33,7 +33,7 @@ var (
 	AddToScheme = schemeBuilder.AddToScheme
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 
 	objectTypes = []runtime.Object{}
 )
diff --git a/api/bootstrap/kubeadm/v1beta1/groupversion_info.go b/api/bootstrap/kubeadm/v1beta1/groupversion_info.go
@@ -33,7 +33,7 @@ var (
 	AddToScheme = schemeBuilder.AddToScheme
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 
 	objectTypes = []runtime.Object{}
 )
diff --git a/api/controlplane/kubeadm/v1beta1/groupversion_info.go b/api/controlplane/kubeadm/v1beta1/groupversion_info.go
@@ -33,7 +33,7 @@ var (
 	AddToScheme = schemeBuilder.AddToScheme
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 
 	objectTypes = []runtime.Object{}
 )
diff --git a/api/core/v1beta1/groupversion_info.go b/api/core/v1beta1/groupversion_info.go
@@ -33,7 +33,7 @@ var (
 	AddToScheme = schemeBuilder.AddToScheme
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 
 	objectTypes = []runtime.Object{}
 
diff --git a/api/ipam/v1alpha1/groupversion_info.go b/api/ipam/v1alpha1/groupversion_info.go
@@ -38,7 +38,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/api/ipam/v1beta1/groupversion_info.go b/api/ipam/v1beta1/groupversion_info.go
@@ -33,7 +33,7 @@ var (
 	AddToScheme = schemeBuilder.AddToScheme
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 
 	objectTypes = []runtime.Object{}
 )
diff --git a/api/runtime/v1alpha1/groupversion_info.go b/api/runtime/v1alpha1/groupversion_info.go
@@ -36,7 +36,7 @@ var (
 	AddToScheme = schemeBuilder.AddToScheme
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 
 	objectTypes = []runtime.Object{}
 )
diff --git a/bootstrap/kubeadm/types/upstreamv1beta3/groupversion_info.go b/bootstrap/kubeadm/types/upstreamv1beta3/groupversion_info.go
@@ -31,5 +31,5 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
 )
diff --git a/bootstrap/kubeadm/types/upstreamv1beta4/groupversion_info.go b/bootstrap/kubeadm/types/upstreamv1beta4/groupversion_info.go
@@ -31,5 +31,5 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
 )
diff --git a/internal/api/addons/v1alpha3/groupversion_info.go b/internal/api/addons/v1alpha3/groupversion_info.go
@@ -34,5 +34,5 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
 )
diff --git a/internal/api/addons/v1alpha4/groupversion_info.go b/internal/api/addons/v1alpha4/groupversion_info.go
@@ -37,7 +37,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/internal/api/bootstrap/kubeadm/v1alpha3/groupversion_info.go b/internal/api/bootstrap/kubeadm/v1alpha3/groupversion_info.go
@@ -34,5 +34,5 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
 )
diff --git a/internal/api/bootstrap/kubeadm/v1alpha4/groupversion_info.go b/internal/api/bootstrap/kubeadm/v1alpha4/groupversion_info.go
@@ -38,7 +38,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/internal/api/controlplane/kubeadm/v1alpha3/groupversion_info.go b/internal/api/controlplane/kubeadm/v1alpha3/groupversion_info.go
@@ -34,5 +34,5 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
 )
diff --git a/internal/api/controlplane/kubeadm/v1alpha4/groupversion_info.go b/internal/api/controlplane/kubeadm/v1alpha4/groupversion_info.go
@@ -38,7 +38,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/internal/api/core/v1alpha3/groupversion_info.go b/internal/api/core/v1alpha3/groupversion_info.go
@@ -34,5 +34,5 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 
-	localSchemeBuilder = SchemeBuilder.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
 )
diff --git a/internal/api/core/v1alpha4/groupversion_info.go b/internal/api/core/v1alpha4/groupversion_info.go
@@ -38,7 +38,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/internal/topology/upgrade/test/t2/v1beta1/groupversion_info.go b/internal/topology/upgrade/test/t2/v1beta1/groupversion_info.go
@@ -33,7 +33,7 @@ var (
 	AddToScheme = schemeBuilder.AddToScheme
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/test/infrastructure/docker/api/v1alpha3/groupversion_info.go b/test/infrastructure/docker/api/v1alpha3/groupversion_info.go
@@ -38,7 +38,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/test/infrastructure/docker/api/v1alpha4/groupversion_info.go b/test/infrastructure/docker/api/v1alpha4/groupversion_info.go
@@ -38,7 +38,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/test/infrastructure/docker/api/v1beta1/groupversion_info.go b/test/infrastructure/docker/api/v1beta1/groupversion_info.go
@@ -35,7 +35,7 @@ var (
 	objectTypes = []runtime.Object{}
 
 	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = schemeBuilder
+	localSchemeBuilder = &schemeBuilder
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ var (`
`33`	`33`	`AddToScheme = schemeBuilder.AddToScheme`
`34`	`34`
`35`	`35`	`// localSchemeBuilder is used for type conversions.`
`36`		`- localSchemeBuilder = schemeBuilder`
	`36`	`+ localSchemeBuilder = &schemeBuilder`
`37`	`37`
`38`	`38`	`objectTypes = []runtime.Object{}`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ var (`
`38`	`38`	`objectTypes = []runtime.Object{}`
`39`	`39`
`40`	`40`	`// localSchemeBuilder is used for type conversions.`
`41`		`- localSchemeBuilder = schemeBuilder`
	`41`	`+ localSchemeBuilder = &schemeBuilder`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`func addKnownTypes(scheme *runtime.Scheme) error {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ var (`
`36`	`36`	`AddToScheme = schemeBuilder.AddToScheme`
`37`	`37`
`38`	`38`	`// localSchemeBuilder is used for type conversions.`
`39`		`- localSchemeBuilder = schemeBuilder`
	`39`	`+ localSchemeBuilder = &schemeBuilder`
`40`	`40`
`41`	`41`	`objectTypes = []runtime.Object{}`
`42`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ var (`
`31`	`31`	`// AddToScheme adds the types in this group-version to the given scheme.`
`32`	`32`	`AddToScheme = SchemeBuilder.AddToScheme`
`33`	`33`
`34`		`- localSchemeBuilder = SchemeBuilder.SchemeBuilder`
	`34`	`+ localSchemeBuilder = &SchemeBuilder.SchemeBuilder`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@ var (`
`34`	`34`	`// AddToScheme adds the types in this group-version to the given scheme.`
`35`	`35`	`AddToScheme = SchemeBuilder.AddToScheme`
`36`	`36`
`37`		`- localSchemeBuilder = SchemeBuilder.SchemeBuilder`
	`37`	`+ localSchemeBuilder = &SchemeBuilder.SchemeBuilder`
`38`	`38`	`)`