diff --git a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go index f095ee9bc6c..c6b51c84e88 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go @@ -89,6 +89,8 @@ func RegisterConversions(scheme *runtime.Scheme) error { Convert_extensions_HTTPIngressRuleValue_To_v1beta1_HTTPIngressRuleValue, Convert_v1beta1_HostPortRange_To_policy_HostPortRange, Convert_policy_HostPortRange_To_v1beta1_HostPortRange, + Convert_v1beta1_IDRange_To_policy_IDRange, + Convert_policy_IDRange_To_v1beta1_IDRange, Convert_v1beta1_Ingress_To_extensions_Ingress, Convert_extensions_Ingress_To_v1beta1_Ingress, Convert_v1beta1_IngressBackend_To_extensions_IngressBackend, @@ -718,7 +720,7 @@ func autoConvert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in func autoConvert_v1beta1_FSGroupStrategyOptions_To_policy_FSGroupStrategyOptions(in *v1beta1.FSGroupStrategyOptions, out *policy.FSGroupStrategyOptions, s conversion.Scope) error { out.Rule = policy.FSGroupStrategyType(in.Rule) - out.Ranges = *(*[]policy.GroupIDRange)(unsafe.Pointer(&in.Ranges)) + out.Ranges = *(*[]policy.IDRange)(unsafe.Pointer(&in.Ranges)) return nil } @@ -806,6 +808,28 @@ func Convert_policy_HostPortRange_To_v1beta1_HostPortRange(in *policy.HostPortRa return autoConvert_policy_HostPortRange_To_v1beta1_HostPortRange(in, out, s) } +func autoConvert_v1beta1_IDRange_To_policy_IDRange(in *v1beta1.IDRange, out *policy.IDRange, s conversion.Scope) error { + out.Min = in.Min + out.Max = in.Max + return nil +} + +// Convert_v1beta1_IDRange_To_policy_IDRange is an autogenerated conversion function. +func Convert_v1beta1_IDRange_To_policy_IDRange(in *v1beta1.IDRange, out *policy.IDRange, s conversion.Scope) error { + return autoConvert_v1beta1_IDRange_To_policy_IDRange(in, out, s) +} + +func autoConvert_policy_IDRange_To_v1beta1_IDRange(in *policy.IDRange, out *v1beta1.IDRange, s conversion.Scope) error { + out.Min = in.Min + out.Max = in.Max + return nil +} + +// Convert_policy_IDRange_To_v1beta1_IDRange is an autogenerated conversion function. +func Convert_policy_IDRange_To_v1beta1_IDRange(in *policy.IDRange, out *v1beta1.IDRange, s conversion.Scope) error { + return autoConvert_policy_IDRange_To_v1beta1_IDRange(in, out, s) +} + func autoConvert_v1beta1_Ingress_To_extensions_Ingress(in *v1beta1.Ingress, out *extensions.Ingress, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_v1beta1_IngressSpec_To_extensions_IngressSpec(&in.Spec, &out.Spec, s); err != nil { @@ -1360,7 +1384,7 @@ func autoConvert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDepl func autoConvert_v1beta1_RunAsUserStrategyOptions_To_policy_RunAsUserStrategyOptions(in *v1beta1.RunAsUserStrategyOptions, out *policy.RunAsUserStrategyOptions, s conversion.Scope) error { out.Rule = policy.RunAsUserStrategy(in.Rule) - out.Ranges = *(*[]policy.UserIDRange)(unsafe.Pointer(&in.Ranges)) + out.Ranges = *(*[]policy.IDRange)(unsafe.Pointer(&in.Ranges)) return nil } @@ -1469,7 +1493,7 @@ func autoConvert_autoscaling_ScaleStatus_To_v1beta1_ScaleStatus(in *autoscaling. func autoConvert_v1beta1_SupplementalGroupsStrategyOptions_To_policy_SupplementalGroupsStrategyOptions(in *v1beta1.SupplementalGroupsStrategyOptions, out *policy.SupplementalGroupsStrategyOptions, s conversion.Scope) error { out.Rule = policy.SupplementalGroupsStrategyType(in.Rule) - out.Ranges = *(*[]policy.GroupIDRange)(unsafe.Pointer(&in.Ranges)) + out.Ranges = *(*[]policy.IDRange)(unsafe.Pointer(&in.Ranges)) return nil } diff --git a/pkg/apis/policy/v1beta1/zz_generated.conversion.go b/pkg/apis/policy/v1beta1/zz_generated.conversion.go index 54e3c713574..9ac64398fc0 100644 --- a/pkg/apis/policy/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/policy/v1beta1/zz_generated.conversion.go @@ -51,6 +51,8 @@ func RegisterConversions(scheme *runtime.Scheme) error { Convert_policy_FSGroupStrategyOptions_To_v1beta1_FSGroupStrategyOptions, Convert_v1beta1_HostPortRange_To_policy_HostPortRange, Convert_policy_HostPortRange_To_v1beta1_HostPortRange, + Convert_v1beta1_IDRange_To_policy_IDRange, + Convert_policy_IDRange_To_v1beta1_IDRange, Convert_v1beta1_PodDisruptionBudget_To_policy_PodDisruptionBudget, Convert_policy_PodDisruptionBudget_To_v1beta1_PodDisruptionBudget, Convert_v1beta1_PodDisruptionBudgetList_To_policy_PodDisruptionBudgetList, @@ -138,7 +140,7 @@ func Convert_policy_Eviction_To_v1beta1_Eviction(in *policy.Eviction, out *v1bet func autoConvert_v1beta1_FSGroupStrategyOptions_To_policy_FSGroupStrategyOptions(in *v1beta1.FSGroupStrategyOptions, out *policy.FSGroupStrategyOptions, s conversion.Scope) error { out.Rule = policy.FSGroupStrategyType(in.Rule) - out.Ranges = *(*[]policy.GroupIDRange)(unsafe.Pointer(&in.Ranges)) + out.Ranges = *(*[]policy.IDRange)(unsafe.Pointer(&in.Ranges)) return nil } @@ -180,6 +182,28 @@ func Convert_policy_HostPortRange_To_v1beta1_HostPortRange(in *policy.HostPortRa return autoConvert_policy_HostPortRange_To_v1beta1_HostPortRange(in, out, s) } +func autoConvert_v1beta1_IDRange_To_policy_IDRange(in *v1beta1.IDRange, out *policy.IDRange, s conversion.Scope) error { + out.Min = in.Min + out.Max = in.Max + return nil +} + +// Convert_v1beta1_IDRange_To_policy_IDRange is an autogenerated conversion function. +func Convert_v1beta1_IDRange_To_policy_IDRange(in *v1beta1.IDRange, out *policy.IDRange, s conversion.Scope) error { + return autoConvert_v1beta1_IDRange_To_policy_IDRange(in, out, s) +} + +func autoConvert_policy_IDRange_To_v1beta1_IDRange(in *policy.IDRange, out *v1beta1.IDRange, s conversion.Scope) error { + out.Min = in.Min + out.Max = in.Max + return nil +} + +// Convert_policy_IDRange_To_v1beta1_IDRange is an autogenerated conversion function. +func Convert_policy_IDRange_To_v1beta1_IDRange(in *policy.IDRange, out *v1beta1.IDRange, s conversion.Scope) error { + return autoConvert_policy_IDRange_To_v1beta1_IDRange(in, out, s) +} + func autoConvert_v1beta1_PodDisruptionBudget_To_policy_PodDisruptionBudget(in *v1beta1.PodDisruptionBudget, out *policy.PodDisruptionBudget, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta if err := Convert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(&in.Spec, &out.Spec, s); err != nil { @@ -432,7 +456,7 @@ func Convert_policy_PodSecurityPolicySpec_To_v1beta1_PodSecurityPolicySpec(in *p func autoConvert_v1beta1_RunAsUserStrategyOptions_To_policy_RunAsUserStrategyOptions(in *v1beta1.RunAsUserStrategyOptions, out *policy.RunAsUserStrategyOptions, s conversion.Scope) error { out.Rule = policy.RunAsUserStrategy(in.Rule) - out.Ranges = *(*[]policy.UserIDRange)(unsafe.Pointer(&in.Ranges)) + out.Ranges = *(*[]policy.IDRange)(unsafe.Pointer(&in.Ranges)) return nil } @@ -476,7 +500,7 @@ func Convert_policy_SELinuxStrategyOptions_To_v1beta1_SELinuxStrategyOptions(in func autoConvert_v1beta1_SupplementalGroupsStrategyOptions_To_policy_SupplementalGroupsStrategyOptions(in *v1beta1.SupplementalGroupsStrategyOptions, out *policy.SupplementalGroupsStrategyOptions, s conversion.Scope) error { out.Rule = policy.SupplementalGroupsStrategyType(in.Rule) - out.Ranges = *(*[]policy.GroupIDRange)(unsafe.Pointer(&in.Ranges)) + out.Ranges = *(*[]policy.IDRange)(unsafe.Pointer(&in.Ranges)) return nil } diff --git a/pkg/apis/policy/zz_generated.deepcopy.go b/pkg/apis/policy/zz_generated.deepcopy.go index 068dfae6ed7..25147ba6c2a 100644 --- a/pkg/apis/policy/zz_generated.deepcopy.go +++ b/pkg/apis/policy/zz_generated.deepcopy.go @@ -99,7 +99,7 @@ func (in *FSGroupStrategyOptions) DeepCopyInto(out *FSGroupStrategyOptions) { *out = *in if in.Ranges != nil { in, out := &in.Ranges, &out.Ranges - *out = make([]GroupIDRange, len(*in)) + *out = make([]IDRange, len(*in)) copy(*out, *in) } return @@ -115,22 +115,6 @@ func (in *FSGroupStrategyOptions) DeepCopy() *FSGroupStrategyOptions { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GroupIDRange) DeepCopyInto(out *GroupIDRange) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GroupIDRange. -func (in *GroupIDRange) DeepCopy() *GroupIDRange { - if in == nil { - return nil - } - out := new(GroupIDRange) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HostPortRange) DeepCopyInto(out *HostPortRange) { *out = *in @@ -147,6 +131,22 @@ func (in *HostPortRange) DeepCopy() *HostPortRange { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *IDRange) DeepCopyInto(out *IDRange) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IDRange. +func (in *IDRange) DeepCopy() *IDRange { + if in == nil { + return nil + } + out := new(IDRange) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PodDisruptionBudget) DeepCopyInto(out *PodDisruptionBudget) { *out = *in @@ -403,7 +403,7 @@ func (in *RunAsUserStrategyOptions) DeepCopyInto(out *RunAsUserStrategyOptions) *out = *in if in.Ranges != nil { in, out := &in.Ranges, &out.Ranges - *out = make([]UserIDRange, len(*in)) + *out = make([]IDRange, len(*in)) copy(*out, *in) } return @@ -449,7 +449,7 @@ func (in *SupplementalGroupsStrategyOptions) DeepCopyInto(out *SupplementalGroup *out = *in if in.Ranges != nil { in, out := &in.Ranges, &out.Ranges - *out = make([]GroupIDRange, len(*in)) + *out = make([]IDRange, len(*in)) copy(*out, *in) } return @@ -464,19 +464,3 @@ func (in *SupplementalGroupsStrategyOptions) DeepCopy() *SupplementalGroupsStrat in.DeepCopyInto(out) return out } - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *UserIDRange) DeepCopyInto(out *UserIDRange) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserIDRange. -func (in *UserIDRange) DeepCopy() *UserIDRange { - if in == nil { - return nil - } - out := new(UserIDRange) - in.DeepCopyInto(out) - return out -}