From c4ba1b990ee0a9a2111655ffe1874ec7204fa8bb Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 5 Mar 2024 14:53:25 -0800 Subject: [PATCH] Remove manual admissionregistration.Rule conversions --- .../admissionregistration/v1/conversion.go | 10 ------- .../v1/zz_generated.conversion.go | 30 ++++++++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/apis/admissionregistration/v1/conversion.go b/pkg/apis/admissionregistration/v1/conversion.go index ca5f603229a..7ea6f168e76 100644 --- a/pkg/apis/admissionregistration/v1/conversion.go +++ b/pkg/apis/admissionregistration/v1/conversion.go @@ -22,16 +22,6 @@ import ( admissionregistration "k8s.io/kubernetes/pkg/apis/admissionregistration" ) -// Convert_admissionregistration_Rule_To_v1_Rule is an autogenerated conversion function. -func Convert_admissionregistration_Rule_To_v1_Rule(in *admissionregistration.Rule, out *v1.Rule, s conversion.Scope) error { - return autoConvert_admissionregistration_Rule_To_v1_Rule(in, out, s) -} - -// Convert_v1_Rule_To_admissionregistration_Rule is an autogenerated conversion function. -func Convert_v1_Rule_To_admissionregistration_Rule(in *v1.Rule, out *admissionregistration.Rule, s conversion.Scope) error { - return autoConvert_v1_Rule_To_admissionregistration_Rule(in, out, s) -} - // Convert_admissionregistration_RuleWithOperations_To_v1_RuleWithOperations is an autogenerated conversion function. func Convert_admissionregistration_RuleWithOperations_To_v1_RuleWithOperations(in *admissionregistration.RuleWithOperations, out *v1.RuleWithOperations, s conversion.Scope) error { return autoConvert_admissionregistration_RuleWithOperations_To_v1_RuleWithOperations(in, out, s) diff --git a/pkg/apis/admissionregistration/v1/zz_generated.conversion.go b/pkg/apis/admissionregistration/v1/zz_generated.conversion.go index 3fca8d889d8..54e07e72d3c 100644 --- a/pkg/apis/admissionregistration/v1/zz_generated.conversion.go +++ b/pkg/apis/admissionregistration/v1/zz_generated.conversion.go @@ -138,6 +138,16 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddGeneratedConversionFunc((*v1.Rule)(nil), (*admissionregistration.Rule)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1_Rule_To_admissionregistration_Rule(a.(*v1.Rule), b.(*admissionregistration.Rule), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*admissionregistration.Rule)(nil), (*v1.Rule)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_admissionregistration_Rule_To_v1_Rule(a.(*admissionregistration.Rule), b.(*v1.Rule), scope) + }); err != nil { + return err + } if err := s.AddGeneratedConversionFunc((*v1.ServiceReference)(nil), (*admissionregistration.ServiceReference)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1_ServiceReference_To_admissionregistration_ServiceReference(a.(*v1.ServiceReference), b.(*admissionregistration.ServiceReference), scope) }); err != nil { @@ -293,21 +303,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddConversionFunc((*admissionregistration.Rule)(nil), (*v1.Rule)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_admissionregistration_Rule_To_v1_Rule(a.(*admissionregistration.Rule), b.(*v1.Rule), scope) - }); err != nil { - return err - } if err := s.AddConversionFunc((*v1.RuleWithOperations)(nil), (*admissionregistration.RuleWithOperations)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_v1_RuleWithOperations_To_admissionregistration_RuleWithOperations(a.(*v1.RuleWithOperations), b.(*admissionregistration.RuleWithOperations), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1.Rule)(nil), (*admissionregistration.Rule)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_Rule_To_admissionregistration_Rule(a.(*v1.Rule), b.(*admissionregistration.Rule), scope) - }); err != nil { - return err - } return nil } @@ -677,6 +677,11 @@ func autoConvert_v1_Rule_To_admissionregistration_Rule(in *v1.Rule, out *admissi return nil } +// Convert_v1_Rule_To_admissionregistration_Rule is an autogenerated conversion function. +func Convert_v1_Rule_To_admissionregistration_Rule(in *v1.Rule, out *admissionregistration.Rule, s conversion.Scope) error { + return autoConvert_v1_Rule_To_admissionregistration_Rule(in, out, s) +} + func autoConvert_admissionregistration_Rule_To_v1_Rule(in *admissionregistration.Rule, out *v1.Rule, s conversion.Scope) error { out.APIGroups = *(*[]string)(unsafe.Pointer(&in.APIGroups)) out.APIVersions = *(*[]string)(unsafe.Pointer(&in.APIVersions)) @@ -685,6 +690,11 @@ func autoConvert_admissionregistration_Rule_To_v1_Rule(in *admissionregistration return nil } +// Convert_admissionregistration_Rule_To_v1_Rule is an autogenerated conversion function. +func Convert_admissionregistration_Rule_To_v1_Rule(in *admissionregistration.Rule, out *v1.Rule, s conversion.Scope) error { + return autoConvert_admissionregistration_Rule_To_v1_Rule(in, out, s) +} + func autoConvert_v1_RuleWithOperations_To_admissionregistration_RuleWithOperations(in *v1.RuleWithOperations, out *admissionregistration.RuleWithOperations, s conversion.Scope) error { out.Operations = *(*[]admissionregistration.OperationType)(unsafe.Pointer(&in.Operations)) if err := Convert_v1_Rule_To_admissionregistration_Rule(&in.Rule, &out.Rule, s); err != nil {