diff --git a/pkg/apps/apis/apps/v1/zz_generated.conversion.go b/pkg/apps/apis/apps/v1/zz_generated.conversion.go index d22ed46067d0..9e68851191d7 100644 --- a/pkg/apps/apis/apps/v1/zz_generated.conversion.go +++ b/pkg/apps/apis/apps/v1/zz_generated.conversion.go @@ -7,12 +7,12 @@ package v1 import ( v1 "github.com/openshift/api/apps/v1" apps "github.com/openshift/origin/pkg/apps/apis/apps" - core_v1 "k8s.io/api/core/v1" + api_core_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/apis/core" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" unsafe "unsafe" ) @@ -75,9 +75,9 @@ func autoConvert_v1_CustomDeploymentStrategyParams_To_apps_CustomDeploymentStrat out.Image = in.Image if in.Environment != nil { in, out := &in.Environment, &out.Environment - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -97,9 +97,9 @@ func autoConvert_apps_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrat out.Image = in.Image if in.Environment != nil { in, out := &in.Environment, &out.Environment - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -154,7 +154,7 @@ func Convert_apps_DeploymentCause_To_v1_DeploymentCause(in *apps.DeploymentCause } func autoConvert_v1_DeploymentCauseImageTrigger_To_apps_DeploymentCauseImageTrigger(in *v1.DeploymentCauseImageTrigger, out *apps.DeploymentCauseImageTrigger, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } return nil @@ -166,7 +166,7 @@ func Convert_v1_DeploymentCauseImageTrigger_To_apps_DeploymentCauseImageTrigger( } func autoConvert_apps_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in *apps.DeploymentCauseImageTrigger, out *v1.DeploymentCauseImageTrigger, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } return nil @@ -179,7 +179,7 @@ func Convert_apps_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger( func autoConvert_v1_DeploymentCondition_To_apps_DeploymentCondition(in *v1.DeploymentCondition, out *apps.DeploymentCondition, s conversion.Scope) error { out.Type = apps.DeploymentConditionType(in.Type) - out.Status = api.ConditionStatus(in.Status) + out.Status = core.ConditionStatus(in.Status) out.LastUpdateTime = in.LastUpdateTime out.LastTransitionTime = in.LastTransitionTime out.Reason = apps.DeploymentConditionReason(in.Reason) @@ -194,7 +194,7 @@ func Convert_v1_DeploymentCondition_To_apps_DeploymentCondition(in *v1.Deploymen func autoConvert_apps_DeploymentCondition_To_v1_DeploymentCondition(in *apps.DeploymentCondition, out *v1.DeploymentCondition, s conversion.Scope) error { out.Type = v1.DeploymentConditionType(in.Type) - out.Status = core_v1.ConditionStatus(in.Status) + out.Status = api_core_v1.ConditionStatus(in.Status) out.LastUpdateTime = in.LastUpdateTime out.LastTransitionTime = in.LastTransitionTime out.Reason = string(in.Reason) @@ -310,7 +310,7 @@ func Convert_apps_DeploymentConfigRollback_To_v1_DeploymentConfigRollback(in *ap } func autoConvert_v1_DeploymentConfigRollbackSpec_To_apps_DeploymentConfigRollbackSpec(in *v1.DeploymentConfigRollbackSpec, out *apps.DeploymentConfigRollbackSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } out.Revision = in.Revision @@ -327,7 +327,7 @@ func Convert_v1_DeploymentConfigRollbackSpec_To_apps_DeploymentConfigRollbackSpe } func autoConvert_apps_DeploymentConfigRollbackSpec_To_v1_DeploymentConfigRollbackSpec(in *apps.DeploymentConfigRollbackSpec, out *v1.DeploymentConfigRollbackSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } out.Revision = in.Revision @@ -366,8 +366,8 @@ func autoConvert_v1_DeploymentConfigSpec_To_apps_DeploymentConfigSpec(in *v1.Dep out.Selector = *(*map[string]string)(unsafe.Pointer(&in.Selector)) if in.Template != nil { in, out := &in.Template, &out.Template - *out = new(api.PodTemplateSpec) - if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(*in, *out, s); err != nil { + *out = new(core.PodTemplateSpec) + if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(*in, *out, s); err != nil { return err } } else { @@ -404,8 +404,8 @@ func autoConvert_apps_DeploymentConfigSpec_To_v1_DeploymentConfigSpec(in *apps.D out.Selector = *(*map[string]string)(unsafe.Pointer(&in.Selector)) if in.Template != nil { in, out := &in.Template, &out.Template - *out = new(core_v1.PodTemplateSpec) - if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(*in, *out, s); err != nil { + *out = new(api_core_v1.PodTemplateSpec) + if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(*in, *out, s); err != nil { return err } } else { @@ -624,7 +624,7 @@ func autoConvert_v1_DeploymentStrategy_To_apps_DeploymentStrategy(in *v1.Deploym } else { out.RollingParams = nil } - if err := api_v1.Convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { + if err := core_v1.Convert_v1_ResourceRequirements_To_core_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) @@ -667,7 +667,7 @@ func autoConvert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(in *apps.Deplo } else { out.RollingParams = nil } - if err := api_v1.Convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { + if err := core_v1.Convert_core_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) @@ -684,7 +684,7 @@ func Convert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(in *apps.Deploymen func autoConvert_v1_DeploymentTriggerImageChangeParams_To_apps_DeploymentTriggerImageChangeParams(in *v1.DeploymentTriggerImageChangeParams, out *apps.DeploymentTriggerImageChangeParams, s conversion.Scope) error { out.Automatic = in.Automatic out.ContainerNames = *(*[]string)(unsafe.Pointer(&in.ContainerNames)) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } out.LastTriggeredImage = in.LastTriggeredImage @@ -694,7 +694,7 @@ func autoConvert_v1_DeploymentTriggerImageChangeParams_To_apps_DeploymentTrigger func autoConvert_apps_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams(in *apps.DeploymentTriggerImageChangeParams, out *v1.DeploymentTriggerImageChangeParams, s conversion.Scope) error { out.Automatic = in.Automatic out.ContainerNames = *(*[]string)(unsafe.Pointer(&in.ContainerNames)) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } out.LastTriggeredImage = in.LastTriggeredImage @@ -743,9 +743,9 @@ func autoConvert_v1_ExecNewPodHook_To_apps_ExecNewPodHook(in *v1.ExecNewPodHook, out.Command = *(*[]string)(unsafe.Pointer(&in.Command)) if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -766,9 +766,9 @@ func autoConvert_apps_ExecNewPodHook_To_v1_ExecNewPodHook(in *apps.ExecNewPodHoo out.Command = *(*[]string)(unsafe.Pointer(&in.Command)) if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -975,7 +975,7 @@ func autoConvert_apps_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStr func autoConvert_v1_TagImageHook_To_apps_TagImageHook(in *v1.TagImageHook, out *apps.TagImageHook, s conversion.Scope) error { out.ContainerName = in.ContainerName - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.To, &out.To, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.To, &out.To, s); err != nil { return err } return nil @@ -988,7 +988,7 @@ func Convert_v1_TagImageHook_To_apps_TagImageHook(in *v1.TagImageHook, out *apps func autoConvert_apps_TagImageHook_To_v1_TagImageHook(in *apps.TagImageHook, out *v1.TagImageHook, s conversion.Scope) error { out.ContainerName = in.ContainerName - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.To, &out.To, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.To, &out.To, s); err != nil { return err } return nil diff --git a/pkg/apps/apis/apps/v1/zz_generated.defaults.go b/pkg/apps/apis/apps/v1/zz_generated.defaults.go index 8b2e7dd38161..a3df3069dbe5 100644 --- a/pkg/apps/apis/apps/v1/zz_generated.defaults.go +++ b/pkg/apps/apis/apps/v1/zz_generated.defaults.go @@ -7,7 +7,7 @@ package v1 import ( v1 "github.com/openshift/api/apps/v1" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -28,7 +28,7 @@ func SetObjectDefaults_DeploymentConfig(in *v1.DeploymentConfig) { a := &in.Spec.Strategy.CustomParams.Environment[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -41,7 +41,7 @@ func SetObjectDefaults_DeploymentConfig(in *v1.DeploymentConfig) { a := &in.Spec.Strategy.RecreateParams.Pre.ExecNewPod.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -53,7 +53,7 @@ func SetObjectDefaults_DeploymentConfig(in *v1.DeploymentConfig) { a := &in.Spec.Strategy.RecreateParams.Mid.ExecNewPod.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -65,7 +65,7 @@ func SetObjectDefaults_DeploymentConfig(in *v1.DeploymentConfig) { a := &in.Spec.Strategy.RecreateParams.Post.ExecNewPod.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -80,7 +80,7 @@ func SetObjectDefaults_DeploymentConfig(in *v1.DeploymentConfig) { a := &in.Spec.Strategy.RollingParams.Pre.ExecNewPod.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -92,145 +92,145 @@ func SetObjectDefaults_DeploymentConfig(in *v1.DeploymentConfig) { a := &in.Spec.Strategy.RollingParams.Post.ExecNewPod.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } } } } - api_v1.SetDefaults_ResourceList(&in.Spec.Strategy.Resources.Limits) - api_v1.SetDefaults_ResourceList(&in.Spec.Strategy.Resources.Requests) + core_v1.SetDefaults_ResourceList(&in.Spec.Strategy.Resources.Limits) + core_v1.SetDefaults_ResourceList(&in.Spec.Strategy.Resources.Requests) if in.Spec.Template != nil { - api_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - api_v1.SetDefaults_Volume(a) + core_v1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - api_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - api_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { - api_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) + core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - api_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) } if a.VolumeSource.DownwardAPI != nil { - api_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - api_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - api_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) } if a.VolumeSource.Projected != nil { - api_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } } } if a.VolumeSource.ScaleIO != nil { - api_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } diff --git a/pkg/apps/apis/apps/zz_generated.deepcopy.go b/pkg/apps/apis/apps/zz_generated.deepcopy.go index cf3fd8e0104b..6cc2784a38f7 100644 --- a/pkg/apps/apis/apps/zz_generated.deepcopy.go +++ b/pkg/apps/apis/apps/zz_generated.deepcopy.go @@ -7,148 +7,17 @@ package apps import ( image "github.com/openshift/origin/pkg/image/apis/image" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*CustomDeploymentStrategyParams).DeepCopyInto(out.(*CustomDeploymentStrategyParams)) - return nil - }, InType: reflect.TypeOf(new(CustomDeploymentStrategyParams))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentCause).DeepCopyInto(out.(*DeploymentCause)) - return nil - }, InType: reflect.TypeOf(new(DeploymentCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentCauseImageTrigger).DeepCopyInto(out.(*DeploymentCauseImageTrigger)) - return nil - }, InType: reflect.TypeOf(new(DeploymentCauseImageTrigger))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentCondition).DeepCopyInto(out.(*DeploymentCondition)) - return nil - }, InType: reflect.TypeOf(new(DeploymentCondition))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConditionReason).DeepCopyInto(out.(*DeploymentConditionReason)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConditionReason))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConditionType).DeepCopyInto(out.(*DeploymentConditionType)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConditionType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConfig).DeepCopyInto(out.(*DeploymentConfig)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConfigList).DeepCopyInto(out.(*DeploymentConfigList)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConfigList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConfigRollback).DeepCopyInto(out.(*DeploymentConfigRollback)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConfigRollback))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConfigRollbackSpec).DeepCopyInto(out.(*DeploymentConfigRollbackSpec)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConfigRollbackSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConfigSpec).DeepCopyInto(out.(*DeploymentConfigSpec)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConfigSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentConfigStatus).DeepCopyInto(out.(*DeploymentConfigStatus)) - return nil - }, InType: reflect.TypeOf(new(DeploymentConfigStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentDetails).DeepCopyInto(out.(*DeploymentDetails)) - return nil - }, InType: reflect.TypeOf(new(DeploymentDetails))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentLog).DeepCopyInto(out.(*DeploymentLog)) - return nil - }, InType: reflect.TypeOf(new(DeploymentLog))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentLogOptions).DeepCopyInto(out.(*DeploymentLogOptions)) - return nil - }, InType: reflect.TypeOf(new(DeploymentLogOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentRequest).DeepCopyInto(out.(*DeploymentRequest)) - return nil - }, InType: reflect.TypeOf(new(DeploymentRequest))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentStatus).DeepCopyInto(out.(*DeploymentStatus)) - return nil - }, InType: reflect.TypeOf(new(DeploymentStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentStrategy).DeepCopyInto(out.(*DeploymentStrategy)) - return nil - }, InType: reflect.TypeOf(new(DeploymentStrategy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentStrategyType).DeepCopyInto(out.(*DeploymentStrategyType)) - return nil - }, InType: reflect.TypeOf(new(DeploymentStrategyType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentTriggerImageChangeParams).DeepCopyInto(out.(*DeploymentTriggerImageChangeParams)) - return nil - }, InType: reflect.TypeOf(new(DeploymentTriggerImageChangeParams))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentTriggerPolicy).DeepCopyInto(out.(*DeploymentTriggerPolicy)) - return nil - }, InType: reflect.TypeOf(new(DeploymentTriggerPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DeploymentTriggerType).DeepCopyInto(out.(*DeploymentTriggerType)) - return nil - }, InType: reflect.TypeOf(new(DeploymentTriggerType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ExecNewPodHook).DeepCopyInto(out.(*ExecNewPodHook)) - return nil - }, InType: reflect.TypeOf(new(ExecNewPodHook))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LifecycleHook).DeepCopyInto(out.(*LifecycleHook)) - return nil - }, InType: reflect.TypeOf(new(LifecycleHook))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LifecycleHookFailurePolicy).DeepCopyInto(out.(*LifecycleHookFailurePolicy)) - return nil - }, InType: reflect.TypeOf(new(LifecycleHookFailurePolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RecreateDeploymentStrategyParams).DeepCopyInto(out.(*RecreateDeploymentStrategyParams)) - return nil - }, InType: reflect.TypeOf(new(RecreateDeploymentStrategyParams))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RollingDeploymentStrategyParams).DeepCopyInto(out.(*RollingDeploymentStrategyParams)) - return nil - }, InType: reflect.TypeOf(new(RollingDeploymentStrategyParams))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagImageHook).DeepCopyInto(out.(*TagImageHook)) - return nil - }, InType: reflect.TypeOf(new(TagImageHook))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateImage).DeepCopyInto(out.(*TemplateImage)) - return nil - }, InType: reflect.TypeOf(new(TemplateImage))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CustomDeploymentStrategyParams) DeepCopyInto(out *CustomDeploymentStrategyParams) { *out = *in if in.Environment != nil { in, out := &in.Environment, &out.Environment - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -417,7 +286,7 @@ func (in *DeploymentConfigSpec) DeepCopyInto(out *DeploymentConfigSpec) { if *in == nil { *out = nil } else { - *out = new(api.PodTemplateSpec) + *out = new(core.PodTemplateSpec) (*in).DeepCopyInto(*out) } } @@ -801,7 +670,7 @@ func (in *ExecNewPodHook) DeepCopyInto(out *ExecNewPodHook) { } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -1023,7 +892,7 @@ func (in *TemplateImage) DeepCopyInto(out *TemplateImage) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -1032,7 +901,7 @@ func (in *TemplateImage) DeepCopyInto(out *TemplateImage) { if *in == nil { *out = nil } else { - *out = new(api.Container) + *out = new(core.Container) (*in).DeepCopyInto(*out) } } diff --git a/pkg/apps/generated/informers/internalversion/apps/interface.go b/pkg/apps/generated/informers/internalversion/apps/interface.go index d862e2cb2e53..0a66b7b9e0ce 100644 --- a/pkg/apps/generated/informers/internalversion/apps/interface.go +++ b/pkg/apps/generated/informers/internalversion/apps/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/apps/generated/informers/internalversion/apps/internalversion/deploymentconfig.go b/pkg/apps/generated/informers/internalversion/apps/internalversion/deploymentconfig.go index ae67507baba1..a0b68f98b210 100644 --- a/pkg/apps/generated/informers/internalversion/apps/internalversion/deploymentconfig.go +++ b/pkg/apps/generated/informers/internalversion/apps/internalversion/deploymentconfig.go @@ -22,19 +22,34 @@ type DeploymentConfigInformer interface { } type deploymentConfigInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewDeploymentConfigInformer constructs a new informer for DeploymentConfig type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewDeploymentConfigInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredDeploymentConfigInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredDeploymentConfigInformer constructs a new informer for DeploymentConfig type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredDeploymentConfigInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Apps().DeploymentConfigs(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Apps().DeploymentConfigs(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewDeploymentConfigInformer(client internalclientset.Interface, namespace s ) } -func defaultDeploymentConfigInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewDeploymentConfigInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *deploymentConfigInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredDeploymentConfigInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *deploymentConfigInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apps.DeploymentConfig{}, defaultDeploymentConfigInformer) + return f.factory.InformerFor(&apps.DeploymentConfig{}, f.defaultInformer) } func (f *deploymentConfigInformer) Lister() internalversion.DeploymentConfigLister { diff --git a/pkg/apps/generated/informers/internalversion/apps/internalversion/interface.go b/pkg/apps/generated/informers/internalversion/apps/internalversion/interface.go index 08cf3b986a17..0f1df3176298 100644 --- a/pkg/apps/generated/informers/internalversion/apps/internalversion/interface.go +++ b/pkg/apps/generated/informers/internalversion/apps/internalversion/interface.go @@ -13,15 +13,17 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // DeploymentConfigs returns a DeploymentConfigInformer. func (v *version) DeploymentConfigs() DeploymentConfigInformer { - return &deploymentConfigInformer{factory: v.SharedInformerFactory} + return &deploymentConfigInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/apps/generated/informers/internalversion/factory.go b/pkg/apps/generated/informers/internalversion/factory.go index cb510916f25f..96314f198aa4 100644 --- a/pkg/apps/generated/informers/internalversion/factory.go +++ b/pkg/apps/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( apps "github.com/openshift/origin/pkg/apps/generated/informers/internalversion/apps" internalinterfaces "github.com/openshift/origin/pkg/apps/generated/informers/internalversion/internalinterfaces" internalclientset "github.com/openshift/origin/pkg/apps/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Apps() apps.Interface { - return apps.New(f) + return apps.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/apps/generated/informers/internalversion/generic.go b/pkg/apps/generated/informers/internalversion/generic.go index 2489ac64aa3d..048b55083be1 100644 --- a/pkg/apps/generated/informers/internalversion/generic.go +++ b/pkg/apps/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Apps, Version=InternalVersion + // Group=apps.openshift.io, Version=internalVersion case apps.SchemeGroupVersion.WithResource("deploymentconfigs"): return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().InternalVersion().DeploymentConfigs().Informer()}, nil diff --git a/pkg/apps/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/apps/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index 128dfa722f1c..80cb4085fd3d 100644 --- a/pkg/apps/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/apps/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/apps/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/apps/generated/internalclientset/doc.go b/pkg/apps/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/apps/generated/internalclientset/doc.go +++ b/pkg/apps/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/apps/generated/internalclientset/fake/doc.go b/pkg/apps/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/apps/generated/internalclientset/fake/doc.go +++ b/pkg/apps/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/apps/generated/internalclientset/scheme/doc.go b/pkg/apps/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/apps/generated/internalclientset/scheme/doc.go +++ b/pkg/apps/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/apps/generated/internalclientset/typed/apps/internalversion/doc.go b/pkg/apps/generated/internalclientset/typed/apps/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/apps/generated/internalclientset/typed/apps/internalversion/doc.go +++ b/pkg/apps/generated/internalclientset/typed/apps/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/doc.go b/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/doc.go +++ b/pkg/apps/generated/internalclientset/typed/apps/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/authorization/apis/authorization/v1/zz_generated.conversion.go b/pkg/authorization/apis/authorization/v1/zz_generated.conversion.go index 2d3c27d92cbe..063971752b43 100644 --- a/pkg/authorization/apis/authorization/v1/zz_generated.conversion.go +++ b/pkg/authorization/apis/authorization/v1/zz_generated.conversion.go @@ -7,12 +7,12 @@ package v1 import ( v1 "github.com/openshift/api/authorization/v1" authorization "github.com/openshift/origin/pkg/authorization/apis/authorization" - core_v1 "k8s.io/api/core/v1" + api_core_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/apis/core" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" unsafe "unsafe" ) @@ -167,7 +167,7 @@ func Convert_authorization_ClusterPolicy_To_v1_ClusterPolicy(in *authorization.C func autoConvert_v1_ClusterPolicyBinding_To_authorization_ClusterPolicyBinding(in *v1.ClusterPolicyBinding, out *authorization.ClusterPolicyBinding, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta out.LastModified = in.LastModified - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { return err } if err := Convert_v1_NamedClusterRoleBindings_To_authorization_ClusterRoleBindingsByName(&in.RoleBindings, &out.RoleBindings, s); err != nil { @@ -179,7 +179,7 @@ func autoConvert_v1_ClusterPolicyBinding_To_authorization_ClusterPolicyBinding(i func autoConvert_authorization_ClusterPolicyBinding_To_v1_ClusterPolicyBinding(in *authorization.ClusterPolicyBinding, out *v1.ClusterPolicyBinding, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta out.LastModified = in.LastModified - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { return err } if err := Convert_authorization_ClusterRoleBindingsByName_To_v1_NamedClusterRoleBindings(&in.RoleBindings, &out.RoleBindings, s); err != nil { @@ -325,16 +325,16 @@ func autoConvert_v1_ClusterRoleBinding_To_authorization_ClusterRoleBinding(in *v // INFO: in.GroupNames opted out of conversion generation if in.Subjects != nil { in, out := &in.Subjects, &out.Subjects - *out = make([]api.ObjectReference, len(*in)) + *out = make([]core.ObjectReference, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { return err } } } else { out.Subjects = nil } - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { return err } return nil @@ -344,16 +344,16 @@ func autoConvert_authorization_ClusterRoleBinding_To_v1_ClusterRoleBinding(in *a out.ObjectMeta = in.ObjectMeta if in.Subjects != nil { in, out := &in.Subjects, &out.Subjects - *out = make([]core_v1.ObjectReference, len(*in)) + *out = make([]api_core_v1.ObjectReference, len(*in)) for i := range *in { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { return err } } } else { out.Subjects = nil } - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { return err } return nil @@ -553,7 +553,7 @@ func Convert_authorization_Policy_To_v1_Policy(in *authorization.Policy, out *v1 func autoConvert_v1_PolicyBinding_To_authorization_PolicyBinding(in *v1.PolicyBinding, out *authorization.PolicyBinding, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta out.LastModified = in.LastModified - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { return err } if err := Convert_v1_NamedRoleBindings_To_authorization_RoleBindingsByName(&in.RoleBindings, &out.RoleBindings, s); err != nil { @@ -565,7 +565,7 @@ func autoConvert_v1_PolicyBinding_To_authorization_PolicyBinding(in *v1.PolicyBi func autoConvert_authorization_PolicyBinding_To_v1_PolicyBinding(in *authorization.PolicyBinding, out *v1.PolicyBinding, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta out.LastModified = in.LastModified - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.PolicyRef, &out.PolicyRef, s); err != nil { return err } if err := Convert_authorization_RoleBindingsByName_To_v1_NamedRoleBindings(&in.RoleBindings, &out.RoleBindings, s); err != nil { @@ -775,16 +775,16 @@ func autoConvert_v1_RoleBinding_To_authorization_RoleBinding(in *v1.RoleBinding, // INFO: in.GroupNames opted out of conversion generation if in.Subjects != nil { in, out := &in.Subjects, &out.Subjects - *out = make([]api.ObjectReference, len(*in)) + *out = make([]core.ObjectReference, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { return err } } } else { out.Subjects = nil } - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { return err } return nil @@ -794,16 +794,16 @@ func autoConvert_authorization_RoleBinding_To_v1_RoleBinding(in *authorization.R out.ObjectMeta = in.ObjectMeta if in.Subjects != nil { in, out := &in.Subjects, &out.Subjects - *out = make([]core_v1.ObjectReference, len(*in)) + *out = make([]api_core_v1.ObjectReference, len(*in)) for i := range *in { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&(*in)[i], &(*out)[i], s); err != nil { return err } } } else { out.Subjects = nil } - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.RoleRef, &out.RoleRef, s); err != nil { return err } return nil diff --git a/pkg/authorization/apis/authorization/zz_generated.deepcopy.go b/pkg/authorization/apis/authorization/zz_generated.deepcopy.go index 144584a87338..4fd44150e4f1 100644 --- a/pkg/authorization/apis/authorization/zz_generated.deepcopy.go +++ b/pkg/authorization/apis/authorization/zz_generated.deepcopy.go @@ -6,207 +6,12 @@ package authorization import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" sets "k8s.io/apimachinery/pkg/util/sets" - api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Action).DeepCopyInto(out.(*Action)) - return nil - }, InType: reflect.TypeOf(new(Action))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterPolicy).DeepCopyInto(out.(*ClusterPolicy)) - return nil - }, InType: reflect.TypeOf(new(ClusterPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterPolicyBinding).DeepCopyInto(out.(*ClusterPolicyBinding)) - return nil - }, InType: reflect.TypeOf(new(ClusterPolicyBinding))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterPolicyBindingList).DeepCopyInto(out.(*ClusterPolicyBindingList)) - return nil - }, InType: reflect.TypeOf(new(ClusterPolicyBindingList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterPolicyList).DeepCopyInto(out.(*ClusterPolicyList)) - return nil - }, InType: reflect.TypeOf(new(ClusterPolicyList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterRole).DeepCopyInto(out.(*ClusterRole)) - return nil - }, InType: reflect.TypeOf(new(ClusterRole))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterRoleBinding).DeepCopyInto(out.(*ClusterRoleBinding)) - return nil - }, InType: reflect.TypeOf(new(ClusterRoleBinding))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterRoleBindingList).DeepCopyInto(out.(*ClusterRoleBindingList)) - return nil - }, InType: reflect.TypeOf(new(ClusterRoleBindingList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterRoleBindingsByName).DeepCopyInto(out.(*ClusterRoleBindingsByName)) - return nil - }, InType: reflect.TypeOf(new(ClusterRoleBindingsByName))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterRoleList).DeepCopyInto(out.(*ClusterRoleList)) - return nil - }, InType: reflect.TypeOf(new(ClusterRoleList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterRolesByName).DeepCopyInto(out.(*ClusterRolesByName)) - return nil - }, InType: reflect.TypeOf(new(ClusterRolesByName))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GroupRestriction).DeepCopyInto(out.(*GroupRestriction)) - return nil - }, InType: reflect.TypeOf(new(GroupRestriction))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*IsPersonalSubjectAccessReview).DeepCopyInto(out.(*IsPersonalSubjectAccessReview)) - return nil - }, InType: reflect.TypeOf(new(IsPersonalSubjectAccessReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LocalResourceAccessReview).DeepCopyInto(out.(*LocalResourceAccessReview)) - return nil - }, InType: reflect.TypeOf(new(LocalResourceAccessReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LocalSubjectAccessReview).DeepCopyInto(out.(*LocalSubjectAccessReview)) - return nil - }, InType: reflect.TypeOf(new(LocalSubjectAccessReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Policy).DeepCopyInto(out.(*Policy)) - return nil - }, InType: reflect.TypeOf(new(Policy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyBinding).DeepCopyInto(out.(*PolicyBinding)) - return nil - }, InType: reflect.TypeOf(new(PolicyBinding))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyBindingList).DeepCopyInto(out.(*PolicyBindingList)) - return nil - }, InType: reflect.TypeOf(new(PolicyBindingList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyBindingSorter).DeepCopyInto(out.(*PolicyBindingSorter)) - return nil - }, InType: reflect.TypeOf(new(PolicyBindingSorter))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyList).DeepCopyInto(out.(*PolicyList)) - return nil - }, InType: reflect.TypeOf(new(PolicyList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyRule).DeepCopyInto(out.(*PolicyRule)) - return nil - }, InType: reflect.TypeOf(new(PolicyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyRuleBuilder).DeepCopyInto(out.(*PolicyRuleBuilder)) - return nil - }, InType: reflect.TypeOf(new(PolicyRuleBuilder))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ResourceAccessReview).DeepCopyInto(out.(*ResourceAccessReview)) - return nil - }, InType: reflect.TypeOf(new(ResourceAccessReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ResourceAccessReviewResponse).DeepCopyInto(out.(*ResourceAccessReviewResponse)) - return nil - }, InType: reflect.TypeOf(new(ResourceAccessReviewResponse))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Role).DeepCopyInto(out.(*Role)) - return nil - }, InType: reflect.TypeOf(new(Role))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleBinding).DeepCopyInto(out.(*RoleBinding)) - return nil - }, InType: reflect.TypeOf(new(RoleBinding))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleBindingList).DeepCopyInto(out.(*RoleBindingList)) - return nil - }, InType: reflect.TypeOf(new(RoleBindingList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleBindingRestriction).DeepCopyInto(out.(*RoleBindingRestriction)) - return nil - }, InType: reflect.TypeOf(new(RoleBindingRestriction))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleBindingRestrictionList).DeepCopyInto(out.(*RoleBindingRestrictionList)) - return nil - }, InType: reflect.TypeOf(new(RoleBindingRestrictionList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleBindingRestrictionSpec).DeepCopyInto(out.(*RoleBindingRestrictionSpec)) - return nil - }, InType: reflect.TypeOf(new(RoleBindingRestrictionSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleBindingSorter).DeepCopyInto(out.(*RoleBindingSorter)) - return nil - }, InType: reflect.TypeOf(new(RoleBindingSorter))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleBindingsByName).DeepCopyInto(out.(*RoleBindingsByName)) - return nil - }, InType: reflect.TypeOf(new(RoleBindingsByName))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoleList).DeepCopyInto(out.(*RoleList)) - return nil - }, InType: reflect.TypeOf(new(RoleList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RolesByName).DeepCopyInto(out.(*RolesByName)) - return nil - }, InType: reflect.TypeOf(new(RolesByName))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SelfSubjectRulesReview).DeepCopyInto(out.(*SelfSubjectRulesReview)) - return nil - }, InType: reflect.TypeOf(new(SelfSubjectRulesReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SelfSubjectRulesReviewSpec).DeepCopyInto(out.(*SelfSubjectRulesReviewSpec)) - return nil - }, InType: reflect.TypeOf(new(SelfSubjectRulesReviewSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServiceAccountReference).DeepCopyInto(out.(*ServiceAccountReference)) - return nil - }, InType: reflect.TypeOf(new(ServiceAccountReference))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServiceAccountRestriction).DeepCopyInto(out.(*ServiceAccountRestriction)) - return nil - }, InType: reflect.TypeOf(new(ServiceAccountRestriction))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SortableRuleSlice).DeepCopyInto(out.(*SortableRuleSlice)) - return nil - }, InType: reflect.TypeOf(new(SortableRuleSlice))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SubjectAccessReview).DeepCopyInto(out.(*SubjectAccessReview)) - return nil - }, InType: reflect.TypeOf(new(SubjectAccessReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SubjectAccessReviewResponse).DeepCopyInto(out.(*SubjectAccessReviewResponse)) - return nil - }, InType: reflect.TypeOf(new(SubjectAccessReviewResponse))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SubjectRulesReview).DeepCopyInto(out.(*SubjectRulesReview)) - return nil - }, InType: reflect.TypeOf(new(SubjectRulesReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SubjectRulesReviewSpec).DeepCopyInto(out.(*SubjectRulesReviewSpec)) - return nil - }, InType: reflect.TypeOf(new(SubjectRulesReviewSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SubjectRulesReviewStatus).DeepCopyInto(out.(*SubjectRulesReviewStatus)) - return nil - }, InType: reflect.TypeOf(new(SubjectRulesReviewStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserRestriction).DeepCopyInto(out.(*UserRestriction)) - return nil - }, InType: reflect.TypeOf(new(UserRestriction))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Action) DeepCopyInto(out *Action) { *out = *in @@ -418,7 +223,7 @@ func (in *ClusterRoleBinding) DeepCopyInto(out *ClusterRoleBinding) { in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) if in.Subjects != nil { in, out := &in.Subjects, &out.Subjects - *out = make([]api.ObjectReference, len(*in)) + *out = make([]core.ObjectReference, len(*in)) copy(*out, *in) } out.RoleRef = in.RoleRef @@ -1039,7 +844,7 @@ func (in *RoleBinding) DeepCopyInto(out *RoleBinding) { in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) if in.Subjects != nil { in, out := &in.Subjects, &out.Subjects - *out = make([]api.ObjectReference, len(*in)) + *out = make([]core.ObjectReference, len(*in)) copy(*out, *in) } out.RoleRef = in.RoleRef diff --git a/pkg/authorization/generated/informers/internalversion/authorization/interface.go b/pkg/authorization/generated/informers/internalversion/authorization/interface.go index 38ec2dd2eae9..c00dd93c9074 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/interface.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicy.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicy.go index edf660bc641a..c345e7ee5537 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicy.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicy.go @@ -22,19 +22,33 @@ type ClusterPolicyInformer interface { } type clusterPolicyInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewClusterPolicyInformer constructs a new informer for ClusterPolicy type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewClusterPolicyInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredClusterPolicyInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredClusterPolicyInformer constructs a new informer for ClusterPolicy type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredClusterPolicyInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterPolicies().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterPolicies().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewClusterPolicyInformer(client internalclientset.Interface, resyncPeriod t ) } -func defaultClusterPolicyInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewClusterPolicyInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *clusterPolicyInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredClusterPolicyInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *clusterPolicyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.ClusterPolicy{}, defaultClusterPolicyInformer) + return f.factory.InformerFor(&authorization.ClusterPolicy{}, f.defaultInformer) } func (f *clusterPolicyInformer) Lister() internalversion.ClusterPolicyLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicybinding.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicybinding.go index 751e86f1343f..64045056fa01 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicybinding.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterpolicybinding.go @@ -22,19 +22,33 @@ type ClusterPolicyBindingInformer interface { } type clusterPolicyBindingInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewClusterPolicyBindingInformer constructs a new informer for ClusterPolicyBinding type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewClusterPolicyBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredClusterPolicyBindingInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredClusterPolicyBindingInformer constructs a new informer for ClusterPolicyBinding type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredClusterPolicyBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterPolicyBindings().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterPolicyBindings().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewClusterPolicyBindingInformer(client internalclientset.Interface, resyncP ) } -func defaultClusterPolicyBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewClusterPolicyBindingInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *clusterPolicyBindingInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredClusterPolicyBindingInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *clusterPolicyBindingInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.ClusterPolicyBinding{}, defaultClusterPolicyBindingInformer) + return f.factory.InformerFor(&authorization.ClusterPolicyBinding{}, f.defaultInformer) } func (f *clusterPolicyBindingInformer) Lister() internalversion.ClusterPolicyBindingLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrole.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrole.go index 4f2be43a14f6..471288ea8919 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrole.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrole.go @@ -22,19 +22,33 @@ type ClusterRoleInformer interface { } type clusterRoleInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewClusterRoleInformer constructs a new informer for ClusterRole type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewClusterRoleInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredClusterRoleInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredClusterRoleInformer constructs a new informer for ClusterRole type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredClusterRoleInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterRoles().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterRoles().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewClusterRoleInformer(client internalclientset.Interface, resyncPeriod tim ) } -func defaultClusterRoleInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewClusterRoleInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *clusterRoleInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredClusterRoleInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *clusterRoleInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.ClusterRole{}, defaultClusterRoleInformer) + return f.factory.InformerFor(&authorization.ClusterRole{}, f.defaultInformer) } func (f *clusterRoleInformer) Lister() internalversion.ClusterRoleLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrolebinding.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrolebinding.go index 319c3ab65501..56eb709094d8 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrolebinding.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/clusterrolebinding.go @@ -22,19 +22,33 @@ type ClusterRoleBindingInformer interface { } type clusterRoleBindingInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewClusterRoleBindingInformer constructs a new informer for ClusterRoleBinding type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewClusterRoleBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredClusterRoleBindingInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredClusterRoleBindingInformer constructs a new informer for ClusterRoleBinding type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredClusterRoleBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterRoleBindings().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().ClusterRoleBindings().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewClusterRoleBindingInformer(client internalclientset.Interface, resyncPer ) } -func defaultClusterRoleBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewClusterRoleBindingInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *clusterRoleBindingInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredClusterRoleBindingInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *clusterRoleBindingInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.ClusterRoleBinding{}, defaultClusterRoleBindingInformer) + return f.factory.InformerFor(&authorization.ClusterRoleBinding{}, f.defaultInformer) } func (f *clusterRoleBindingInformer) Lister() internalversion.ClusterRoleBindingLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/interface.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/interface.go index 49244f834309..01aae552d795 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/interface.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/interface.go @@ -29,55 +29,57 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // ClusterPolicies returns a ClusterPolicyInformer. func (v *version) ClusterPolicies() ClusterPolicyInformer { - return &clusterPolicyInformer{factory: v.SharedInformerFactory} + return &clusterPolicyInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // ClusterPolicyBindings returns a ClusterPolicyBindingInformer. func (v *version) ClusterPolicyBindings() ClusterPolicyBindingInformer { - return &clusterPolicyBindingInformer{factory: v.SharedInformerFactory} + return &clusterPolicyBindingInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // ClusterRoles returns a ClusterRoleInformer. func (v *version) ClusterRoles() ClusterRoleInformer { - return &clusterRoleInformer{factory: v.SharedInformerFactory} + return &clusterRoleInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // ClusterRoleBindings returns a ClusterRoleBindingInformer. func (v *version) ClusterRoleBindings() ClusterRoleBindingInformer { - return &clusterRoleBindingInformer{factory: v.SharedInformerFactory} + return &clusterRoleBindingInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // Policies returns a PolicyInformer. func (v *version) Policies() PolicyInformer { - return &policyInformer{factory: v.SharedInformerFactory} + return &policyInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // PolicyBindings returns a PolicyBindingInformer. func (v *version) PolicyBindings() PolicyBindingInformer { - return &policyBindingInformer{factory: v.SharedInformerFactory} + return &policyBindingInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // Roles returns a RoleInformer. func (v *version) Roles() RoleInformer { - return &roleInformer{factory: v.SharedInformerFactory} + return &roleInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // RoleBindings returns a RoleBindingInformer. func (v *version) RoleBindings() RoleBindingInformer { - return &roleBindingInformer{factory: v.SharedInformerFactory} + return &roleBindingInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // RoleBindingRestrictions returns a RoleBindingRestrictionInformer. func (v *version) RoleBindingRestrictions() RoleBindingRestrictionInformer { - return &roleBindingRestrictionInformer{factory: v.SharedInformerFactory} + return &roleBindingRestrictionInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policy.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policy.go index 3c5f1b293629..623ecd9c4251 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policy.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policy.go @@ -22,19 +22,34 @@ type PolicyInformer interface { } type policyInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewPolicyInformer constructs a new informer for Policy type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewPolicyInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredPolicyInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredPolicyInformer constructs a new informer for Policy type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredPolicyInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().Policies(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().Policies(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewPolicyInformer(client internalclientset.Interface, namespace string, res ) } -func defaultPolicyInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewPolicyInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *policyInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredPolicyInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *policyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.Policy{}, defaultPolicyInformer) + return f.factory.InformerFor(&authorization.Policy{}, f.defaultInformer) } func (f *policyInformer) Lister() internalversion.PolicyLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policybinding.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policybinding.go index b424823d511f..9096ea25315e 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policybinding.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/policybinding.go @@ -22,19 +22,34 @@ type PolicyBindingInformer interface { } type policyBindingInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewPolicyBindingInformer constructs a new informer for PolicyBinding type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewPolicyBindingInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredPolicyBindingInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredPolicyBindingInformer constructs a new informer for PolicyBinding type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredPolicyBindingInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().PolicyBindings(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().PolicyBindings(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewPolicyBindingInformer(client internalclientset.Interface, namespace stri ) } -func defaultPolicyBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewPolicyBindingInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *policyBindingInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredPolicyBindingInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *policyBindingInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.PolicyBinding{}, defaultPolicyBindingInformer) + return f.factory.InformerFor(&authorization.PolicyBinding{}, f.defaultInformer) } func (f *policyBindingInformer) Lister() internalversion.PolicyBindingLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/role.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/role.go index 95b1a5d91511..9559a887ff16 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/role.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/role.go @@ -22,19 +22,34 @@ type RoleInformer interface { } type roleInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewRoleInformer constructs a new informer for Role type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewRoleInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredRoleInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredRoleInformer constructs a new informer for Role type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredRoleInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().Roles(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().Roles(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewRoleInformer(client internalclientset.Interface, namespace string, resyn ) } -func defaultRoleInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewRoleInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *roleInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredRoleInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *roleInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.Role{}, defaultRoleInformer) + return f.factory.InformerFor(&authorization.Role{}, f.defaultInformer) } func (f *roleInformer) Lister() internalversion.RoleLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebinding.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebinding.go index f20db20d6b5e..bfcfa1aa879d 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebinding.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebinding.go @@ -22,19 +22,34 @@ type RoleBindingInformer interface { } type roleBindingInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewRoleBindingInformer constructs a new informer for RoleBinding type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewRoleBindingInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredRoleBindingInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredRoleBindingInformer constructs a new informer for RoleBinding type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredRoleBindingInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().RoleBindings(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().RoleBindings(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewRoleBindingInformer(client internalclientset.Interface, namespace string ) } -func defaultRoleBindingInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewRoleBindingInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *roleBindingInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredRoleBindingInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *roleBindingInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.RoleBinding{}, defaultRoleBindingInformer) + return f.factory.InformerFor(&authorization.RoleBinding{}, f.defaultInformer) } func (f *roleBindingInformer) Lister() internalversion.RoleBindingLister { diff --git a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebindingrestriction.go b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebindingrestriction.go index f5f8f6ed17b4..9ca98ed2a207 100644 --- a/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebindingrestriction.go +++ b/pkg/authorization/generated/informers/internalversion/authorization/internalversion/rolebindingrestriction.go @@ -22,19 +22,34 @@ type RoleBindingRestrictionInformer interface { } type roleBindingRestrictionInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewRoleBindingRestrictionInformer constructs a new informer for RoleBindingRestriction type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewRoleBindingRestrictionInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredRoleBindingRestrictionInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredRoleBindingRestrictionInformer constructs a new informer for RoleBindingRestriction type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredRoleBindingRestrictionInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().RoleBindingRestrictions(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Authorization().RoleBindingRestrictions(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewRoleBindingRestrictionInformer(client internalclientset.Interface, names ) } -func defaultRoleBindingRestrictionInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewRoleBindingRestrictionInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *roleBindingRestrictionInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredRoleBindingRestrictionInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *roleBindingRestrictionInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&authorization.RoleBindingRestriction{}, defaultRoleBindingRestrictionInformer) + return f.factory.InformerFor(&authorization.RoleBindingRestriction{}, f.defaultInformer) } func (f *roleBindingRestrictionInformer) Lister() internalversion.RoleBindingRestrictionLister { diff --git a/pkg/authorization/generated/informers/internalversion/factory.go b/pkg/authorization/generated/informers/internalversion/factory.go index da2d796ed769..70f28cdf54a1 100644 --- a/pkg/authorization/generated/informers/internalversion/factory.go +++ b/pkg/authorization/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( authorization "github.com/openshift/origin/pkg/authorization/generated/informers/internalversion/authorization" internalinterfaces "github.com/openshift/origin/pkg/authorization/generated/informers/internalversion/internalinterfaces" internalclientset "github.com/openshift/origin/pkg/authorization/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Authorization() authorization.Interface { - return authorization.New(f) + return authorization.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/authorization/generated/informers/internalversion/generic.go b/pkg/authorization/generated/informers/internalversion/generic.go index bfbecaf4c6bf..b9b714c0e739 100644 --- a/pkg/authorization/generated/informers/internalversion/generic.go +++ b/pkg/authorization/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Authorization, Version=InternalVersion + // Group=authorization.openshift.io, Version=internalVersion case authorization.SchemeGroupVersion.WithResource("clusterpolicies"): return &genericInformer{resource: resource.GroupResource(), informer: f.Authorization().InternalVersion().ClusterPolicies().Informer()}, nil case authorization.SchemeGroupVersion.WithResource("clusterpolicybindings"): diff --git a/pkg/authorization/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/authorization/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index 6bb0c2b2c3ea..ab63883016df 100644 --- a/pkg/authorization/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/authorization/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/authorization/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/authorization/generated/internalclientset/doc.go b/pkg/authorization/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/authorization/generated/internalclientset/doc.go +++ b/pkg/authorization/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/authorization/generated/internalclientset/fake/doc.go b/pkg/authorization/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/authorization/generated/internalclientset/fake/doc.go +++ b/pkg/authorization/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/authorization/generated/internalclientset/scheme/doc.go b/pkg/authorization/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/authorization/generated/internalclientset/scheme/doc.go +++ b/pkg/authorization/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/doc.go b/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/doc.go +++ b/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/fake/doc.go b/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/fake/doc.go +++ b/pkg/authorization/generated/internalclientset/typed/authorization/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/build/admission/testing/zz_generated.deepcopy.go b/pkg/build/admission/testing/zz_generated.deepcopy.go index 8940beca3737..da5186d89c8d 100644 --- a/pkg/build/admission/testing/zz_generated.deepcopy.go +++ b/pkg/build/admission/testing/zz_generated.deepcopy.go @@ -5,35 +5,9 @@ package testing import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc { - return []conversion.GeneratedDeepCopyFunc{ - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OtherTestConfig2).DeepCopyInto(out.(*OtherTestConfig2)) - return nil - }, InType: reflect.TypeOf(new(OtherTestConfig2))}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OtherTestConfig2V2).DeepCopyInto(out.(*OtherTestConfig2V2)) - return nil - }, InType: reflect.TypeOf(new(OtherTestConfig2V2))}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TestConfig).DeepCopyInto(out.(*TestConfig)) - return nil - }, InType: reflect.TypeOf(new(TestConfig))}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TestConfigV1).DeepCopyInto(out.(*TestConfigV1)) - return nil - }, InType: reflect.TypeOf(new(TestConfigV1))}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OtherTestConfig2) DeepCopyInto(out *OtherTestConfig2) { *out = *in diff --git a/pkg/build/apis/build/v1/zz_generated.conversion.go b/pkg/build/apis/build/v1/zz_generated.conversion.go index ff9dc5596242..82d9539892bc 100644 --- a/pkg/build/apis/build/v1/zz_generated.conversion.go +++ b/pkg/build/apis/build/v1/zz_generated.conversion.go @@ -7,12 +7,12 @@ package v1 import ( v1 "github.com/openshift/api/build/v1" build "github.com/openshift/origin/pkg/build/apis/build" - core_v1 "k8s.io/api/core/v1" + api_core_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/apis/core" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" time "time" unsafe "unsafe" ) @@ -109,6 +109,8 @@ func RegisterConversions(scheme *runtime.Scheme) error { Convert_build_ProxyConfig_To_v1_ProxyConfig, Convert_v1_SecretBuildSource_To_build_SecretBuildSource, Convert_build_SecretBuildSource_To_v1_SecretBuildSource, + Convert_v1_SecretLocalReference_To_build_SecretLocalReference, + Convert_build_SecretLocalReference_To_v1_SecretLocalReference, Convert_v1_SecretSpec_To_build_SecretSpec, Convert_build_SecretSpec_To_v1_SecretSpec, Convert_v1_SourceBuildStrategy_To_build_SourceBuildStrategy, @@ -480,8 +482,8 @@ func Convert_build_BuildLogOptions_To_v1_BuildLogOptions(in *build.BuildLogOptio func autoConvert_v1_BuildOutput_To_build_BuildOutput(in *v1.BuildOutput, out *build.BuildOutput, s conversion.Scope) error { if in.To != nil { in, out := &in.To, &out.To - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -489,8 +491,8 @@ func autoConvert_v1_BuildOutput_To_build_BuildOutput(in *v1.BuildOutput, out *bu } if in.PushSecret != nil { in, out := &in.PushSecret, &out.PushSecret - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -503,8 +505,8 @@ func autoConvert_v1_BuildOutput_To_build_BuildOutput(in *v1.BuildOutput, out *bu func autoConvert_build_BuildOutput_To_v1_BuildOutput(in *build.BuildOutput, out *v1.BuildOutput, s conversion.Scope) error { if in.To != nil { in, out := &in.To, &out.To - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -512,8 +514,8 @@ func autoConvert_build_BuildOutput_To_v1_BuildOutput(in *build.BuildOutput, out } if in.PushSecret != nil { in, out := &in.PushSecret, &out.PushSecret - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -565,8 +567,8 @@ func autoConvert_v1_BuildRequest_To_build_BuildRequest(in *v1.BuildRequest, out } if in.TriggeredByImage != nil { in, out := &in.TriggeredByImage, &out.TriggeredByImage - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -574,8 +576,8 @@ func autoConvert_v1_BuildRequest_To_build_BuildRequest(in *v1.BuildRequest, out } if in.From != nil { in, out := &in.From, &out.From - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -585,9 +587,9 @@ func autoConvert_v1_BuildRequest_To_build_BuildRequest(in *v1.BuildRequest, out out.LastVersion = (*int64)(unsafe.Pointer(in.LastVersion)) if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -636,8 +638,8 @@ func autoConvert_build_BuildRequest_To_v1_BuildRequest(in *build.BuildRequest, o } if in.TriggeredByImage != nil { in, out := &in.TriggeredByImage, &out.TriggeredByImage - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -645,8 +647,8 @@ func autoConvert_build_BuildRequest_To_v1_BuildRequest(in *build.BuildRequest, o } if in.From != nil { in, out := &in.From, &out.From - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -656,9 +658,9 @@ func autoConvert_build_BuildRequest_To_v1_BuildRequest(in *build.BuildRequest, o out.LastVersion = (*int64)(unsafe.Pointer(in.LastVersion)) if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -713,8 +715,8 @@ func autoConvert_v1_BuildSource_To_build_BuildSource(in *v1.BuildSource, out *bu out.ContextDir = in.ContextDir if in.SourceSecret != nil { in, out := &in.SourceSecret, &out.SourceSecret - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -757,8 +759,8 @@ func autoConvert_build_BuildSource_To_v1_BuildSource(in *build.BuildSource, out out.ContextDir = in.ContextDir if in.SourceSecret != nil { in, out := &in.SourceSecret, &out.SourceSecret - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -835,8 +837,8 @@ func autoConvert_v1_BuildStatus_To_build_BuildStatus(in *v1.BuildStatus, out *bu out.OutputDockerImageReference = in.OutputDockerImageReference if in.Config != nil { in, out := &in.Config, &out.Config - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -866,8 +868,8 @@ func autoConvert_build_BuildStatus_To_v1_BuildStatus(in *build.BuildStatus, out out.OutputDockerImageReference = in.OutputDockerImageReference if in.Config != nil { in, out := &in.Config, &out.Config - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1183,7 +1185,7 @@ func autoConvert_v1_CommonSpec_To_build_CommonSpec(in *v1.CommonSpec, out *build if err := Convert_v1_BuildOutput_To_build_BuildOutput(&in.Output, &out.Output, s); err != nil { return err } - if err := api_v1.Convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { + if err := core_v1.Convert_v1_ResourceRequirements_To_core_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } if err := Convert_v1_BuildPostCommitSpec_To_build_BuildPostCommitSpec(&in.PostCommit, &out.PostCommit, s); err != nil { @@ -1219,7 +1221,7 @@ func autoConvert_build_CommonSpec_To_v1_CommonSpec(in *build.CommonSpec, out *v1 if err := Convert_build_BuildOutput_To_v1_BuildOutput(&in.Output, &out.Output, s); err != nil { return err } - if err := api_v1.Convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { + if err := core_v1.Convert_core_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } if err := Convert_build_BuildPostCommitSpec_To_v1_BuildPostCommitSpec(&in.PostCommit, &out.PostCommit, s); err != nil { @@ -1274,13 +1276,13 @@ func Convert_build_CommonWebHookCause_To_v1_CommonWebHookCause(in *build.CommonW } func autoConvert_v1_CustomBuildStrategy_To_build_CustomBuildStrategy(in *v1.CustomBuildStrategy, out *build.CustomBuildStrategy, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1288,9 +1290,9 @@ func autoConvert_v1_CustomBuildStrategy_To_build_CustomBuildStrategy(in *v1.Cust } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1315,13 +1317,13 @@ func autoConvert_v1_CustomBuildStrategy_To_build_CustomBuildStrategy(in *v1.Cust } func autoConvert_build_CustomBuildStrategy_To_v1_CustomBuildStrategy(in *build.CustomBuildStrategy, out *v1.CustomBuildStrategy, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1329,9 +1331,9 @@ func autoConvert_build_CustomBuildStrategy_To_v1_CustomBuildStrategy(in *build.C } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1363,8 +1365,8 @@ func Convert_build_CustomBuildStrategy_To_v1_CustomBuildStrategy(in *build.Custo func autoConvert_v1_DockerBuildStrategy_To_build_DockerBuildStrategy(in *v1.DockerBuildStrategy, out *build.DockerBuildStrategy, s conversion.Scope) error { if in.From != nil { in, out := &in.From, &out.From - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1372,8 +1374,8 @@ func autoConvert_v1_DockerBuildStrategy_To_build_DockerBuildStrategy(in *v1.Dock } if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1382,9 +1384,9 @@ func autoConvert_v1_DockerBuildStrategy_To_build_DockerBuildStrategy(in *v1.Dock out.NoCache = in.NoCache if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1395,9 +1397,9 @@ func autoConvert_v1_DockerBuildStrategy_To_build_DockerBuildStrategy(in *v1.Dock out.DockerfilePath = in.DockerfilePath if in.BuildArgs != nil { in, out := &in.BuildArgs, &out.BuildArgs - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1411,8 +1413,8 @@ func autoConvert_v1_DockerBuildStrategy_To_build_DockerBuildStrategy(in *v1.Dock func autoConvert_build_DockerBuildStrategy_To_v1_DockerBuildStrategy(in *build.DockerBuildStrategy, out *v1.DockerBuildStrategy, s conversion.Scope) error { if in.From != nil { in, out := &in.From, &out.From - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1420,8 +1422,8 @@ func autoConvert_build_DockerBuildStrategy_To_v1_DockerBuildStrategy(in *build.D } if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1430,9 +1432,9 @@ func autoConvert_build_DockerBuildStrategy_To_v1_DockerBuildStrategy(in *build.D out.NoCache = in.NoCache if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1441,9 +1443,9 @@ func autoConvert_build_DockerBuildStrategy_To_v1_DockerBuildStrategy(in *build.D } if in.BuildArgs != nil { in, out := &in.BuildArgs, &out.BuildArgs - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1464,9 +1466,9 @@ func Convert_build_DockerBuildStrategy_To_v1_DockerBuildStrategy(in *build.Docke func autoConvert_v1_DockerStrategyOptions_To_build_DockerStrategyOptions(in *v1.DockerStrategyOptions, out *build.DockerStrategyOptions, s conversion.Scope) error { if in.BuildArgs != nil { in, out := &in.BuildArgs, &out.BuildArgs - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1485,9 +1487,9 @@ func Convert_v1_DockerStrategyOptions_To_build_DockerStrategyOptions(in *v1.Dock func autoConvert_build_DockerStrategyOptions_To_v1_DockerStrategyOptions(in *build.DockerStrategyOptions, out *v1.DockerStrategyOptions, s conversion.Scope) error { if in.BuildArgs != nil { in, out := &in.BuildArgs, &out.BuildArgs - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1554,9 +1556,9 @@ func autoConvert_v1_GenericWebHookEvent_To_build_GenericWebHookEvent(in *v1.Gene } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1592,9 +1594,9 @@ func autoConvert_build_GenericWebHookEvent_To_v1_GenericWebHookEvent(in *build.G } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1777,8 +1779,8 @@ func autoConvert_v1_ImageChangeCause_To_build_ImageChangeCause(in *v1.ImageChang out.ImageID = in.ImageID if in.FromRef != nil { in, out := &in.FromRef, &out.FromRef - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1796,8 +1798,8 @@ func autoConvert_build_ImageChangeCause_To_v1_ImageChangeCause(in *build.ImageCh out.ImageID = in.ImageID if in.FromRef != nil { in, out := &in.FromRef, &out.FromRef - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1815,8 +1817,8 @@ func autoConvert_v1_ImageChangeTrigger_To_build_ImageChangeTrigger(in *v1.ImageC out.LastTriggeredImageID = in.LastTriggeredImageID if in.From != nil { in, out := &in.From, &out.From - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1834,8 +1836,8 @@ func autoConvert_build_ImageChangeTrigger_To_v1_ImageChangeTrigger(in *build.Ima out.LastTriggeredImageID = in.LastTriggeredImageID if in.From != nil { in, out := &in.From, &out.From - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1872,14 +1874,14 @@ func Convert_build_ImageLabel_To_v1_ImageLabel(in *build.ImageLabel, out *v1.Ima } func autoConvert_v1_ImageSource_To_build_ImageSource(in *v1.ImageSource, out *build.ImageSource, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } out.Paths = *(*[]build.ImageSourcePath)(unsafe.Pointer(&in.Paths)) if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1894,14 +1896,14 @@ func Convert_v1_ImageSource_To_build_ImageSource(in *v1.ImageSource, out *build. } func autoConvert_build_ImageSource_To_v1_ImageSource(in *build.ImageSource, out *v1.ImageSource, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } out.Paths = *(*[]v1.ImageSourcePath)(unsafe.Pointer(&in.Paths)) if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1942,9 +1944,9 @@ func autoConvert_v1_JenkinsPipelineBuildStrategy_To_build_JenkinsPipelineBuildSt out.Jenkinsfile = in.Jenkinsfile if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1964,9 +1966,9 @@ func autoConvert_build_JenkinsPipelineBuildStrategy_To_v1_JenkinsPipelineBuildSt out.Jenkinsfile = in.Jenkinsfile if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -2006,7 +2008,7 @@ func Convert_build_ProxyConfig_To_v1_ProxyConfig(in *build.ProxyConfig, out *v1. } func autoConvert_v1_SecretBuildSource_To_build_SecretBuildSource(in *v1.SecretBuildSource, out *build.SecretBuildSource, s conversion.Scope) error { - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.Secret, &out.Secret, s); err != nil { + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(&in.Secret, &out.Secret, s); err != nil { return err } out.DestinationDir = in.DestinationDir @@ -2019,7 +2021,7 @@ func Convert_v1_SecretBuildSource_To_build_SecretBuildSource(in *v1.SecretBuildS } func autoConvert_build_SecretBuildSource_To_v1_SecretBuildSource(in *build.SecretBuildSource, out *v1.SecretBuildSource, s conversion.Scope) error { - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.Secret, &out.Secret, s); err != nil { + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(&in.Secret, &out.Secret, s); err != nil { return err } out.DestinationDir = in.DestinationDir @@ -2031,8 +2033,28 @@ func Convert_build_SecretBuildSource_To_v1_SecretBuildSource(in *build.SecretBui return autoConvert_build_SecretBuildSource_To_v1_SecretBuildSource(in, out, s) } +func autoConvert_v1_SecretLocalReference_To_build_SecretLocalReference(in *v1.SecretLocalReference, out *build.SecretLocalReference, s conversion.Scope) error { + out.Name = in.Name + return nil +} + +// Convert_v1_SecretLocalReference_To_build_SecretLocalReference is an autogenerated conversion function. +func Convert_v1_SecretLocalReference_To_build_SecretLocalReference(in *v1.SecretLocalReference, out *build.SecretLocalReference, s conversion.Scope) error { + return autoConvert_v1_SecretLocalReference_To_build_SecretLocalReference(in, out, s) +} + +func autoConvert_build_SecretLocalReference_To_v1_SecretLocalReference(in *build.SecretLocalReference, out *v1.SecretLocalReference, s conversion.Scope) error { + out.Name = in.Name + return nil +} + +// Convert_build_SecretLocalReference_To_v1_SecretLocalReference is an autogenerated conversion function. +func Convert_build_SecretLocalReference_To_v1_SecretLocalReference(in *build.SecretLocalReference, out *v1.SecretLocalReference, s conversion.Scope) error { + return autoConvert_build_SecretLocalReference_To_v1_SecretLocalReference(in, out, s) +} + func autoConvert_v1_SecretSpec_To_build_SecretSpec(in *v1.SecretSpec, out *build.SecretSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(&in.SecretSource, &out.SecretSource, s); err != nil { + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(&in.SecretSource, &out.SecretSource, s); err != nil { return err } out.MountPath = in.MountPath @@ -2045,7 +2067,7 @@ func Convert_v1_SecretSpec_To_build_SecretSpec(in *v1.SecretSpec, out *build.Sec } func autoConvert_build_SecretSpec_To_v1_SecretSpec(in *build.SecretSpec, out *v1.SecretSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(&in.SecretSource, &out.SecretSource, s); err != nil { + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(&in.SecretSource, &out.SecretSource, s); err != nil { return err } out.MountPath = in.MountPath @@ -2058,13 +2080,13 @@ func Convert_build_SecretSpec_To_v1_SecretSpec(in *build.SecretSpec, out *v1.Sec } func autoConvert_v1_SourceBuildStrategy_To_build_SourceBuildStrategy(in *v1.SourceBuildStrategy, out *build.SourceBuildStrategy, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -2072,9 +2094,9 @@ func autoConvert_v1_SourceBuildStrategy_To_build_SourceBuildStrategy(in *v1.Sour } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_v1_EnvVar_To_api_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_v1_EnvVar_To_core_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -2088,13 +2110,13 @@ func autoConvert_v1_SourceBuildStrategy_To_build_SourceBuildStrategy(in *v1.Sour } func autoConvert_build_SourceBuildStrategy_To_v1_SourceBuildStrategy(in *build.SourceBuildStrategy, out *v1.SourceBuildStrategy, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } if in.PullSecret != nil { in, out := &in.PullSecret, &out.PullSecret - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -2102,9 +2124,9 @@ func autoConvert_build_SourceBuildStrategy_To_v1_SourceBuildStrategy(in *build.S } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]core_v1.EnvVar, len(*in)) + *out = make([]api_core_v1.EnvVar, len(*in)) for i := range *in { - if err := api_v1.Convert_api_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { + if err := core_v1.Convert_core_EnvVar_To_v1_EnvVar(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -2233,6 +2255,7 @@ func Convert_build_StepInfo_To_v1_StepInfo(in *build.StepInfo, out *v1.StepInfo, func autoConvert_v1_WebHookTrigger_To_build_WebHookTrigger(in *v1.WebHookTrigger, out *build.WebHookTrigger, s conversion.Scope) error { out.Secret = in.Secret out.AllowEnv = in.AllowEnv + out.SecretReference = (*build.SecretLocalReference)(unsafe.Pointer(in.SecretReference)) return nil } @@ -2244,6 +2267,7 @@ func Convert_v1_WebHookTrigger_To_build_WebHookTrigger(in *v1.WebHookTrigger, ou func autoConvert_build_WebHookTrigger_To_v1_WebHookTrigger(in *build.WebHookTrigger, out *v1.WebHookTrigger, s conversion.Scope) error { out.Secret = in.Secret out.AllowEnv = in.AllowEnv + out.SecretReference = (*v1.SecretLocalReference)(unsafe.Pointer(in.SecretReference)) return nil } diff --git a/pkg/build/apis/build/v1/zz_generated.defaults.go b/pkg/build/apis/build/v1/zz_generated.defaults.go index 30450396357b..e2b67f2c5e2c 100644 --- a/pkg/build/apis/build/v1/zz_generated.defaults.go +++ b/pkg/build/apis/build/v1/zz_generated.defaults.go @@ -7,7 +7,7 @@ package v1 import ( v1 "github.com/openshift/api/build/v1" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -31,7 +31,7 @@ func SetObjectDefaults_Build(in *v1.Build) { a := &in.Spec.CommonSpec.Strategy.DockerStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -39,7 +39,7 @@ func SetObjectDefaults_Build(in *v1.Build) { a := &in.Spec.CommonSpec.Strategy.DockerStrategy.BuildArgs[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -50,7 +50,7 @@ func SetObjectDefaults_Build(in *v1.Build) { a := &in.Spec.CommonSpec.Strategy.SourceStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -61,7 +61,7 @@ func SetObjectDefaults_Build(in *v1.Build) { a := &in.Spec.CommonSpec.Strategy.CustomStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -71,13 +71,13 @@ func SetObjectDefaults_Build(in *v1.Build) { a := &in.Spec.CommonSpec.Strategy.JenkinsPipelineStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } } - api_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Limits) - api_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Requests) + core_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Limits) + core_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Requests) } func SetObjectDefaults_BuildConfig(in *v1.BuildConfig) { @@ -94,7 +94,7 @@ func SetObjectDefaults_BuildConfig(in *v1.BuildConfig) { a := &in.Spec.CommonSpec.Strategy.DockerStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -102,7 +102,7 @@ func SetObjectDefaults_BuildConfig(in *v1.BuildConfig) { a := &in.Spec.CommonSpec.Strategy.DockerStrategy.BuildArgs[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -113,7 +113,7 @@ func SetObjectDefaults_BuildConfig(in *v1.BuildConfig) { a := &in.Spec.CommonSpec.Strategy.SourceStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -124,7 +124,7 @@ func SetObjectDefaults_BuildConfig(in *v1.BuildConfig) { a := &in.Spec.CommonSpec.Strategy.CustomStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -134,13 +134,13 @@ func SetObjectDefaults_BuildConfig(in *v1.BuildConfig) { a := &in.Spec.CommonSpec.Strategy.JenkinsPipelineStrategy.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } } - api_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Limits) - api_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Requests) + core_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Limits) + core_v1.SetDefaults_ResourceList(&in.Spec.CommonSpec.Resources.Requests) } func SetObjectDefaults_BuildConfigList(in *v1.BuildConfigList) { @@ -162,7 +162,7 @@ func SetObjectDefaults_BuildRequest(in *v1.BuildRequest) { a := &in.Env[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } @@ -171,7 +171,7 @@ func SetObjectDefaults_BuildRequest(in *v1.BuildRequest) { a := &in.DockerStrategyOptions.BuildArgs[i] if a.ValueFrom != nil { if a.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(a.ValueFrom.FieldRef) } } } diff --git a/pkg/build/apis/build/zz_generated.deepcopy.go b/pkg/build/apis/build/zz_generated.deepcopy.go index c1b303b5a08b..8c1a0cfed0f5 100644 --- a/pkg/build/apis/build/zz_generated.deepcopy.go +++ b/pkg/build/apis/build/zz_generated.deepcopy.go @@ -6,270 +6,11 @@ package build import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BinaryBuildRequestOptions).DeepCopyInto(out.(*BinaryBuildRequestOptions)) - return nil - }, InType: reflect.TypeOf(new(BinaryBuildRequestOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BinaryBuildSource).DeepCopyInto(out.(*BinaryBuildSource)) - return nil - }, InType: reflect.TypeOf(new(BinaryBuildSource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BitbucketWebHookCause).DeepCopyInto(out.(*BitbucketWebHookCause)) - return nil - }, InType: reflect.TypeOf(new(BitbucketWebHookCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Build).DeepCopyInto(out.(*Build)) - return nil - }, InType: reflect.TypeOf(new(Build))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildConfig).DeepCopyInto(out.(*BuildConfig)) - return nil - }, InType: reflect.TypeOf(new(BuildConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildConfigList).DeepCopyInto(out.(*BuildConfigList)) - return nil - }, InType: reflect.TypeOf(new(BuildConfigList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildConfigSpec).DeepCopyInto(out.(*BuildConfigSpec)) - return nil - }, InType: reflect.TypeOf(new(BuildConfigSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildConfigStatus).DeepCopyInto(out.(*BuildConfigStatus)) - return nil - }, InType: reflect.TypeOf(new(BuildConfigStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildList).DeepCopyInto(out.(*BuildList)) - return nil - }, InType: reflect.TypeOf(new(BuildList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildLog).DeepCopyInto(out.(*BuildLog)) - return nil - }, InType: reflect.TypeOf(new(BuildLog))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildLogOptions).DeepCopyInto(out.(*BuildLogOptions)) - return nil - }, InType: reflect.TypeOf(new(BuildLogOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildOutput).DeepCopyInto(out.(*BuildOutput)) - return nil - }, InType: reflect.TypeOf(new(BuildOutput))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildPhase).DeepCopyInto(out.(*BuildPhase)) - return nil - }, InType: reflect.TypeOf(new(BuildPhase))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildPostCommitSpec).DeepCopyInto(out.(*BuildPostCommitSpec)) - return nil - }, InType: reflect.TypeOf(new(BuildPostCommitSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildPtrSliceByCreationTimestamp).DeepCopyInto(out.(*BuildPtrSliceByCreationTimestamp)) - return nil - }, InType: reflect.TypeOf(new(BuildPtrSliceByCreationTimestamp))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildRequest).DeepCopyInto(out.(*BuildRequest)) - return nil - }, InType: reflect.TypeOf(new(BuildRequest))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildRunPolicy).DeepCopyInto(out.(*BuildRunPolicy)) - return nil - }, InType: reflect.TypeOf(new(BuildRunPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildSliceByCreationTimestamp).DeepCopyInto(out.(*BuildSliceByCreationTimestamp)) - return nil - }, InType: reflect.TypeOf(new(BuildSliceByCreationTimestamp))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildSource).DeepCopyInto(out.(*BuildSource)) - return nil - }, InType: reflect.TypeOf(new(BuildSource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildSpec).DeepCopyInto(out.(*BuildSpec)) - return nil - }, InType: reflect.TypeOf(new(BuildSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildStatus).DeepCopyInto(out.(*BuildStatus)) - return nil - }, InType: reflect.TypeOf(new(BuildStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildStatusOutput).DeepCopyInto(out.(*BuildStatusOutput)) - return nil - }, InType: reflect.TypeOf(new(BuildStatusOutput))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildStatusOutputTo).DeepCopyInto(out.(*BuildStatusOutputTo)) - return nil - }, InType: reflect.TypeOf(new(BuildStatusOutputTo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildStrategy).DeepCopyInto(out.(*BuildStrategy)) - return nil - }, InType: reflect.TypeOf(new(BuildStrategy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildStrategyType).DeepCopyInto(out.(*BuildStrategyType)) - return nil - }, InType: reflect.TypeOf(new(BuildStrategyType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildTriggerCause).DeepCopyInto(out.(*BuildTriggerCause)) - return nil - }, InType: reflect.TypeOf(new(BuildTriggerCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildTriggerPolicy).DeepCopyInto(out.(*BuildTriggerPolicy)) - return nil - }, InType: reflect.TypeOf(new(BuildTriggerPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildTriggerType).DeepCopyInto(out.(*BuildTriggerType)) - return nil - }, InType: reflect.TypeOf(new(BuildTriggerType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*CommonSpec).DeepCopyInto(out.(*CommonSpec)) - return nil - }, InType: reflect.TypeOf(new(CommonSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*CommonWebHookCause).DeepCopyInto(out.(*CommonWebHookCause)) - return nil - }, InType: reflect.TypeOf(new(CommonWebHookCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*CustomBuildStrategy).DeepCopyInto(out.(*CustomBuildStrategy)) - return nil - }, InType: reflect.TypeOf(new(CustomBuildStrategy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerBuildStrategy).DeepCopyInto(out.(*DockerBuildStrategy)) - return nil - }, InType: reflect.TypeOf(new(DockerBuildStrategy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerStrategyOptions).DeepCopyInto(out.(*DockerStrategyOptions)) - return nil - }, InType: reflect.TypeOf(new(DockerStrategyOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GenericWebHookCause).DeepCopyInto(out.(*GenericWebHookCause)) - return nil - }, InType: reflect.TypeOf(new(GenericWebHookCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GenericWebHookEvent).DeepCopyInto(out.(*GenericWebHookEvent)) - return nil - }, InType: reflect.TypeOf(new(GenericWebHookEvent))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitBuildSource).DeepCopyInto(out.(*GitBuildSource)) - return nil - }, InType: reflect.TypeOf(new(GitBuildSource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitHubWebHookCause).DeepCopyInto(out.(*GitHubWebHookCause)) - return nil - }, InType: reflect.TypeOf(new(GitHubWebHookCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitInfo).DeepCopyInto(out.(*GitInfo)) - return nil - }, InType: reflect.TypeOf(new(GitInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitLabWebHookCause).DeepCopyInto(out.(*GitLabWebHookCause)) - return nil - }, InType: reflect.TypeOf(new(GitLabWebHookCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitRefInfo).DeepCopyInto(out.(*GitRefInfo)) - return nil - }, InType: reflect.TypeOf(new(GitRefInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitSourceRevision).DeepCopyInto(out.(*GitSourceRevision)) - return nil - }, InType: reflect.TypeOf(new(GitSourceRevision))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageChangeCause).DeepCopyInto(out.(*ImageChangeCause)) - return nil - }, InType: reflect.TypeOf(new(ImageChangeCause))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageChangeTrigger).DeepCopyInto(out.(*ImageChangeTrigger)) - return nil - }, InType: reflect.TypeOf(new(ImageChangeTrigger))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageLabel).DeepCopyInto(out.(*ImageLabel)) - return nil - }, InType: reflect.TypeOf(new(ImageLabel))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageOptimizationPolicy).DeepCopyInto(out.(*ImageOptimizationPolicy)) - return nil - }, InType: reflect.TypeOf(new(ImageOptimizationPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageSource).DeepCopyInto(out.(*ImageSource)) - return nil - }, InType: reflect.TypeOf(new(ImageSource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageSourcePath).DeepCopyInto(out.(*ImageSourcePath)) - return nil - }, InType: reflect.TypeOf(new(ImageSourcePath))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*JenkinsPipelineBuildStrategy).DeepCopyInto(out.(*JenkinsPipelineBuildStrategy)) - return nil - }, InType: reflect.TypeOf(new(JenkinsPipelineBuildStrategy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProxyConfig).DeepCopyInto(out.(*ProxyConfig)) - return nil - }, InType: reflect.TypeOf(new(ProxyConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SecretBuildSource).DeepCopyInto(out.(*SecretBuildSource)) - return nil - }, InType: reflect.TypeOf(new(SecretBuildSource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SecretSpec).DeepCopyInto(out.(*SecretSpec)) - return nil - }, InType: reflect.TypeOf(new(SecretSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SourceBuildStrategy).DeepCopyInto(out.(*SourceBuildStrategy)) - return nil - }, InType: reflect.TypeOf(new(SourceBuildStrategy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SourceControlUser).DeepCopyInto(out.(*SourceControlUser)) - return nil - }, InType: reflect.TypeOf(new(SourceControlUser))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SourceRevision).DeepCopyInto(out.(*SourceRevision)) - return nil - }, InType: reflect.TypeOf(new(SourceRevision))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SourceStrategyOptions).DeepCopyInto(out.(*SourceStrategyOptions)) - return nil - }, InType: reflect.TypeOf(new(SourceStrategyOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StageInfo).DeepCopyInto(out.(*StageInfo)) - return nil - }, InType: reflect.TypeOf(new(StageInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StageName).DeepCopyInto(out.(*StageName)) - return nil - }, InType: reflect.TypeOf(new(StageName))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StatusReason).DeepCopyInto(out.(*StatusReason)) - return nil - }, InType: reflect.TypeOf(new(StatusReason))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StepInfo).DeepCopyInto(out.(*StepInfo)) - return nil - }, InType: reflect.TypeOf(new(StepInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StepName).DeepCopyInto(out.(*StepName)) - return nil - }, InType: reflect.TypeOf(new(StepName))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*WebHookTrigger).DeepCopyInto(out.(*WebHookTrigger)) - return nil - }, InType: reflect.TypeOf(new(WebHookTrigger))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BinaryBuildRequestOptions) DeepCopyInto(out *BinaryBuildRequestOptions) { *out = *in @@ -619,7 +360,7 @@ func (in *BuildOutput) DeepCopyInto(out *BuildOutput) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -628,7 +369,7 @@ func (in *BuildOutput) DeepCopyInto(out *BuildOutput) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } @@ -743,7 +484,7 @@ func (in *BuildRequest) DeepCopyInto(out *BuildRequest) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -752,7 +493,7 @@ func (in *BuildRequest) DeepCopyInto(out *BuildRequest) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -776,7 +517,7 @@ func (in *BuildRequest) DeepCopyInto(out *BuildRequest) { } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -913,7 +654,7 @@ func (in *BuildSource) DeepCopyInto(out *BuildSource) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } @@ -985,7 +726,7 @@ func (in *BuildStatus) DeepCopyInto(out *BuildStatus) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -1193,7 +934,7 @@ func (in *BuildTriggerPolicy) DeepCopyInto(out *BuildTriggerPolicy) { *out = nil } else { *out = new(WebHookTrigger) - **out = **in + (*in).DeepCopyInto(*out) } } if in.GenericWebHook != nil { @@ -1202,7 +943,7 @@ func (in *BuildTriggerPolicy) DeepCopyInto(out *BuildTriggerPolicy) { *out = nil } else { *out = new(WebHookTrigger) - **out = **in + (*in).DeepCopyInto(*out) } } if in.ImageChange != nil { @@ -1220,7 +961,7 @@ func (in *BuildTriggerPolicy) DeepCopyInto(out *BuildTriggerPolicy) { *out = nil } else { *out = new(WebHookTrigger) - **out = **in + (*in).DeepCopyInto(*out) } } if in.BitbucketWebHook != nil { @@ -1229,7 +970,7 @@ func (in *BuildTriggerPolicy) DeepCopyInto(out *BuildTriggerPolicy) { *out = nil } else { *out = new(WebHookTrigger) - **out = **in + (*in).DeepCopyInto(*out) } } return @@ -1345,13 +1086,13 @@ func (in *CustomBuildStrategy) DeepCopyInto(out *CustomBuildStrategy) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -1382,7 +1123,7 @@ func (in *DockerBuildStrategy) DeepCopyInto(out *DockerBuildStrategy) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -1391,20 +1132,20 @@ func (in *DockerBuildStrategy) DeepCopyInto(out *DockerBuildStrategy) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } } if in.BuildArgs != nil { in, out := &in.BuildArgs, &out.BuildArgs - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -1436,7 +1177,7 @@ func (in *DockerStrategyOptions) DeepCopyInto(out *DockerStrategyOptions) { *out = *in if in.BuildArgs != nil { in, out := &in.BuildArgs, &out.BuildArgs - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -1502,7 +1243,7 @@ func (in *GenericWebHookEvent) DeepCopyInto(out *GenericWebHookEvent) { } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -1657,7 +1398,7 @@ func (in *ImageChangeCause) DeepCopyInto(out *ImageChangeCause) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -1682,7 +1423,7 @@ func (in *ImageChangeTrigger) DeepCopyInto(out *ImageChangeTrigger) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -1749,7 +1490,7 @@ func (in *ImageSource) DeepCopyInto(out *ImageSource) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } @@ -1787,7 +1528,7 @@ func (in *JenkinsPipelineBuildStrategy) DeepCopyInto(out *JenkinsPipelineBuildSt *out = *in if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -1865,6 +1606,22 @@ func (in *SecretBuildSource) DeepCopy() *SecretBuildSource { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *SecretLocalReference) DeepCopyInto(out *SecretLocalReference) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretLocalReference. +func (in *SecretLocalReference) DeepCopy() *SecretLocalReference { + if in == nil { + return nil + } + out := new(SecretLocalReference) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SecretSpec) DeepCopyInto(out *SecretSpec) { *out = *in @@ -1891,13 +1648,13 @@ func (in *SourceBuildStrategy) DeepCopyInto(out *SourceBuildStrategy) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -2094,6 +1851,15 @@ func (in *StepName) DeepCopy() *StepName { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *WebHookTrigger) DeepCopyInto(out *WebHookTrigger) { *out = *in + if in.SecretReference != nil { + in, out := &in.SecretReference, &out.SecretReference + if *in == nil { + *out = nil + } else { + *out = new(SecretLocalReference) + **out = **in + } + } return } diff --git a/pkg/build/controller/build/defaults/api/v1/zz_generated.deepcopy.go b/pkg/build/controller/build/defaults/api/v1/zz_generated.deepcopy.go index 94ed6bb0a335..5eea6f335c9a 100644 --- a/pkg/build/controller/build/defaults/api/v1/zz_generated.deepcopy.go +++ b/pkg/build/controller/build/defaults/api/v1/zz_generated.deepcopy.go @@ -7,32 +7,9 @@ package v1 import ( build_v1 "github.com/openshift/api/build/v1" core_v1 "k8s.io/api/core/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildDefaultsConfig).DeepCopyInto(out.(*BuildDefaultsConfig)) - return nil - }, InType: reflect.TypeOf(new(BuildDefaultsConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SourceStrategyDefaultsConfig).DeepCopyInto(out.(*SourceStrategyDefaultsConfig)) - return nil - }, InType: reflect.TypeOf(new(SourceStrategyDefaultsConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BuildDefaultsConfig) DeepCopyInto(out *BuildDefaultsConfig) { *out = *in diff --git a/pkg/build/controller/build/defaults/api/zz_generated.deepcopy.go b/pkg/build/controller/build/defaults/api/zz_generated.deepcopy.go index 8940db9c5d22..dba76d9f7a9f 100644 --- a/pkg/build/controller/build/defaults/api/zz_generated.deepcopy.go +++ b/pkg/build/controller/build/defaults/api/zz_generated.deepcopy.go @@ -6,40 +6,17 @@ package api import ( build "github.com/openshift/origin/pkg/build/apis/build" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - pkg_api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildDefaultsConfig).DeepCopyInto(out.(*BuildDefaultsConfig)) - return nil - }, InType: reflect.TypeOf(new(BuildDefaultsConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SourceStrategyDefaultsConfig).DeepCopyInto(out.(*SourceStrategyDefaultsConfig)) - return nil - }, InType: reflect.TypeOf(new(SourceStrategyDefaultsConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BuildDefaultsConfig) DeepCopyInto(out *BuildDefaultsConfig) { *out = *in out.TypeMeta = in.TypeMeta if in.Env != nil { in, out := &in.Env, &out.Env - *out = make([]pkg_api.EnvVar, len(*in)) + *out = make([]core.EnvVar, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } diff --git a/pkg/build/controller/build/overrides/api/v1/zz_generated.deepcopy.go b/pkg/build/controller/build/overrides/api/v1/zz_generated.deepcopy.go index 47b5aa686e0f..3258ff944456 100644 --- a/pkg/build/controller/build/overrides/api/v1/zz_generated.deepcopy.go +++ b/pkg/build/controller/build/overrides/api/v1/zz_generated.deepcopy.go @@ -6,28 +6,9 @@ package v1 import ( build_v1 "github.com/openshift/api/build/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildOverridesConfig).DeepCopyInto(out.(*BuildOverridesConfig)) - return nil - }, InType: reflect.TypeOf(new(BuildOverridesConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BuildOverridesConfig) DeepCopyInto(out *BuildOverridesConfig) { *out = *in diff --git a/pkg/build/controller/build/overrides/api/zz_generated.deepcopy.go b/pkg/build/controller/build/overrides/api/zz_generated.deepcopy.go index 476221e81f2e..a87fdf2faa73 100644 --- a/pkg/build/controller/build/overrides/api/zz_generated.deepcopy.go +++ b/pkg/build/controller/build/overrides/api/zz_generated.deepcopy.go @@ -6,28 +6,9 @@ package api import ( build "github.com/openshift/origin/pkg/build/apis/build" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BuildOverridesConfig).DeepCopyInto(out.(*BuildOverridesConfig)) - return nil - }, InType: reflect.TypeOf(new(BuildOverridesConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BuildOverridesConfig) DeepCopyInto(out *BuildOverridesConfig) { *out = *in diff --git a/pkg/build/generated/informers/internalversion/build/interface.go b/pkg/build/generated/informers/internalversion/build/interface.go index 287b53405dc8..aa3b86321ffe 100644 --- a/pkg/build/generated/informers/internalversion/build/interface.go +++ b/pkg/build/generated/informers/internalversion/build/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/build/generated/informers/internalversion/build/internalversion/build.go b/pkg/build/generated/informers/internalversion/build/internalversion/build.go index caeaabd426cc..06697fedbdec 100644 --- a/pkg/build/generated/informers/internalversion/build/internalversion/build.go +++ b/pkg/build/generated/informers/internalversion/build/internalversion/build.go @@ -22,19 +22,34 @@ type BuildInformer interface { } type buildInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewBuildInformer constructs a new informer for Build type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewBuildInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredBuildInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredBuildInformer constructs a new informer for Build type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredBuildInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Build().Builds(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Build().Builds(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewBuildInformer(client internalclientset.Interface, namespace string, resy ) } -func defaultBuildInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewBuildInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *buildInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredBuildInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *buildInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&build.Build{}, defaultBuildInformer) + return f.factory.InformerFor(&build.Build{}, f.defaultInformer) } func (f *buildInformer) Lister() internalversion.BuildLister { diff --git a/pkg/build/generated/informers/internalversion/build/internalversion/buildconfig.go b/pkg/build/generated/informers/internalversion/build/internalversion/buildconfig.go index 29b15352c251..10154c809cdb 100644 --- a/pkg/build/generated/informers/internalversion/build/internalversion/buildconfig.go +++ b/pkg/build/generated/informers/internalversion/build/internalversion/buildconfig.go @@ -22,19 +22,34 @@ type BuildConfigInformer interface { } type buildConfigInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewBuildConfigInformer constructs a new informer for BuildConfig type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewBuildConfigInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredBuildConfigInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredBuildConfigInformer constructs a new informer for BuildConfig type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredBuildConfigInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Build().BuildConfigs(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Build().BuildConfigs(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewBuildConfigInformer(client internalclientset.Interface, namespace string ) } -func defaultBuildConfigInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewBuildConfigInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *buildConfigInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredBuildConfigInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *buildConfigInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&build.BuildConfig{}, defaultBuildConfigInformer) + return f.factory.InformerFor(&build.BuildConfig{}, f.defaultInformer) } func (f *buildConfigInformer) Lister() internalversion.BuildConfigLister { diff --git a/pkg/build/generated/informers/internalversion/build/internalversion/interface.go b/pkg/build/generated/informers/internalversion/build/internalversion/interface.go index d97d83d9b438..c314c7599ba8 100644 --- a/pkg/build/generated/informers/internalversion/build/internalversion/interface.go +++ b/pkg/build/generated/informers/internalversion/build/internalversion/interface.go @@ -15,20 +15,22 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // Builds returns a BuildInformer. func (v *version) Builds() BuildInformer { - return &buildInformer{factory: v.SharedInformerFactory} + return &buildInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // BuildConfigs returns a BuildConfigInformer. func (v *version) BuildConfigs() BuildConfigInformer { - return &buildConfigInformer{factory: v.SharedInformerFactory} + return &buildConfigInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/build/generated/informers/internalversion/factory.go b/pkg/build/generated/informers/internalversion/factory.go index bb44bc20700d..f48f8086f6aa 100644 --- a/pkg/build/generated/informers/internalversion/factory.go +++ b/pkg/build/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( build "github.com/openshift/origin/pkg/build/generated/informers/internalversion/build" internalinterfaces "github.com/openshift/origin/pkg/build/generated/informers/internalversion/internalinterfaces" internalclientset "github.com/openshift/origin/pkg/build/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Build() build.Interface { - return build.New(f) + return build.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/build/generated/informers/internalversion/generic.go b/pkg/build/generated/informers/internalversion/generic.go index bbb838a65951..a0a42f8e3d15 100644 --- a/pkg/build/generated/informers/internalversion/generic.go +++ b/pkg/build/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Build, Version=InternalVersion + // Group=build.openshift.io, Version=internalVersion case build.SchemeGroupVersion.WithResource("builds"): return &genericInformer{resource: resource.GroupResource(), informer: f.Build().InternalVersion().Builds().Informer()}, nil case build.SchemeGroupVersion.WithResource("buildconfigs"): diff --git a/pkg/build/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/build/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index 8edb9da26bde..1060a6829910 100644 --- a/pkg/build/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/build/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/build/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/build/generated/internalclientset/doc.go b/pkg/build/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/build/generated/internalclientset/doc.go +++ b/pkg/build/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/build/generated/internalclientset/fake/doc.go b/pkg/build/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/build/generated/internalclientset/fake/doc.go +++ b/pkg/build/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/build/generated/internalclientset/scheme/doc.go b/pkg/build/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/build/generated/internalclientset/scheme/doc.go +++ b/pkg/build/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/build/generated/internalclientset/typed/build/internalversion/doc.go b/pkg/build/generated/internalclientset/typed/build/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/build/generated/internalclientset/typed/build/internalversion/doc.go +++ b/pkg/build/generated/internalclientset/typed/build/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/build/generated/internalclientset/typed/build/internalversion/fake/doc.go b/pkg/build/generated/internalclientset/typed/build/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/build/generated/internalclientset/typed/build/internalversion/fake/doc.go +++ b/pkg/build/generated/internalclientset/typed/build/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/cmd/server/api/v1/testing/zz_generated.deepcopy.go b/pkg/cmd/server/api/v1/testing/zz_generated.deepcopy.go index 5f6b8d6b6a59..3c54df608a71 100644 --- a/pkg/cmd/server/api/v1/testing/zz_generated.deepcopy.go +++ b/pkg/cmd/server/api/v1/testing/zz_generated.deepcopy.go @@ -5,23 +5,9 @@ package testing import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc { - return []conversion.GeneratedDeepCopyFunc{ - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AdmissionPluginTestConfig).DeepCopyInto(out.(*AdmissionPluginTestConfig)) - return nil - }, InType: reflect.TypeOf(new(AdmissionPluginTestConfig))}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AdmissionPluginTestConfig) DeepCopyInto(out *AdmissionPluginTestConfig) { *out = *in diff --git a/pkg/cmd/server/api/v1/zz_generated.deepcopy.go b/pkg/cmd/server/api/v1/zz_generated.deepcopy.go index ff33aa4f99f2..aea088c10a19 100644 --- a/pkg/cmd/server/api/v1/zz_generated.deepcopy.go +++ b/pkg/cmd/server/api/v1/zz_generated.deepcopy.go @@ -6,365 +6,10 @@ package v1 import ( resource "k8s.io/apimachinery/pkg/api/resource" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ActiveDirectoryConfig).DeepCopyInto(out.(*ActiveDirectoryConfig)) - return nil - }, InType: reflect.TypeOf(new(ActiveDirectoryConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AdmissionConfig).DeepCopyInto(out.(*AdmissionConfig)) - return nil - }, InType: reflect.TypeOf(new(AdmissionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AdmissionPluginConfig).DeepCopyInto(out.(*AdmissionPluginConfig)) - return nil - }, InType: reflect.TypeOf(new(AdmissionPluginConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AggregatorConfig).DeepCopyInto(out.(*AggregatorConfig)) - return nil - }, InType: reflect.TypeOf(new(AggregatorConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AllowAllPasswordIdentityProvider).DeepCopyInto(out.(*AllowAllPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(AllowAllPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AllowedRegistries).DeepCopyInto(out.(*AllowedRegistries)) - return nil - }, InType: reflect.TypeOf(new(AllowedRegistries))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AssetConfig).DeepCopyInto(out.(*AssetConfig)) - return nil - }, InType: reflect.TypeOf(new(AssetConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AssetExtensionsConfig).DeepCopyInto(out.(*AssetExtensionsConfig)) - return nil - }, InType: reflect.TypeOf(new(AssetExtensionsConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AuditConfig).DeepCopyInto(out.(*AuditConfig)) - return nil - }, InType: reflect.TypeOf(new(AuditConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AugmentedActiveDirectoryConfig).DeepCopyInto(out.(*AugmentedActiveDirectoryConfig)) - return nil - }, InType: reflect.TypeOf(new(AugmentedActiveDirectoryConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BasicAuthPasswordIdentityProvider).DeepCopyInto(out.(*BasicAuthPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(BasicAuthPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*CertInfo).DeepCopyInto(out.(*CertInfo)) - return nil - }, InType: reflect.TypeOf(new(CertInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClientConnectionOverrides).DeepCopyInto(out.(*ClientConnectionOverrides)) - return nil - }, InType: reflect.TypeOf(new(ClientConnectionOverrides))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterNetworkEntry).DeepCopyInto(out.(*ClusterNetworkEntry)) - return nil - }, InType: reflect.TypeOf(new(ClusterNetworkEntry))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ControllerConfig).DeepCopyInto(out.(*ControllerConfig)) - return nil - }, InType: reflect.TypeOf(new(ControllerConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ControllerElectionConfig).DeepCopyInto(out.(*ControllerElectionConfig)) - return nil - }, InType: reflect.TypeOf(new(ControllerElectionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DNSConfig).DeepCopyInto(out.(*DNSConfig)) - return nil - }, InType: reflect.TypeOf(new(DNSConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DefaultAdmissionConfig).DeepCopyInto(out.(*DefaultAdmissionConfig)) - return nil - }, InType: reflect.TypeOf(new(DefaultAdmissionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DenyAllPasswordIdentityProvider).DeepCopyInto(out.(*DenyAllPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(DenyAllPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerConfig).DeepCopyInto(out.(*DockerConfig)) - return nil - }, InType: reflect.TypeOf(new(DockerConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerExecHandlerType).DeepCopyInto(out.(*DockerExecHandlerType)) - return nil - }, InType: reflect.TypeOf(new(DockerExecHandlerType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdConfig).DeepCopyInto(out.(*EtcdConfig)) - return nil - }, InType: reflect.TypeOf(new(EtcdConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdConnectionInfo).DeepCopyInto(out.(*EtcdConnectionInfo)) - return nil - }, InType: reflect.TypeOf(new(EtcdConnectionInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdStorageConfig).DeepCopyInto(out.(*EtcdStorageConfig)) - return nil - }, InType: reflect.TypeOf(new(EtcdStorageConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ExtendedArguments).DeepCopyInto(out.(*ExtendedArguments)) - return nil - }, InType: reflect.TypeOf(new(ExtendedArguments))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*FeatureList).DeepCopyInto(out.(*FeatureList)) - return nil - }, InType: reflect.TypeOf(new(FeatureList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitHubIdentityProvider).DeepCopyInto(out.(*GitHubIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(GitHubIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitLabIdentityProvider).DeepCopyInto(out.(*GitLabIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(GitLabIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GoogleIdentityProvider).DeepCopyInto(out.(*GoogleIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(GoogleIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GrantConfig).DeepCopyInto(out.(*GrantConfig)) - return nil - }, InType: reflect.TypeOf(new(GrantConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GrantHandlerType).DeepCopyInto(out.(*GrantHandlerType)) - return nil - }, InType: reflect.TypeOf(new(GrantHandlerType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GroupResource).DeepCopyInto(out.(*GroupResource)) - return nil - }, InType: reflect.TypeOf(new(GroupResource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*HTPasswdPasswordIdentityProvider).DeepCopyInto(out.(*HTPasswdPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(HTPasswdPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*HTTPServingInfo).DeepCopyInto(out.(*HTTPServingInfo)) - return nil - }, InType: reflect.TypeOf(new(HTTPServingInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*IdentityProvider).DeepCopyInto(out.(*IdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(IdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageConfig).DeepCopyInto(out.(*ImageConfig)) - return nil - }, InType: reflect.TypeOf(new(ImageConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImagePolicyConfig).DeepCopyInto(out.(*ImagePolicyConfig)) - return nil - }, InType: reflect.TypeOf(new(ImagePolicyConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*JenkinsPipelineConfig).DeepCopyInto(out.(*JenkinsPipelineConfig)) - return nil - }, InType: reflect.TypeOf(new(JenkinsPipelineConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*KeystonePasswordIdentityProvider).DeepCopyInto(out.(*KeystonePasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(KeystonePasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*KubeletConnectionInfo).DeepCopyInto(out.(*KubeletConnectionInfo)) - return nil - }, InType: reflect.TypeOf(new(KubeletConnectionInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*KubernetesMasterConfig).DeepCopyInto(out.(*KubernetesMasterConfig)) - return nil - }, InType: reflect.TypeOf(new(KubernetesMasterConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPAttributeMapping).DeepCopyInto(out.(*LDAPAttributeMapping)) - return nil - }, InType: reflect.TypeOf(new(LDAPAttributeMapping))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPPasswordIdentityProvider).DeepCopyInto(out.(*LDAPPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(LDAPPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPQuery).DeepCopyInto(out.(*LDAPQuery)) - return nil - }, InType: reflect.TypeOf(new(LDAPQuery))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPSyncConfig).DeepCopyInto(out.(*LDAPSyncConfig)) - return nil - }, InType: reflect.TypeOf(new(LDAPSyncConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LocalQuota).DeepCopyInto(out.(*LocalQuota)) - return nil - }, InType: reflect.TypeOf(new(LocalQuota))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LogFormatType).DeepCopyInto(out.(*LogFormatType)) - return nil - }, InType: reflect.TypeOf(new(LogFormatType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterAuthConfig).DeepCopyInto(out.(*MasterAuthConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterAuthConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterClients).DeepCopyInto(out.(*MasterClients)) - return nil - }, InType: reflect.TypeOf(new(MasterClients))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterConfig).DeepCopyInto(out.(*MasterConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterNetworkConfig).DeepCopyInto(out.(*MasterNetworkConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterNetworkConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterVolumeConfig).DeepCopyInto(out.(*MasterVolumeConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterVolumeConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NamedCertificate).DeepCopyInto(out.(*NamedCertificate)) - return nil - }, InType: reflect.TypeOf(new(NamedCertificate))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeAuthConfig).DeepCopyInto(out.(*NodeAuthConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeAuthConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeConfig).DeepCopyInto(out.(*NodeConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeNetworkConfig).DeepCopyInto(out.(*NodeNetworkConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeNetworkConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeVolumeConfig).DeepCopyInto(out.(*NodeVolumeConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeVolumeConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthConfig).DeepCopyInto(out.(*OAuthConfig)) - return nil - }, InType: reflect.TypeOf(new(OAuthConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthTemplates).DeepCopyInto(out.(*OAuthTemplates)) - return nil - }, InType: reflect.TypeOf(new(OAuthTemplates))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OpenIDClaims).DeepCopyInto(out.(*OpenIDClaims)) - return nil - }, InType: reflect.TypeOf(new(OpenIDClaims))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OpenIDIdentityProvider).DeepCopyInto(out.(*OpenIDIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(OpenIDIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OpenIDURLs).DeepCopyInto(out.(*OpenIDURLs)) - return nil - }, InType: reflect.TypeOf(new(OpenIDURLs))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodManifestConfig).DeepCopyInto(out.(*PodManifestConfig)) - return nil - }, InType: reflect.TypeOf(new(PodManifestConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyConfig).DeepCopyInto(out.(*PolicyConfig)) - return nil - }, InType: reflect.TypeOf(new(PolicyConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectConfig).DeepCopyInto(out.(*ProjectConfig)) - return nil - }, InType: reflect.TypeOf(new(ProjectConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RFC2307Config).DeepCopyInto(out.(*RFC2307Config)) - return nil - }, InType: reflect.TypeOf(new(RFC2307Config))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RegistryLocation).DeepCopyInto(out.(*RegistryLocation)) - return nil - }, InType: reflect.TypeOf(new(RegistryLocation))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RemoteConnectionInfo).DeepCopyInto(out.(*RemoteConnectionInfo)) - return nil - }, InType: reflect.TypeOf(new(RemoteConnectionInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RequestHeaderAuthenticationOptions).DeepCopyInto(out.(*RequestHeaderAuthenticationOptions)) - return nil - }, InType: reflect.TypeOf(new(RequestHeaderAuthenticationOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RequestHeaderIdentityProvider).DeepCopyInto(out.(*RequestHeaderIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(RequestHeaderIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoutingConfig).DeepCopyInto(out.(*RoutingConfig)) - return nil - }, InType: reflect.TypeOf(new(RoutingConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SecurityAllocator).DeepCopyInto(out.(*SecurityAllocator)) - return nil - }, InType: reflect.TypeOf(new(SecurityAllocator))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServiceAccountConfig).DeepCopyInto(out.(*ServiceAccountConfig)) - return nil - }, InType: reflect.TypeOf(new(ServiceAccountConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServiceServingCert).DeepCopyInto(out.(*ServiceServingCert)) - return nil - }, InType: reflect.TypeOf(new(ServiceServingCert))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServingInfo).DeepCopyInto(out.(*ServingInfo)) - return nil - }, InType: reflect.TypeOf(new(ServingInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SessionConfig).DeepCopyInto(out.(*SessionConfig)) - return nil - }, InType: reflect.TypeOf(new(SessionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SessionSecret).DeepCopyInto(out.(*SessionSecret)) - return nil - }, InType: reflect.TypeOf(new(SessionSecret))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SessionSecrets).DeepCopyInto(out.(*SessionSecrets)) - return nil - }, InType: reflect.TypeOf(new(SessionSecrets))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StringSource).DeepCopyInto(out.(*StringSource)) - return nil - }, InType: reflect.TypeOf(new(StringSource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StringSourceSpec).DeepCopyInto(out.(*StringSourceSpec)) - return nil - }, InType: reflect.TypeOf(new(StringSourceSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TokenConfig).DeepCopyInto(out.(*TokenConfig)) - return nil - }, InType: reflect.TypeOf(new(TokenConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserAgentDenyRule).DeepCopyInto(out.(*UserAgentDenyRule)) - return nil - }, InType: reflect.TypeOf(new(UserAgentDenyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserAgentMatchRule).DeepCopyInto(out.(*UserAgentMatchRule)) - return nil - }, InType: reflect.TypeOf(new(UserAgentMatchRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserAgentMatchingConfig).DeepCopyInto(out.(*UserAgentMatchingConfig)) - return nil - }, InType: reflect.TypeOf(new(UserAgentMatchingConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*WebHookModeType).DeepCopyInto(out.(*WebHookModeType)) - return nil - }, InType: reflect.TypeOf(new(WebHookModeType))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ActiveDirectoryConfig) DeepCopyInto(out *ActiveDirectoryConfig) { *out = *in diff --git a/pkg/cmd/server/api/zz_generated.deepcopy.go b/pkg/cmd/server/api/zz_generated.deepcopy.go index 6836b2ffd5e8..397def21cafd 100644 --- a/pkg/cmd/server/api/zz_generated.deepcopy.go +++ b/pkg/cmd/server/api/zz_generated.deepcopy.go @@ -6,365 +6,10 @@ package api import ( resource "k8s.io/apimachinery/pkg/api/resource" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ActiveDirectoryConfig).DeepCopyInto(out.(*ActiveDirectoryConfig)) - return nil - }, InType: reflect.TypeOf(new(ActiveDirectoryConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AdmissionConfig).DeepCopyInto(out.(*AdmissionConfig)) - return nil - }, InType: reflect.TypeOf(new(AdmissionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AdmissionPluginConfig).DeepCopyInto(out.(*AdmissionPluginConfig)) - return nil - }, InType: reflect.TypeOf(new(AdmissionPluginConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AggregatorConfig).DeepCopyInto(out.(*AggregatorConfig)) - return nil - }, InType: reflect.TypeOf(new(AggregatorConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AllowAllPasswordIdentityProvider).DeepCopyInto(out.(*AllowAllPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(AllowAllPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AllowedRegistries).DeepCopyInto(out.(*AllowedRegistries)) - return nil - }, InType: reflect.TypeOf(new(AllowedRegistries))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AssetConfig).DeepCopyInto(out.(*AssetConfig)) - return nil - }, InType: reflect.TypeOf(new(AssetConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AssetExtensionsConfig).DeepCopyInto(out.(*AssetExtensionsConfig)) - return nil - }, InType: reflect.TypeOf(new(AssetExtensionsConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AuditConfig).DeepCopyInto(out.(*AuditConfig)) - return nil - }, InType: reflect.TypeOf(new(AuditConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AugmentedActiveDirectoryConfig).DeepCopyInto(out.(*AugmentedActiveDirectoryConfig)) - return nil - }, InType: reflect.TypeOf(new(AugmentedActiveDirectoryConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BasicAuthPasswordIdentityProvider).DeepCopyInto(out.(*BasicAuthPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(BasicAuthPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*CertInfo).DeepCopyInto(out.(*CertInfo)) - return nil - }, InType: reflect.TypeOf(new(CertInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClientConnectionOverrides).DeepCopyInto(out.(*ClientConnectionOverrides)) - return nil - }, InType: reflect.TypeOf(new(ClientConnectionOverrides))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterNetworkEntry).DeepCopyInto(out.(*ClusterNetworkEntry)) - return nil - }, InType: reflect.TypeOf(new(ClusterNetworkEntry))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ControllerConfig).DeepCopyInto(out.(*ControllerConfig)) - return nil - }, InType: reflect.TypeOf(new(ControllerConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ControllerElectionConfig).DeepCopyInto(out.(*ControllerElectionConfig)) - return nil - }, InType: reflect.TypeOf(new(ControllerElectionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DNSConfig).DeepCopyInto(out.(*DNSConfig)) - return nil - }, InType: reflect.TypeOf(new(DNSConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DefaultAdmissionConfig).DeepCopyInto(out.(*DefaultAdmissionConfig)) - return nil - }, InType: reflect.TypeOf(new(DefaultAdmissionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DenyAllPasswordIdentityProvider).DeepCopyInto(out.(*DenyAllPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(DenyAllPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerConfig).DeepCopyInto(out.(*DockerConfig)) - return nil - }, InType: reflect.TypeOf(new(DockerConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerExecHandlerType).DeepCopyInto(out.(*DockerExecHandlerType)) - return nil - }, InType: reflect.TypeOf(new(DockerExecHandlerType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdConfig).DeepCopyInto(out.(*EtcdConfig)) - return nil - }, InType: reflect.TypeOf(new(EtcdConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdConnectionInfo).DeepCopyInto(out.(*EtcdConnectionInfo)) - return nil - }, InType: reflect.TypeOf(new(EtcdConnectionInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EtcdStorageConfig).DeepCopyInto(out.(*EtcdStorageConfig)) - return nil - }, InType: reflect.TypeOf(new(EtcdStorageConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ExtendedArguments).DeepCopyInto(out.(*ExtendedArguments)) - return nil - }, InType: reflect.TypeOf(new(ExtendedArguments))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*FeatureList).DeepCopyInto(out.(*FeatureList)) - return nil - }, InType: reflect.TypeOf(new(FeatureList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitHubIdentityProvider).DeepCopyInto(out.(*GitHubIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(GitHubIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GitLabIdentityProvider).DeepCopyInto(out.(*GitLabIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(GitLabIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GoogleIdentityProvider).DeepCopyInto(out.(*GoogleIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(GoogleIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GrantConfig).DeepCopyInto(out.(*GrantConfig)) - return nil - }, InType: reflect.TypeOf(new(GrantConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GrantHandlerType).DeepCopyInto(out.(*GrantHandlerType)) - return nil - }, InType: reflect.TypeOf(new(GrantHandlerType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GroupResource).DeepCopyInto(out.(*GroupResource)) - return nil - }, InType: reflect.TypeOf(new(GroupResource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*HTPasswdPasswordIdentityProvider).DeepCopyInto(out.(*HTPasswdPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(HTPasswdPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*HTTPServingInfo).DeepCopyInto(out.(*HTTPServingInfo)) - return nil - }, InType: reflect.TypeOf(new(HTTPServingInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*IdentityProvider).DeepCopyInto(out.(*IdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(IdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageConfig).DeepCopyInto(out.(*ImageConfig)) - return nil - }, InType: reflect.TypeOf(new(ImageConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImagePolicyConfig).DeepCopyInto(out.(*ImagePolicyConfig)) - return nil - }, InType: reflect.TypeOf(new(ImagePolicyConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*JenkinsPipelineConfig).DeepCopyInto(out.(*JenkinsPipelineConfig)) - return nil - }, InType: reflect.TypeOf(new(JenkinsPipelineConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*KeystonePasswordIdentityProvider).DeepCopyInto(out.(*KeystonePasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(KeystonePasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*KubeletConnectionInfo).DeepCopyInto(out.(*KubeletConnectionInfo)) - return nil - }, InType: reflect.TypeOf(new(KubeletConnectionInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*KubernetesMasterConfig).DeepCopyInto(out.(*KubernetesMasterConfig)) - return nil - }, InType: reflect.TypeOf(new(KubernetesMasterConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPAttributeMapping).DeepCopyInto(out.(*LDAPAttributeMapping)) - return nil - }, InType: reflect.TypeOf(new(LDAPAttributeMapping))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPPasswordIdentityProvider).DeepCopyInto(out.(*LDAPPasswordIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(LDAPPasswordIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPQuery).DeepCopyInto(out.(*LDAPQuery)) - return nil - }, InType: reflect.TypeOf(new(LDAPQuery))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LDAPSyncConfig).DeepCopyInto(out.(*LDAPSyncConfig)) - return nil - }, InType: reflect.TypeOf(new(LDAPSyncConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LocalQuota).DeepCopyInto(out.(*LocalQuota)) - return nil - }, InType: reflect.TypeOf(new(LocalQuota))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*LogFormatType).DeepCopyInto(out.(*LogFormatType)) - return nil - }, InType: reflect.TypeOf(new(LogFormatType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterAuthConfig).DeepCopyInto(out.(*MasterAuthConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterAuthConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterClients).DeepCopyInto(out.(*MasterClients)) - return nil - }, InType: reflect.TypeOf(new(MasterClients))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterConfig).DeepCopyInto(out.(*MasterConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterNetworkConfig).DeepCopyInto(out.(*MasterNetworkConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterNetworkConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*MasterVolumeConfig).DeepCopyInto(out.(*MasterVolumeConfig)) - return nil - }, InType: reflect.TypeOf(new(MasterVolumeConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NamedCertificate).DeepCopyInto(out.(*NamedCertificate)) - return nil - }, InType: reflect.TypeOf(new(NamedCertificate))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeAuthConfig).DeepCopyInto(out.(*NodeAuthConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeAuthConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeConfig).DeepCopyInto(out.(*NodeConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeNetworkConfig).DeepCopyInto(out.(*NodeNetworkConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeNetworkConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NodeVolumeConfig).DeepCopyInto(out.(*NodeVolumeConfig)) - return nil - }, InType: reflect.TypeOf(new(NodeVolumeConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthConfig).DeepCopyInto(out.(*OAuthConfig)) - return nil - }, InType: reflect.TypeOf(new(OAuthConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthTemplates).DeepCopyInto(out.(*OAuthTemplates)) - return nil - }, InType: reflect.TypeOf(new(OAuthTemplates))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OpenIDClaims).DeepCopyInto(out.(*OpenIDClaims)) - return nil - }, InType: reflect.TypeOf(new(OpenIDClaims))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OpenIDIdentityProvider).DeepCopyInto(out.(*OpenIDIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(OpenIDIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OpenIDURLs).DeepCopyInto(out.(*OpenIDURLs)) - return nil - }, InType: reflect.TypeOf(new(OpenIDURLs))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodManifestConfig).DeepCopyInto(out.(*PodManifestConfig)) - return nil - }, InType: reflect.TypeOf(new(PodManifestConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PolicyConfig).DeepCopyInto(out.(*PolicyConfig)) - return nil - }, InType: reflect.TypeOf(new(PolicyConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectConfig).DeepCopyInto(out.(*ProjectConfig)) - return nil - }, InType: reflect.TypeOf(new(ProjectConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RFC2307Config).DeepCopyInto(out.(*RFC2307Config)) - return nil - }, InType: reflect.TypeOf(new(RFC2307Config))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RegistryLocation).DeepCopyInto(out.(*RegistryLocation)) - return nil - }, InType: reflect.TypeOf(new(RegistryLocation))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RemoteConnectionInfo).DeepCopyInto(out.(*RemoteConnectionInfo)) - return nil - }, InType: reflect.TypeOf(new(RemoteConnectionInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RequestHeaderAuthenticationOptions).DeepCopyInto(out.(*RequestHeaderAuthenticationOptions)) - return nil - }, InType: reflect.TypeOf(new(RequestHeaderAuthenticationOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RequestHeaderIdentityProvider).DeepCopyInto(out.(*RequestHeaderIdentityProvider)) - return nil - }, InType: reflect.TypeOf(new(RequestHeaderIdentityProvider))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoutingConfig).DeepCopyInto(out.(*RoutingConfig)) - return nil - }, InType: reflect.TypeOf(new(RoutingConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SecurityAllocator).DeepCopyInto(out.(*SecurityAllocator)) - return nil - }, InType: reflect.TypeOf(new(SecurityAllocator))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServiceAccountConfig).DeepCopyInto(out.(*ServiceAccountConfig)) - return nil - }, InType: reflect.TypeOf(new(ServiceAccountConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServiceServingCert).DeepCopyInto(out.(*ServiceServingCert)) - return nil - }, InType: reflect.TypeOf(new(ServiceServingCert))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServingInfo).DeepCopyInto(out.(*ServingInfo)) - return nil - }, InType: reflect.TypeOf(new(ServingInfo))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SessionConfig).DeepCopyInto(out.(*SessionConfig)) - return nil - }, InType: reflect.TypeOf(new(SessionConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SessionSecret).DeepCopyInto(out.(*SessionSecret)) - return nil - }, InType: reflect.TypeOf(new(SessionSecret))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SessionSecrets).DeepCopyInto(out.(*SessionSecrets)) - return nil - }, InType: reflect.TypeOf(new(SessionSecrets))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StringSource).DeepCopyInto(out.(*StringSource)) - return nil - }, InType: reflect.TypeOf(new(StringSource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*StringSourceSpec).DeepCopyInto(out.(*StringSourceSpec)) - return nil - }, InType: reflect.TypeOf(new(StringSourceSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TokenConfig).DeepCopyInto(out.(*TokenConfig)) - return nil - }, InType: reflect.TypeOf(new(TokenConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserAgentDenyRule).DeepCopyInto(out.(*UserAgentDenyRule)) - return nil - }, InType: reflect.TypeOf(new(UserAgentDenyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserAgentMatchRule).DeepCopyInto(out.(*UserAgentMatchRule)) - return nil - }, InType: reflect.TypeOf(new(UserAgentMatchRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserAgentMatchingConfig).DeepCopyInto(out.(*UserAgentMatchingConfig)) - return nil - }, InType: reflect.TypeOf(new(UserAgentMatchingConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*WebHookModeType).DeepCopyInto(out.(*WebHookModeType)) - return nil - }, InType: reflect.TypeOf(new(WebHookModeType))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ActiveDirectoryConfig) DeepCopyInto(out *ActiveDirectoryConfig) { *out = *in diff --git a/pkg/cmd/util/pluginconfig/testing/zz_generated.deepcopy.go b/pkg/cmd/util/pluginconfig/testing/zz_generated.deepcopy.go index 218a78b8b7e7..5638c14bf281 100644 --- a/pkg/cmd/util/pluginconfig/testing/zz_generated.deepcopy.go +++ b/pkg/cmd/util/pluginconfig/testing/zz_generated.deepcopy.go @@ -5,27 +5,9 @@ package testing import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc { - return []conversion.GeneratedDeepCopyFunc{ - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TestConfig).DeepCopyInto(out.(*TestConfig)) - return nil - }, InType: reflect.TypeOf(new(TestConfig))}, - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TestConfigV1).DeepCopyInto(out.(*TestConfigV1)) - return nil - }, InType: reflect.TypeOf(new(TestConfigV1))}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TestConfig) DeepCopyInto(out *TestConfig) { *out = *in diff --git a/pkg/image/admission/imagepolicy/api/v1/zz_generated.deepcopy.go b/pkg/image/admission/imagepolicy/api/v1/zz_generated.deepcopy.go index f4f91090b594..29285f77c55b 100644 --- a/pkg/image/admission/imagepolicy/api/v1/zz_generated.deepcopy.go +++ b/pkg/image/admission/imagepolicy/api/v1/zz_generated.deepcopy.go @@ -6,53 +6,10 @@ package v1 import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GroupResource).DeepCopyInto(out.(*GroupResource)) - return nil - }, InType: reflect.TypeOf(new(GroupResource))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageCondition).DeepCopyInto(out.(*ImageCondition)) - return nil - }, InType: reflect.TypeOf(new(ImageCondition))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageExecutionPolicyRule).DeepCopyInto(out.(*ImageExecutionPolicyRule)) - return nil - }, InType: reflect.TypeOf(new(ImageExecutionPolicyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImagePolicyConfig).DeepCopyInto(out.(*ImagePolicyConfig)) - return nil - }, InType: reflect.TypeOf(new(ImagePolicyConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageResolutionPolicyRule).DeepCopyInto(out.(*ImageResolutionPolicyRule)) - return nil - }, InType: reflect.TypeOf(new(ImageResolutionPolicyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageResolutionType).DeepCopyInto(out.(*ImageResolutionType)) - return nil - }, InType: reflect.TypeOf(new(ImageResolutionType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ValueCondition).DeepCopyInto(out.(*ValueCondition)) - return nil - }, InType: reflect.TypeOf(new(ValueCondition))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GroupResource) DeepCopyInto(out *GroupResource) { *out = *in diff --git a/pkg/image/admission/imagepolicy/api/zz_generated.deepcopy.go b/pkg/image/admission/imagepolicy/api/zz_generated.deepcopy.go index 4286d317eb09..60a0df3b501d 100644 --- a/pkg/image/admission/imagepolicy/api/zz_generated.deepcopy.go +++ b/pkg/image/admission/imagepolicy/api/zz_generated.deepcopy.go @@ -6,51 +6,12 @@ package api import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" labels "k8s.io/apimachinery/pkg/labels" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" - reflect "reflect" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageCondition).DeepCopyInto(out.(*ImageCondition)) - return nil - }, InType: reflect.TypeOf(new(ImageCondition))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageExecutionPolicyRule).DeepCopyInto(out.(*ImageExecutionPolicyRule)) - return nil - }, InType: reflect.TypeOf(new(ImageExecutionPolicyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImagePolicyConfig).DeepCopyInto(out.(*ImagePolicyConfig)) - return nil - }, InType: reflect.TypeOf(new(ImagePolicyConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageResolutionPolicyRule).DeepCopyInto(out.(*ImageResolutionPolicyRule)) - return nil - }, InType: reflect.TypeOf(new(ImageResolutionPolicyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageResolutionType).DeepCopyInto(out.(*ImageResolutionType)) - return nil - }, InType: reflect.TypeOf(new(ImageResolutionType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ValueCondition).DeepCopyInto(out.(*ValueCondition)) - return nil - }, InType: reflect.TypeOf(new(ValueCondition))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ImageCondition) DeepCopyInto(out *ImageCondition) { *out = *in diff --git a/pkg/image/apis/image/v1/zz_generated.conversion.go b/pkg/image/apis/image/v1/zz_generated.conversion.go index 5d83e0cd6981..80b86afedc37 100644 --- a/pkg/image/apis/image/v1/zz_generated.conversion.go +++ b/pkg/image/apis/image/v1/zz_generated.conversion.go @@ -7,12 +7,12 @@ package v1 import ( v1 "github.com/openshift/api/image/v1" image "github.com/openshift/origin/pkg/image/apis/image" - core_v1 "k8s.io/api/core/v1" + api_core_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/apis/core" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" unsafe "unsafe" ) @@ -150,13 +150,13 @@ func autoConvert_image_Image_To_v1_Image(in *image.Image, out *v1.Image, s conve } func autoConvert_v1_ImageImportSpec_To_image_ImageImportSpec(in *v1.ImageImportSpec, out *image.ImageImportSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } if in.To != nil { in, out := &in.To, &out.To - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -178,13 +178,13 @@ func Convert_v1_ImageImportSpec_To_image_ImageImportSpec(in *v1.ImageImportSpec, } func autoConvert_image_ImageImportSpec_To_v1_ImageImportSpec(in *image.ImageImportSpec, out *v1.ImageImportSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } if in.To != nil { in, out := &in.To, &out.To - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -783,7 +783,7 @@ func Convert_image_ImageStreamTagList_To_v1_ImageStreamTagList(in *image.ImageSt } func autoConvert_v1_RepositoryImportSpec_To_image_RepositoryImportSpec(in *v1.RepositoryImportSpec, out *image.RepositoryImportSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.From, &out.From, s); err != nil { return err } if err := Convert_v1_TagImportPolicy_To_image_TagImportPolicy(&in.ImportPolicy, &out.ImportPolicy, s); err != nil { @@ -802,7 +802,7 @@ func Convert_v1_RepositoryImportSpec_To_image_RepositoryImportSpec(in *v1.Reposi } func autoConvert_image_RepositoryImportSpec_To_v1_RepositoryImportSpec(in *image.RepositoryImportSpec, out *v1.RepositoryImportSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.From, &out.From, s); err != nil { return err } if err := Convert_image_TagImportPolicy_To_v1_TagImportPolicy(&in.ImportPolicy, &out.ImportPolicy, s); err != nil { @@ -866,7 +866,7 @@ func Convert_image_RepositoryImportStatus_To_v1_RepositoryImportStatus(in *image func autoConvert_v1_SignatureCondition_To_image_SignatureCondition(in *v1.SignatureCondition, out *image.SignatureCondition, s conversion.Scope) error { out.Type = image.SignatureConditionType(in.Type) - out.Status = api.ConditionStatus(in.Status) + out.Status = core.ConditionStatus(in.Status) out.LastProbeTime = in.LastProbeTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -881,7 +881,7 @@ func Convert_v1_SignatureCondition_To_image_SignatureCondition(in *v1.SignatureC func autoConvert_image_SignatureCondition_To_v1_SignatureCondition(in *image.SignatureCondition, out *v1.SignatureCondition, s conversion.Scope) error { out.Type = v1.SignatureConditionType(in.Type) - out.Status = core_v1.ConditionStatus(in.Status) + out.Status = api_core_v1.ConditionStatus(in.Status) out.LastProbeTime = in.LastProbeTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -994,7 +994,7 @@ func Convert_image_TagEvent_To_v1_TagEvent(in *image.TagEvent, out *v1.TagEvent, func autoConvert_v1_TagEventCondition_To_image_TagEventCondition(in *v1.TagEventCondition, out *image.TagEventCondition, s conversion.Scope) error { out.Type = image.TagEventConditionType(in.Type) - out.Status = api.ConditionStatus(in.Status) + out.Status = core.ConditionStatus(in.Status) out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason out.Message = in.Message @@ -1009,7 +1009,7 @@ func Convert_v1_TagEventCondition_To_image_TagEventCondition(in *v1.TagEventCond func autoConvert_image_TagEventCondition_To_v1_TagEventCondition(in *image.TagEventCondition, out *v1.TagEventCondition, s conversion.Scope) error { out.Type = v1.TagEventConditionType(in.Type) - out.Status = core_v1.ConditionStatus(in.Status) + out.Status = api_core_v1.ConditionStatus(in.Status) out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason out.Message = in.Message @@ -1049,8 +1049,8 @@ func autoConvert_v1_TagReference_To_image_TagReference(in *v1.TagReference, out out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) if in.From != nil { in, out := &in.From, &out.From - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { @@ -1077,8 +1077,8 @@ func autoConvert_image_TagReference_To_v1_TagReference(in *image.TagReference, o out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) if in.From != nil { in, out := &in.From, &out.From - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { diff --git a/pkg/image/apis/image/zz_generated.deepcopy.go b/pkg/image/apis/image/zz_generated.deepcopy.go index d7dbe1a828a8..32cfe2569f78 100644 --- a/pkg/image/apis/image/zz_generated.deepcopy.go +++ b/pkg/image/apis/image/zz_generated.deepcopy.go @@ -6,206 +6,11 @@ package image import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Descriptor).DeepCopyInto(out.(*Descriptor)) - return nil - }, InType: reflect.TypeOf(new(Descriptor))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerConfig).DeepCopyInto(out.(*DockerConfig)) - return nil - }, InType: reflect.TypeOf(new(DockerConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerConfigHistory).DeepCopyInto(out.(*DockerConfigHistory)) - return nil - }, InType: reflect.TypeOf(new(DockerConfigHistory))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerConfigRootFS).DeepCopyInto(out.(*DockerConfigRootFS)) - return nil - }, InType: reflect.TypeOf(new(DockerConfigRootFS))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerFSLayer).DeepCopyInto(out.(*DockerFSLayer)) - return nil - }, InType: reflect.TypeOf(new(DockerFSLayer))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerHistory).DeepCopyInto(out.(*DockerHistory)) - return nil - }, InType: reflect.TypeOf(new(DockerHistory))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerImage).DeepCopyInto(out.(*DockerImage)) - return nil - }, InType: reflect.TypeOf(new(DockerImage))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerImageConfig).DeepCopyInto(out.(*DockerImageConfig)) - return nil - }, InType: reflect.TypeOf(new(DockerImageConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerImageManifest).DeepCopyInto(out.(*DockerImageManifest)) - return nil - }, InType: reflect.TypeOf(new(DockerImageManifest))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerImageReference).DeepCopyInto(out.(*DockerImageReference)) - return nil - }, InType: reflect.TypeOf(new(DockerImageReference))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerV1CompatibilityImage).DeepCopyInto(out.(*DockerV1CompatibilityImage)) - return nil - }, InType: reflect.TypeOf(new(DockerV1CompatibilityImage))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*DockerV1CompatibilityImageSize).DeepCopyInto(out.(*DockerV1CompatibilityImageSize)) - return nil - }, InType: reflect.TypeOf(new(DockerV1CompatibilityImageSize))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Image).DeepCopyInto(out.(*Image)) - return nil - }, InType: reflect.TypeOf(new(Image))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageImportSpec).DeepCopyInto(out.(*ImageImportSpec)) - return nil - }, InType: reflect.TypeOf(new(ImageImportSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageImportStatus).DeepCopyInto(out.(*ImageImportStatus)) - return nil - }, InType: reflect.TypeOf(new(ImageImportStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageLayer).DeepCopyInto(out.(*ImageLayer)) - return nil - }, InType: reflect.TypeOf(new(ImageLayer))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageList).DeepCopyInto(out.(*ImageList)) - return nil - }, InType: reflect.TypeOf(new(ImageList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageLookupPolicy).DeepCopyInto(out.(*ImageLookupPolicy)) - return nil - }, InType: reflect.TypeOf(new(ImageLookupPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageSignature).DeepCopyInto(out.(*ImageSignature)) - return nil - }, InType: reflect.TypeOf(new(ImageSignature))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStream).DeepCopyInto(out.(*ImageStream)) - return nil - }, InType: reflect.TypeOf(new(ImageStream))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamImage).DeepCopyInto(out.(*ImageStreamImage)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamImage))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamImport).DeepCopyInto(out.(*ImageStreamImport)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamImport))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamImportSpec).DeepCopyInto(out.(*ImageStreamImportSpec)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamImportSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamImportStatus).DeepCopyInto(out.(*ImageStreamImportStatus)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamImportStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamList).DeepCopyInto(out.(*ImageStreamList)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamMapping).DeepCopyInto(out.(*ImageStreamMapping)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamMapping))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamSpec).DeepCopyInto(out.(*ImageStreamSpec)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamStatus).DeepCopyInto(out.(*ImageStreamStatus)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamTag).DeepCopyInto(out.(*ImageStreamTag)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamTag))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ImageStreamTagList).DeepCopyInto(out.(*ImageStreamTagList)) - return nil - }, InType: reflect.TypeOf(new(ImageStreamTagList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RepositoryImportSpec).DeepCopyInto(out.(*RepositoryImportSpec)) - return nil - }, InType: reflect.TypeOf(new(RepositoryImportSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RepositoryImportStatus).DeepCopyInto(out.(*RepositoryImportStatus)) - return nil - }, InType: reflect.TypeOf(new(RepositoryImportStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SignatureCondition).DeepCopyInto(out.(*SignatureCondition)) - return nil - }, InType: reflect.TypeOf(new(SignatureCondition))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SignatureConditionType).DeepCopyInto(out.(*SignatureConditionType)) - return nil - }, InType: reflect.TypeOf(new(SignatureConditionType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SignatureGenericEntity).DeepCopyInto(out.(*SignatureGenericEntity)) - return nil - }, InType: reflect.TypeOf(new(SignatureGenericEntity))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SignatureIssuer).DeepCopyInto(out.(*SignatureIssuer)) - return nil - }, InType: reflect.TypeOf(new(SignatureIssuer))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SignatureSubject).DeepCopyInto(out.(*SignatureSubject)) - return nil - }, InType: reflect.TypeOf(new(SignatureSubject))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagEvent).DeepCopyInto(out.(*TagEvent)) - return nil - }, InType: reflect.TypeOf(new(TagEvent))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagEventCondition).DeepCopyInto(out.(*TagEventCondition)) - return nil - }, InType: reflect.TypeOf(new(TagEventCondition))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagEventConditionType).DeepCopyInto(out.(*TagEventConditionType)) - return nil - }, InType: reflect.TypeOf(new(TagEventConditionType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagEventList).DeepCopyInto(out.(*TagEventList)) - return nil - }, InType: reflect.TypeOf(new(TagEventList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagImportPolicy).DeepCopyInto(out.(*TagImportPolicy)) - return nil - }, InType: reflect.TypeOf(new(TagImportPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagReference).DeepCopyInto(out.(*TagReference)) - return nil - }, InType: reflect.TypeOf(new(TagReference))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagReferencePolicy).DeepCopyInto(out.(*TagReferencePolicy)) - return nil - }, InType: reflect.TypeOf(new(TagReferencePolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TagReferencePolicyType).DeepCopyInto(out.(*TagReferencePolicyType)) - return nil - }, InType: reflect.TypeOf(new(TagReferencePolicyType))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Descriptor) DeepCopyInto(out *Descriptor) { *out = *in @@ -600,7 +405,7 @@ func (in *ImageImportSpec) DeepCopyInto(out *ImageImportSpec) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } @@ -1386,7 +1191,7 @@ func (in *TagReference) DeepCopyInto(out *TagReference) { if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } diff --git a/pkg/image/generated/informers/internalversion/factory.go b/pkg/image/generated/informers/internalversion/factory.go index 1ce239ef2cd1..3f703e3c633f 100644 --- a/pkg/image/generated/informers/internalversion/factory.go +++ b/pkg/image/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( image "github.com/openshift/origin/pkg/image/generated/informers/internalversion/image" internalinterfaces "github.com/openshift/origin/pkg/image/generated/informers/internalversion/internalinterfaces" internalclientset "github.com/openshift/origin/pkg/image/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Image() image.Interface { - return image.New(f) + return image.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/image/generated/informers/internalversion/generic.go b/pkg/image/generated/informers/internalversion/generic.go index 43d9ce69c3c2..6ddab1c78b96 100644 --- a/pkg/image/generated/informers/internalversion/generic.go +++ b/pkg/image/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Image, Version=InternalVersion + // Group=image.openshift.io, Version=internalVersion case image.SchemeGroupVersion.WithResource("images"): return &genericInformer{resource: resource.GroupResource(), informer: f.Image().InternalVersion().Images().Informer()}, nil case image.SchemeGroupVersion.WithResource("imagestreams"): diff --git a/pkg/image/generated/informers/internalversion/image/interface.go b/pkg/image/generated/informers/internalversion/image/interface.go index 12e932b7bcbb..ab7ad3b65fe5 100644 --- a/pkg/image/generated/informers/internalversion/image/interface.go +++ b/pkg/image/generated/informers/internalversion/image/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/image/generated/informers/internalversion/image/internalversion/image.go b/pkg/image/generated/informers/internalversion/image/internalversion/image.go index 3d68ef508b46..a8a9c6d18643 100644 --- a/pkg/image/generated/informers/internalversion/image/internalversion/image.go +++ b/pkg/image/generated/informers/internalversion/image/internalversion/image.go @@ -22,19 +22,33 @@ type ImageInformer interface { } type imageInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewImageInformer constructs a new informer for Image type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewImageInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredImageInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredImageInformer constructs a new informer for Image type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredImageInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Image().Images().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Image().Images().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewImageInformer(client internalclientset.Interface, resyncPeriod time.Dura ) } -func defaultImageInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewImageInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *imageInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredImageInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *imageInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&image.Image{}, defaultImageInformer) + return f.factory.InformerFor(&image.Image{}, f.defaultInformer) } func (f *imageInformer) Lister() internalversion.ImageLister { diff --git a/pkg/image/generated/informers/internalversion/image/internalversion/imagestream.go b/pkg/image/generated/informers/internalversion/image/internalversion/imagestream.go index dfb991529891..166e5ce3a3db 100644 --- a/pkg/image/generated/informers/internalversion/image/internalversion/imagestream.go +++ b/pkg/image/generated/informers/internalversion/image/internalversion/imagestream.go @@ -22,19 +22,34 @@ type ImageStreamInformer interface { } type imageStreamInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewImageStreamInformer constructs a new informer for ImageStream type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewImageStreamInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredImageStreamInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredImageStreamInformer constructs a new informer for ImageStream type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredImageStreamInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Image().ImageStreams(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Image().ImageStreams(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewImageStreamInformer(client internalclientset.Interface, namespace string ) } -func defaultImageStreamInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewImageStreamInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *imageStreamInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredImageStreamInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *imageStreamInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&image.ImageStream{}, defaultImageStreamInformer) + return f.factory.InformerFor(&image.ImageStream{}, f.defaultInformer) } func (f *imageStreamInformer) Lister() internalversion.ImageStreamLister { diff --git a/pkg/image/generated/informers/internalversion/image/internalversion/interface.go b/pkg/image/generated/informers/internalversion/image/internalversion/interface.go index 038e2cbb6d0e..e4b65bd771fb 100644 --- a/pkg/image/generated/informers/internalversion/image/internalversion/interface.go +++ b/pkg/image/generated/informers/internalversion/image/internalversion/interface.go @@ -15,20 +15,22 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // Images returns a ImageInformer. func (v *version) Images() ImageInformer { - return &imageInformer{factory: v.SharedInformerFactory} + return &imageInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // ImageStreams returns a ImageStreamInformer. func (v *version) ImageStreams() ImageStreamInformer { - return &imageStreamInformer{factory: v.SharedInformerFactory} + return &imageStreamInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/image/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/image/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index abd57de68dca..22a94cd299e2 100644 --- a/pkg/image/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/image/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/image/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/image/generated/internalclientset/doc.go b/pkg/image/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/image/generated/internalclientset/doc.go +++ b/pkg/image/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/image/generated/internalclientset/fake/doc.go b/pkg/image/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/image/generated/internalclientset/fake/doc.go +++ b/pkg/image/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/image/generated/internalclientset/scheme/doc.go b/pkg/image/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/image/generated/internalclientset/scheme/doc.go +++ b/pkg/image/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/image/generated/internalclientset/typed/image/internalversion/doc.go b/pkg/image/generated/internalclientset/typed/image/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/image/generated/internalclientset/typed/image/internalversion/doc.go +++ b/pkg/image/generated/internalclientset/typed/image/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/image/generated/internalclientset/typed/image/internalversion/fake/doc.go b/pkg/image/generated/internalclientset/typed/image/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/image/generated/internalclientset/typed/image/internalversion/fake/doc.go +++ b/pkg/image/generated/internalclientset/typed/image/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/image/generated/internalclientset/typed/image/internalversion/fake/fake_imagestream.go b/pkg/image/generated/internalclientset/typed/image/internalversion/fake/fake_imagestream.go index 60693da02694..3e2dfe277cca 100644 --- a/pkg/image/generated/internalclientset/typed/image/internalversion/fake/fake_imagestream.go +++ b/pkg/image/generated/internalclientset/typed/image/internalversion/fake/fake_imagestream.go @@ -8,7 +8,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - api api "k8s.io/kubernetes/pkg/apis/core" + core "k8s.io/kubernetes/pkg/apis/core" ) // FakeImageStreams implements ImageStreamInterface @@ -123,12 +123,12 @@ func (c *FakeImageStreams) Patch(name string, pt types.PatchType, data []byte, s } // Secrets takes label and field selectors, and returns the list of Secrets that match those selectors. -func (c *FakeImageStreams) Secrets(imageStreamName string, opts v1.ListOptions) (result *api.SecretList, err error) { +func (c *FakeImageStreams) Secrets(imageStreamName string, opts v1.ListOptions) (result *core.SecretList, err error) { obj, err := c.Fake. - Invokes(testing.NewListSubresourceAction(imagestreamsResource, imageStreamName, "secrets", imagestreamsKind, c.ns, opts), &api.SecretList{}) + Invokes(testing.NewListSubresourceAction(imagestreamsResource, imageStreamName, "secrets", imagestreamsKind, c.ns, opts), &core.SecretList{}) if obj == nil { return nil, err } - return obj.(*api.SecretList), err + return obj.(*core.SecretList), err } diff --git a/pkg/image/generated/internalclientset/typed/image/internalversion/imagestream.go b/pkg/image/generated/internalclientset/typed/image/internalversion/imagestream.go index 9e84f418724f..7571b131b780 100644 --- a/pkg/image/generated/internalclientset/typed/image/internalversion/imagestream.go +++ b/pkg/image/generated/internalclientset/typed/image/internalversion/imagestream.go @@ -7,7 +7,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api api "k8s.io/kubernetes/pkg/apis/core" + core "k8s.io/kubernetes/pkg/apis/core" ) // ImageStreamsGetter has a method to return a ImageStreamInterface. @@ -27,7 +27,7 @@ type ImageStreamInterface interface { List(opts v1.ListOptions) (*image.ImageStreamList, error) Watch(opts v1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *image.ImageStream, err error) - Secrets(imageStreamName string, opts v1.ListOptions) (*api.SecretList, error) + Secrets(imageStreamName string, opts v1.ListOptions) (*core.SecretList, error) ImageStreamExpansion } @@ -159,8 +159,8 @@ func (c *imageStreams) Patch(name string, pt types.PatchType, data []byte, subre } // Secrets takes image.ImageStream name, label and field selectors, and returns the list of Secrets that match those selectors. -func (c *imageStreams) Secrets(imageStreamName string, opts v1.ListOptions) (result *api.SecretList, err error) { - result = &api.SecretList{} +func (c *imageStreams) Secrets(imageStreamName string, opts v1.ListOptions) (result *core.SecretList, err error) { + result = &core.SecretList{} err = c.client.Get(). Namespace(c.ns). Resource("imagestreams"). diff --git a/pkg/ingress/admission/api/v1/zz_generated.deepcopy.go b/pkg/ingress/admission/api/v1/zz_generated.deepcopy.go index 1b1c3a63c9bf..4f35d59951a4 100644 --- a/pkg/ingress/admission/api/v1/zz_generated.deepcopy.go +++ b/pkg/ingress/admission/api/v1/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package v1 import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*IngressAdmissionConfig).DeepCopyInto(out.(*IngressAdmissionConfig)) - return nil - }, InType: reflect.TypeOf(new(IngressAdmissionConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IngressAdmissionConfig) DeepCopyInto(out *IngressAdmissionConfig) { *out = *in diff --git a/pkg/ingress/admission/api/zz_generated.deepcopy.go b/pkg/ingress/admission/api/zz_generated.deepcopy.go index 90c0c832e5ea..e93bb0d8c0db 100644 --- a/pkg/ingress/admission/api/zz_generated.deepcopy.go +++ b/pkg/ingress/admission/api/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package api import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*IngressAdmissionConfig).DeepCopyInto(out.(*IngressAdmissionConfig)) - return nil - }, InType: reflect.TypeOf(new(IngressAdmissionConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IngressAdmissionConfig) DeepCopyInto(out *IngressAdmissionConfig) { *out = *in diff --git a/pkg/network/apis/network/zz_generated.deepcopy.go b/pkg/network/apis/network/zz_generated.deepcopy.go index 21df29525b7c..e5ff0b7c73e6 100644 --- a/pkg/network/apis/network/zz_generated.deepcopy.go +++ b/pkg/network/apis/network/zz_generated.deepcopy.go @@ -5,77 +5,10 @@ package network import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterNetwork).DeepCopyInto(out.(*ClusterNetwork)) - return nil - }, InType: reflect.TypeOf(new(ClusterNetwork))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterNetworkEntry).DeepCopyInto(out.(*ClusterNetworkEntry)) - return nil - }, InType: reflect.TypeOf(new(ClusterNetworkEntry))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterNetworkList).DeepCopyInto(out.(*ClusterNetworkList)) - return nil - }, InType: reflect.TypeOf(new(ClusterNetworkList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EgressNetworkPolicy).DeepCopyInto(out.(*EgressNetworkPolicy)) - return nil - }, InType: reflect.TypeOf(new(EgressNetworkPolicy))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EgressNetworkPolicyList).DeepCopyInto(out.(*EgressNetworkPolicyList)) - return nil - }, InType: reflect.TypeOf(new(EgressNetworkPolicyList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EgressNetworkPolicyPeer).DeepCopyInto(out.(*EgressNetworkPolicyPeer)) - return nil - }, InType: reflect.TypeOf(new(EgressNetworkPolicyPeer))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EgressNetworkPolicyRule).DeepCopyInto(out.(*EgressNetworkPolicyRule)) - return nil - }, InType: reflect.TypeOf(new(EgressNetworkPolicyRule))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EgressNetworkPolicyRuleType).DeepCopyInto(out.(*EgressNetworkPolicyRuleType)) - return nil - }, InType: reflect.TypeOf(new(EgressNetworkPolicyRuleType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*EgressNetworkPolicySpec).DeepCopyInto(out.(*EgressNetworkPolicySpec)) - return nil - }, InType: reflect.TypeOf(new(EgressNetworkPolicySpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*HostSubnet).DeepCopyInto(out.(*HostSubnet)) - return nil - }, InType: reflect.TypeOf(new(HostSubnet))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*HostSubnetList).DeepCopyInto(out.(*HostSubnetList)) - return nil - }, InType: reflect.TypeOf(new(HostSubnetList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NetNamespace).DeepCopyInto(out.(*NetNamespace)) - return nil - }, InType: reflect.TypeOf(new(NetNamespace))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*NetNamespaceList).DeepCopyInto(out.(*NetNamespaceList)) - return nil - }, InType: reflect.TypeOf(new(NetNamespaceList))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterNetwork) DeepCopyInto(out *ClusterNetwork) { *out = *in diff --git a/pkg/network/generated/informers/internalversion/factory.go b/pkg/network/generated/informers/internalversion/factory.go index 330a012f6e52..f6438dc69a42 100644 --- a/pkg/network/generated/informers/internalversion/factory.go +++ b/pkg/network/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/network/generated/informers/internalversion/internalinterfaces" network "github.com/openshift/origin/pkg/network/generated/informers/internalversion/network" internalclientset "github.com/openshift/origin/pkg/network/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Network() network.Interface { - return network.New(f) + return network.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/network/generated/informers/internalversion/generic.go b/pkg/network/generated/informers/internalversion/generic.go index a959eed686d0..e87bbdee8569 100644 --- a/pkg/network/generated/informers/internalversion/generic.go +++ b/pkg/network/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Network, Version=InternalVersion + // Group=network.openshift.io, Version=internalVersion case network.SchemeGroupVersion.WithResource("clusternetworks"): return &genericInformer{resource: resource.GroupResource(), informer: f.Network().InternalVersion().ClusterNetworks().Informer()}, nil case network.SchemeGroupVersion.WithResource("egressnetworkpolicies"): diff --git a/pkg/network/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/network/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index 6ab3276619b3..ce815a87b482 100644 --- a/pkg/network/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/network/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/network/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/network/generated/informers/internalversion/network/interface.go b/pkg/network/generated/informers/internalversion/network/interface.go index 3ccfc13ce19a..d51916f2644e 100644 --- a/pkg/network/generated/informers/internalversion/network/interface.go +++ b/pkg/network/generated/informers/internalversion/network/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/network/generated/informers/internalversion/network/internalversion/clusternetwork.go b/pkg/network/generated/informers/internalversion/network/internalversion/clusternetwork.go index 0979bbd3592c..dc471239ffdb 100644 --- a/pkg/network/generated/informers/internalversion/network/internalversion/clusternetwork.go +++ b/pkg/network/generated/informers/internalversion/network/internalversion/clusternetwork.go @@ -22,19 +22,33 @@ type ClusterNetworkInformer interface { } type clusterNetworkInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewClusterNetworkInformer constructs a new informer for ClusterNetwork type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewClusterNetworkInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredClusterNetworkInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredClusterNetworkInformer constructs a new informer for ClusterNetwork type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredClusterNetworkInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().ClusterNetworks().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().ClusterNetworks().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewClusterNetworkInformer(client internalclientset.Interface, resyncPeriod ) } -func defaultClusterNetworkInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewClusterNetworkInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *clusterNetworkInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredClusterNetworkInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *clusterNetworkInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&network.ClusterNetwork{}, defaultClusterNetworkInformer) + return f.factory.InformerFor(&network.ClusterNetwork{}, f.defaultInformer) } func (f *clusterNetworkInformer) Lister() internalversion.ClusterNetworkLister { diff --git a/pkg/network/generated/informers/internalversion/network/internalversion/egressnetworkpolicy.go b/pkg/network/generated/informers/internalversion/network/internalversion/egressnetworkpolicy.go index a3c97b57fa1c..fc0800b8cd5b 100644 --- a/pkg/network/generated/informers/internalversion/network/internalversion/egressnetworkpolicy.go +++ b/pkg/network/generated/informers/internalversion/network/internalversion/egressnetworkpolicy.go @@ -22,19 +22,34 @@ type EgressNetworkPolicyInformer interface { } type egressNetworkPolicyInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewEgressNetworkPolicyInformer constructs a new informer for EgressNetworkPolicy type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewEgressNetworkPolicyInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredEgressNetworkPolicyInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredEgressNetworkPolicyInformer constructs a new informer for EgressNetworkPolicy type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredEgressNetworkPolicyInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().EgressNetworkPolicies(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().EgressNetworkPolicies(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewEgressNetworkPolicyInformer(client internalclientset.Interface, namespac ) } -func defaultEgressNetworkPolicyInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewEgressNetworkPolicyInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *egressNetworkPolicyInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredEgressNetworkPolicyInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *egressNetworkPolicyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&network.EgressNetworkPolicy{}, defaultEgressNetworkPolicyInformer) + return f.factory.InformerFor(&network.EgressNetworkPolicy{}, f.defaultInformer) } func (f *egressNetworkPolicyInformer) Lister() internalversion.EgressNetworkPolicyLister { diff --git a/pkg/network/generated/informers/internalversion/network/internalversion/hostsubnet.go b/pkg/network/generated/informers/internalversion/network/internalversion/hostsubnet.go index 2467792ec174..ce6f134b0f86 100644 --- a/pkg/network/generated/informers/internalversion/network/internalversion/hostsubnet.go +++ b/pkg/network/generated/informers/internalversion/network/internalversion/hostsubnet.go @@ -22,19 +22,33 @@ type HostSubnetInformer interface { } type hostSubnetInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewHostSubnetInformer constructs a new informer for HostSubnet type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewHostSubnetInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredHostSubnetInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredHostSubnetInformer constructs a new informer for HostSubnet type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredHostSubnetInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().HostSubnets().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().HostSubnets().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewHostSubnetInformer(client internalclientset.Interface, resyncPeriod time ) } -func defaultHostSubnetInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewHostSubnetInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *hostSubnetInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredHostSubnetInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *hostSubnetInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&network.HostSubnet{}, defaultHostSubnetInformer) + return f.factory.InformerFor(&network.HostSubnet{}, f.defaultInformer) } func (f *hostSubnetInformer) Lister() internalversion.HostSubnetLister { diff --git a/pkg/network/generated/informers/internalversion/network/internalversion/interface.go b/pkg/network/generated/informers/internalversion/network/internalversion/interface.go index 5636d15159ae..2245a06b5451 100644 --- a/pkg/network/generated/informers/internalversion/network/internalversion/interface.go +++ b/pkg/network/generated/informers/internalversion/network/internalversion/interface.go @@ -19,30 +19,32 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // ClusterNetworks returns a ClusterNetworkInformer. func (v *version) ClusterNetworks() ClusterNetworkInformer { - return &clusterNetworkInformer{factory: v.SharedInformerFactory} + return &clusterNetworkInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // EgressNetworkPolicies returns a EgressNetworkPolicyInformer. func (v *version) EgressNetworkPolicies() EgressNetworkPolicyInformer { - return &egressNetworkPolicyInformer{factory: v.SharedInformerFactory} + return &egressNetworkPolicyInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // HostSubnets returns a HostSubnetInformer. func (v *version) HostSubnets() HostSubnetInformer { - return &hostSubnetInformer{factory: v.SharedInformerFactory} + return &hostSubnetInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // NetNamespaces returns a NetNamespaceInformer. func (v *version) NetNamespaces() NetNamespaceInformer { - return &netNamespaceInformer{factory: v.SharedInformerFactory} + return &netNamespaceInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/network/generated/informers/internalversion/network/internalversion/netnamespace.go b/pkg/network/generated/informers/internalversion/network/internalversion/netnamespace.go index 31f3f31c7d91..29d7a589b542 100644 --- a/pkg/network/generated/informers/internalversion/network/internalversion/netnamespace.go +++ b/pkg/network/generated/informers/internalversion/network/internalversion/netnamespace.go @@ -22,19 +22,33 @@ type NetNamespaceInformer interface { } type netNamespaceInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewNetNamespaceInformer constructs a new informer for NetNamespace type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewNetNamespaceInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredNetNamespaceInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredNetNamespaceInformer constructs a new informer for NetNamespace type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredNetNamespaceInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().NetNamespaces().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Network().NetNamespaces().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewNetNamespaceInformer(client internalclientset.Interface, resyncPeriod ti ) } -func defaultNetNamespaceInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewNetNamespaceInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *netNamespaceInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredNetNamespaceInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *netNamespaceInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&network.NetNamespace{}, defaultNetNamespaceInformer) + return f.factory.InformerFor(&network.NetNamespace{}, f.defaultInformer) } func (f *netNamespaceInformer) Lister() internalversion.NetNamespaceLister { diff --git a/pkg/network/generated/internalclientset/doc.go b/pkg/network/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/network/generated/internalclientset/doc.go +++ b/pkg/network/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/network/generated/internalclientset/fake/doc.go b/pkg/network/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/network/generated/internalclientset/fake/doc.go +++ b/pkg/network/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/network/generated/internalclientset/scheme/doc.go b/pkg/network/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/network/generated/internalclientset/scheme/doc.go +++ b/pkg/network/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/network/generated/internalclientset/typed/network/internalversion/doc.go b/pkg/network/generated/internalclientset/typed/network/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/network/generated/internalclientset/typed/network/internalversion/doc.go +++ b/pkg/network/generated/internalclientset/typed/network/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/network/generated/internalclientset/typed/network/internalversion/fake/doc.go b/pkg/network/generated/internalclientset/typed/network/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/network/generated/internalclientset/typed/network/internalversion/fake/doc.go +++ b/pkg/network/generated/internalclientset/typed/network/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/oauth/apis/oauth/zz_generated.deepcopy.go b/pkg/oauth/apis/oauth/zz_generated.deepcopy.go index d2d7127ed825..2b9d98fd3462 100644 --- a/pkg/oauth/apis/oauth/zz_generated.deepcopy.go +++ b/pkg/oauth/apis/oauth/zz_generated.deepcopy.go @@ -5,77 +5,10 @@ package oauth import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterRoleScopeRestriction).DeepCopyInto(out.(*ClusterRoleScopeRestriction)) - return nil - }, InType: reflect.TypeOf(new(ClusterRoleScopeRestriction))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GrantHandlerType).DeepCopyInto(out.(*GrantHandlerType)) - return nil - }, InType: reflect.TypeOf(new(GrantHandlerType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthAccessToken).DeepCopyInto(out.(*OAuthAccessToken)) - return nil - }, InType: reflect.TypeOf(new(OAuthAccessToken))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthAccessTokenList).DeepCopyInto(out.(*OAuthAccessTokenList)) - return nil - }, InType: reflect.TypeOf(new(OAuthAccessTokenList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthAuthorizeToken).DeepCopyInto(out.(*OAuthAuthorizeToken)) - return nil - }, InType: reflect.TypeOf(new(OAuthAuthorizeToken))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthAuthorizeTokenList).DeepCopyInto(out.(*OAuthAuthorizeTokenList)) - return nil - }, InType: reflect.TypeOf(new(OAuthAuthorizeTokenList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthClient).DeepCopyInto(out.(*OAuthClient)) - return nil - }, InType: reflect.TypeOf(new(OAuthClient))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthClientAuthorization).DeepCopyInto(out.(*OAuthClientAuthorization)) - return nil - }, InType: reflect.TypeOf(new(OAuthClientAuthorization))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthClientAuthorizationList).DeepCopyInto(out.(*OAuthClientAuthorizationList)) - return nil - }, InType: reflect.TypeOf(new(OAuthClientAuthorizationList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthClientList).DeepCopyInto(out.(*OAuthClientList)) - return nil - }, InType: reflect.TypeOf(new(OAuthClientList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*OAuthRedirectReference).DeepCopyInto(out.(*OAuthRedirectReference)) - return nil - }, InType: reflect.TypeOf(new(OAuthRedirectReference))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RedirectReference).DeepCopyInto(out.(*RedirectReference)) - return nil - }, InType: reflect.TypeOf(new(RedirectReference))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ScopeRestriction).DeepCopyInto(out.(*ScopeRestriction)) - return nil - }, InType: reflect.TypeOf(new(ScopeRestriction))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterRoleScopeRestriction) DeepCopyInto(out *ClusterRoleScopeRestriction) { *out = *in diff --git a/pkg/oauth/generated/informers/internalversion/factory.go b/pkg/oauth/generated/informers/internalversion/factory.go index 13d176bfed82..d7e664f08c5a 100644 --- a/pkg/oauth/generated/informers/internalversion/factory.go +++ b/pkg/oauth/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/oauth/generated/informers/internalversion/internalinterfaces" oauth "github.com/openshift/origin/pkg/oauth/generated/informers/internalversion/oauth" internalclientset "github.com/openshift/origin/pkg/oauth/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Oauth() oauth.Interface { - return oauth.New(f) + return oauth.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/oauth/generated/informers/internalversion/generic.go b/pkg/oauth/generated/informers/internalversion/generic.go index e62c80746255..75c37ab2f603 100644 --- a/pkg/oauth/generated/informers/internalversion/generic.go +++ b/pkg/oauth/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Oauth, Version=InternalVersion + // Group=oauth.openshift.io, Version=internalVersion case oauth.SchemeGroupVersion.WithResource("oauthaccesstokens"): return &genericInformer{resource: resource.GroupResource(), informer: f.Oauth().InternalVersion().OAuthAccessTokens().Informer()}, nil case oauth.SchemeGroupVersion.WithResource("oauthauthorizetokens"): diff --git a/pkg/oauth/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/oauth/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index 0bfb05f552f1..d9f6a7804df1 100644 --- a/pkg/oauth/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/oauth/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/oauth/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/oauth/generated/informers/internalversion/oauth/interface.go b/pkg/oauth/generated/informers/internalversion/oauth/interface.go index 3fbab34b89a2..f1648645a480 100644 --- a/pkg/oauth/generated/informers/internalversion/oauth/interface.go +++ b/pkg/oauth/generated/informers/internalversion/oauth/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/interface.go b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/interface.go index e3728e9be7e6..4dfc9763e1f0 100644 --- a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/interface.go +++ b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/interface.go @@ -19,30 +19,32 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // OAuthAccessTokens returns a OAuthAccessTokenInformer. func (v *version) OAuthAccessTokens() OAuthAccessTokenInformer { - return &oAuthAccessTokenInformer{factory: v.SharedInformerFactory} + return &oAuthAccessTokenInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // OAuthAuthorizeTokens returns a OAuthAuthorizeTokenInformer. func (v *version) OAuthAuthorizeTokens() OAuthAuthorizeTokenInformer { - return &oAuthAuthorizeTokenInformer{factory: v.SharedInformerFactory} + return &oAuthAuthorizeTokenInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // OAuthClients returns a OAuthClientInformer. func (v *version) OAuthClients() OAuthClientInformer { - return &oAuthClientInformer{factory: v.SharedInformerFactory} + return &oAuthClientInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // OAuthClientAuthorizations returns a OAuthClientAuthorizationInformer. func (v *version) OAuthClientAuthorizations() OAuthClientAuthorizationInformer { - return &oAuthClientAuthorizationInformer{factory: v.SharedInformerFactory} + return &oAuthClientAuthorizationInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthaccesstoken.go b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthaccesstoken.go index 5f7083359f85..e108a1bb4012 100644 --- a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthaccesstoken.go +++ b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthaccesstoken.go @@ -22,19 +22,33 @@ type OAuthAccessTokenInformer interface { } type oAuthAccessTokenInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewOAuthAccessTokenInformer constructs a new informer for OAuthAccessToken type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewOAuthAccessTokenInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredOAuthAccessTokenInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredOAuthAccessTokenInformer constructs a new informer for OAuthAccessToken type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredOAuthAccessTokenInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthAccessTokens().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthAccessTokens().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewOAuthAccessTokenInformer(client internalclientset.Interface, resyncPerio ) } -func defaultOAuthAccessTokenInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewOAuthAccessTokenInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *oAuthAccessTokenInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredOAuthAccessTokenInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *oAuthAccessTokenInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&oauth.OAuthAccessToken{}, defaultOAuthAccessTokenInformer) + return f.factory.InformerFor(&oauth.OAuthAccessToken{}, f.defaultInformer) } func (f *oAuthAccessTokenInformer) Lister() internalversion.OAuthAccessTokenLister { diff --git a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthauthorizetoken.go b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthauthorizetoken.go index 0df1f3f0b7ac..23c55f1d9b3b 100644 --- a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthauthorizetoken.go +++ b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthauthorizetoken.go @@ -22,19 +22,33 @@ type OAuthAuthorizeTokenInformer interface { } type oAuthAuthorizeTokenInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewOAuthAuthorizeTokenInformer constructs a new informer for OAuthAuthorizeToken type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewOAuthAuthorizeTokenInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredOAuthAuthorizeTokenInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredOAuthAuthorizeTokenInformer constructs a new informer for OAuthAuthorizeToken type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredOAuthAuthorizeTokenInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthAuthorizeTokens().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthAuthorizeTokens().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewOAuthAuthorizeTokenInformer(client internalclientset.Interface, resyncPe ) } -func defaultOAuthAuthorizeTokenInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewOAuthAuthorizeTokenInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *oAuthAuthorizeTokenInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredOAuthAuthorizeTokenInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *oAuthAuthorizeTokenInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&oauth.OAuthAuthorizeToken{}, defaultOAuthAuthorizeTokenInformer) + return f.factory.InformerFor(&oauth.OAuthAuthorizeToken{}, f.defaultInformer) } func (f *oAuthAuthorizeTokenInformer) Lister() internalversion.OAuthAuthorizeTokenLister { diff --git a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclient.go b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclient.go index 488efc560f0e..39c96dbcad11 100644 --- a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclient.go +++ b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclient.go @@ -22,19 +22,33 @@ type OAuthClientInformer interface { } type oAuthClientInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewOAuthClientInformer constructs a new informer for OAuthClient type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewOAuthClientInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredOAuthClientInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredOAuthClientInformer constructs a new informer for OAuthClient type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredOAuthClientInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthClients().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthClients().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewOAuthClientInformer(client internalclientset.Interface, resyncPeriod tim ) } -func defaultOAuthClientInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewOAuthClientInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *oAuthClientInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredOAuthClientInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *oAuthClientInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&oauth.OAuthClient{}, defaultOAuthClientInformer) + return f.factory.InformerFor(&oauth.OAuthClient{}, f.defaultInformer) } func (f *oAuthClientInformer) Lister() internalversion.OAuthClientLister { diff --git a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclientauthorization.go b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclientauthorization.go index fbfbdaeba727..1ab03e24f43f 100644 --- a/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclientauthorization.go +++ b/pkg/oauth/generated/informers/internalversion/oauth/internalversion/oauthclientauthorization.go @@ -22,19 +22,33 @@ type OAuthClientAuthorizationInformer interface { } type oAuthClientAuthorizationInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewOAuthClientAuthorizationInformer constructs a new informer for OAuthClientAuthorization type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewOAuthClientAuthorizationInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredOAuthClientAuthorizationInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredOAuthClientAuthorizationInformer constructs a new informer for OAuthClientAuthorization type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredOAuthClientAuthorizationInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthClientAuthorizations().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Oauth().OAuthClientAuthorizations().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewOAuthClientAuthorizationInformer(client internalclientset.Interface, res ) } -func defaultOAuthClientAuthorizationInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewOAuthClientAuthorizationInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *oAuthClientAuthorizationInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredOAuthClientAuthorizationInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *oAuthClientAuthorizationInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&oauth.OAuthClientAuthorization{}, defaultOAuthClientAuthorizationInformer) + return f.factory.InformerFor(&oauth.OAuthClientAuthorization{}, f.defaultInformer) } func (f *oAuthClientAuthorizationInformer) Lister() internalversion.OAuthClientAuthorizationLister { diff --git a/pkg/oauth/generated/internalclientset/doc.go b/pkg/oauth/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/oauth/generated/internalclientset/doc.go +++ b/pkg/oauth/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/oauth/generated/internalclientset/fake/doc.go b/pkg/oauth/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/oauth/generated/internalclientset/fake/doc.go +++ b/pkg/oauth/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/oauth/generated/internalclientset/scheme/doc.go b/pkg/oauth/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/oauth/generated/internalclientset/scheme/doc.go +++ b/pkg/oauth/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/doc.go b/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/doc.go +++ b/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/fake/doc.go b/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/fake/doc.go +++ b/pkg/oauth/generated/internalclientset/typed/oauth/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/project/admission/lifecycle/testing/zz_generated.deepcopy.go b/pkg/project/admission/lifecycle/testing/zz_generated.deepcopy.go index 3c77643696bc..d21d7e2898d6 100644 --- a/pkg/project/admission/lifecycle/testing/zz_generated.deepcopy.go +++ b/pkg/project/admission/lifecycle/testing/zz_generated.deepcopy.go @@ -5,23 +5,9 @@ package testing import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc { - return []conversion.GeneratedDeepCopyFunc{ - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UnknownObject).DeepCopyInto(out.(*UnknownObject)) - return nil - }, InType: reflect.TypeOf(new(UnknownObject))}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *UnknownObject) DeepCopyInto(out *UnknownObject) { *out = *in diff --git a/pkg/project/admission/requestlimit/api/v1/zz_generated.deepcopy.go b/pkg/project/admission/requestlimit/api/v1/zz_generated.deepcopy.go index 35347a3ca5d4..0338031a52bd 100644 --- a/pkg/project/admission/requestlimit/api/v1/zz_generated.deepcopy.go +++ b/pkg/project/admission/requestlimit/api/v1/zz_generated.deepcopy.go @@ -5,32 +5,9 @@ package v1 import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectLimitBySelector).DeepCopyInto(out.(*ProjectLimitBySelector)) - return nil - }, InType: reflect.TypeOf(new(ProjectLimitBySelector))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectRequestLimitConfig).DeepCopyInto(out.(*ProjectRequestLimitConfig)) - return nil - }, InType: reflect.TypeOf(new(ProjectRequestLimitConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ProjectLimitBySelector) DeepCopyInto(out *ProjectLimitBySelector) { *out = *in diff --git a/pkg/project/admission/requestlimit/api/zz_generated.deepcopy.go b/pkg/project/admission/requestlimit/api/zz_generated.deepcopy.go index 02469ca86a58..da62b89c8682 100644 --- a/pkg/project/admission/requestlimit/api/zz_generated.deepcopy.go +++ b/pkg/project/admission/requestlimit/api/zz_generated.deepcopy.go @@ -5,32 +5,9 @@ package api import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectLimitBySelector).DeepCopyInto(out.(*ProjectLimitBySelector)) - return nil - }, InType: reflect.TypeOf(new(ProjectLimitBySelector))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectRequestLimitConfig).DeepCopyInto(out.(*ProjectRequestLimitConfig)) - return nil - }, InType: reflect.TypeOf(new(ProjectRequestLimitConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ProjectLimitBySelector) DeepCopyInto(out *ProjectLimitBySelector) { *out = *in diff --git a/pkg/project/apis/project/v1/zz_generated.conversion.go b/pkg/project/apis/project/v1/zz_generated.conversion.go index 6b9f91bf28da..dbe72e69d241 100644 --- a/pkg/project/apis/project/v1/zz_generated.conversion.go +++ b/pkg/project/apis/project/v1/zz_generated.conversion.go @@ -10,7 +10,7 @@ import ( core_v1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) @@ -114,7 +114,7 @@ func Convert_project_ProjectRequest_To_v1_ProjectRequest(in *project.ProjectRequ } func autoConvert_v1_ProjectSpec_To_project_ProjectSpec(in *v1.ProjectSpec, out *project.ProjectSpec, s conversion.Scope) error { - out.Finalizers = *(*[]api.FinalizerName)(unsafe.Pointer(&in.Finalizers)) + out.Finalizers = *(*[]core.FinalizerName)(unsafe.Pointer(&in.Finalizers)) return nil } @@ -134,7 +134,7 @@ func Convert_project_ProjectSpec_To_v1_ProjectSpec(in *project.ProjectSpec, out } func autoConvert_v1_ProjectStatus_To_project_ProjectStatus(in *v1.ProjectStatus, out *project.ProjectStatus, s conversion.Scope) error { - out.Phase = api.NamespacePhase(in.Phase) + out.Phase = core.NamespacePhase(in.Phase) return nil } diff --git a/pkg/project/apis/project/zz_generated.deepcopy.go b/pkg/project/apis/project/zz_generated.deepcopy.go index a61c73c2edbe..f088bc187dc3 100644 --- a/pkg/project/apis/project/zz_generated.deepcopy.go +++ b/pkg/project/apis/project/zz_generated.deepcopy.go @@ -5,45 +5,10 @@ package project import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Project).DeepCopyInto(out.(*Project)) - return nil - }, InType: reflect.TypeOf(new(Project))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectList).DeepCopyInto(out.(*ProjectList)) - return nil - }, InType: reflect.TypeOf(new(ProjectList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectRequest).DeepCopyInto(out.(*ProjectRequest)) - return nil - }, InType: reflect.TypeOf(new(ProjectRequest))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectSpec).DeepCopyInto(out.(*ProjectSpec)) - return nil - }, InType: reflect.TypeOf(new(ProjectSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ProjectStatus).DeepCopyInto(out.(*ProjectStatus)) - return nil - }, InType: reflect.TypeOf(new(ProjectStatus))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Project) DeepCopyInto(out *Project) { *out = *in @@ -139,7 +104,7 @@ func (in *ProjectSpec) DeepCopyInto(out *ProjectSpec) { *out = *in if in.Finalizers != nil { in, out := &in.Finalizers, &out.Finalizers - *out = make([]api.FinalizerName, len(*in)) + *out = make([]core.FinalizerName, len(*in)) copy(*out, *in) } return diff --git a/pkg/project/generated/informers/internalversion/factory.go b/pkg/project/generated/informers/internalversion/factory.go index 4bc6dc82f043..1f4f932d6a7d 100644 --- a/pkg/project/generated/informers/internalversion/factory.go +++ b/pkg/project/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/project/generated/informers/internalversion/internalinterfaces" project "github.com/openshift/origin/pkg/project/generated/informers/internalversion/project" internalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Project() project.Interface { - return project.New(f) + return project.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/project/generated/informers/internalversion/generic.go b/pkg/project/generated/informers/internalversion/generic.go index 3829c058dc15..5a0d01da708c 100644 --- a/pkg/project/generated/informers/internalversion/generic.go +++ b/pkg/project/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Project, Version=InternalVersion + // Group=project.openshift.io, Version=internalVersion case project.SchemeGroupVersion.WithResource("projects"): return &genericInformer{resource: resource.GroupResource(), informer: f.Project().InternalVersion().Projects().Informer()}, nil diff --git a/pkg/project/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/project/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index cce2997fee30..0bb65aa04d0d 100644 --- a/pkg/project/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/project/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/project/generated/informers/internalversion/project/interface.go b/pkg/project/generated/informers/internalversion/project/interface.go index d8a628f486c8..3c6930024b2c 100644 --- a/pkg/project/generated/informers/internalversion/project/interface.go +++ b/pkg/project/generated/informers/internalversion/project/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/project/generated/informers/internalversion/project/internalversion/interface.go b/pkg/project/generated/informers/internalversion/project/internalversion/interface.go index 2a29a57f74eb..52c3bf7de6c5 100644 --- a/pkg/project/generated/informers/internalversion/project/internalversion/interface.go +++ b/pkg/project/generated/informers/internalversion/project/internalversion/interface.go @@ -13,15 +13,17 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // Projects returns a ProjectInformer. func (v *version) Projects() ProjectInformer { - return &projectInformer{factory: v.SharedInformerFactory} + return &projectInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/project/generated/informers/internalversion/project/internalversion/project.go b/pkg/project/generated/informers/internalversion/project/internalversion/project.go index 00251f1620bf..1bd440f4b97f 100644 --- a/pkg/project/generated/informers/internalversion/project/internalversion/project.go +++ b/pkg/project/generated/informers/internalversion/project/internalversion/project.go @@ -22,19 +22,33 @@ type ProjectInformer interface { } type projectInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewProjectInformer constructs a new informer for Project type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewProjectInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredProjectInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredProjectInformer constructs a new informer for Project type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredProjectInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Project().Projects().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Project().Projects().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewProjectInformer(client internalclientset.Interface, resyncPeriod time.Du ) } -func defaultProjectInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewProjectInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *projectInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredProjectInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *projectInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&project.Project{}, defaultProjectInformer) + return f.factory.InformerFor(&project.Project{}, f.defaultInformer) } func (f *projectInformer) Lister() internalversion.ProjectLister { diff --git a/pkg/project/generated/internalclientset/doc.go b/pkg/project/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/project/generated/internalclientset/doc.go +++ b/pkg/project/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/project/generated/internalclientset/fake/doc.go b/pkg/project/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/project/generated/internalclientset/fake/doc.go +++ b/pkg/project/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/project/generated/internalclientset/scheme/doc.go b/pkg/project/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/project/generated/internalclientset/scheme/doc.go +++ b/pkg/project/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/project/generated/internalclientset/typed/project/internalversion/doc.go b/pkg/project/generated/internalclientset/typed/project/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/project/generated/internalclientset/typed/project/internalversion/doc.go +++ b/pkg/project/generated/internalclientset/typed/project/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/project/generated/internalclientset/typed/project/internalversion/fake/doc.go b/pkg/project/generated/internalclientset/typed/project/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/project/generated/internalclientset/typed/project/internalversion/fake/doc.go +++ b/pkg/project/generated/internalclientset/typed/project/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/quota/admission/clusterresourceoverride/api/v1/zz_generated.deepcopy.go b/pkg/quota/admission/clusterresourceoverride/api/v1/zz_generated.deepcopy.go index b9ddf94d768d..31c04a350009 100644 --- a/pkg/quota/admission/clusterresourceoverride/api/v1/zz_generated.deepcopy.go +++ b/pkg/quota/admission/clusterresourceoverride/api/v1/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package v1 import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterResourceOverrideConfig).DeepCopyInto(out.(*ClusterResourceOverrideConfig)) - return nil - }, InType: reflect.TypeOf(new(ClusterResourceOverrideConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterResourceOverrideConfig) DeepCopyInto(out *ClusterResourceOverrideConfig) { *out = *in diff --git a/pkg/quota/admission/clusterresourceoverride/api/zz_generated.deepcopy.go b/pkg/quota/admission/clusterresourceoverride/api/zz_generated.deepcopy.go index 425228a5612c..ffa32c7c1e20 100644 --- a/pkg/quota/admission/clusterresourceoverride/api/zz_generated.deepcopy.go +++ b/pkg/quota/admission/clusterresourceoverride/api/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package api import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterResourceOverrideConfig).DeepCopyInto(out.(*ClusterResourceOverrideConfig)) - return nil - }, InType: reflect.TypeOf(new(ClusterResourceOverrideConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterResourceOverrideConfig) DeepCopyInto(out *ClusterResourceOverrideConfig) { *out = *in diff --git a/pkg/quota/admission/runonceduration/api/v1/zz_generated.deepcopy.go b/pkg/quota/admission/runonceduration/api/v1/zz_generated.deepcopy.go index fe45f78ba7f3..f144a01d4966 100644 --- a/pkg/quota/admission/runonceduration/api/v1/zz_generated.deepcopy.go +++ b/pkg/quota/admission/runonceduration/api/v1/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package v1 import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RunOnceDurationConfig).DeepCopyInto(out.(*RunOnceDurationConfig)) - return nil - }, InType: reflect.TypeOf(new(RunOnceDurationConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RunOnceDurationConfig) DeepCopyInto(out *RunOnceDurationConfig) { *out = *in diff --git a/pkg/quota/admission/runonceduration/api/zz_generated.deepcopy.go b/pkg/quota/admission/runonceduration/api/zz_generated.deepcopy.go index 2b79175cc8d9..9cc84990eccb 100644 --- a/pkg/quota/admission/runonceduration/api/zz_generated.deepcopy.go +++ b/pkg/quota/admission/runonceduration/api/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package api import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RunOnceDurationConfig).DeepCopyInto(out.(*RunOnceDurationConfig)) - return nil - }, InType: reflect.TypeOf(new(RunOnceDurationConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RunOnceDurationConfig) DeepCopyInto(out *RunOnceDurationConfig) { *out = *in diff --git a/pkg/quota/apis/quota/v1/zz_generated.conversion.go b/pkg/quota/apis/quota/v1/zz_generated.conversion.go index 5e6be861e9e7..b89a8c84bc6c 100644 --- a/pkg/quota/apis/quota/v1/zz_generated.conversion.go +++ b/pkg/quota/apis/quota/v1/zz_generated.conversion.go @@ -10,7 +10,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" unsafe "unsafe" ) @@ -213,7 +213,7 @@ func autoConvert_v1_ClusterResourceQuotaSpec_To_quota_ClusterResourceQuotaSpec(i if err := Convert_v1_ClusterResourceQuotaSelector_To_quota_ClusterResourceQuotaSelector(&in.Selector, &out.Selector, s); err != nil { return err } - if err := api_v1.Convert_v1_ResourceQuotaSpec_To_api_ResourceQuotaSpec(&in.Quota, &out.Quota, s); err != nil { + if err := core_v1.Convert_v1_ResourceQuotaSpec_To_core_ResourceQuotaSpec(&in.Quota, &out.Quota, s); err != nil { return err } return nil @@ -228,7 +228,7 @@ func autoConvert_quota_ClusterResourceQuotaSpec_To_v1_ClusterResourceQuotaSpec(i if err := Convert_quota_ClusterResourceQuotaSelector_To_v1_ClusterResourceQuotaSelector(&in.Selector, &out.Selector, s); err != nil { return err } - if err := api_v1.Convert_api_ResourceQuotaSpec_To_v1_ResourceQuotaSpec(&in.Quota, &out.Quota, s); err != nil { + if err := core_v1.Convert_core_ResourceQuotaSpec_To_v1_ResourceQuotaSpec(&in.Quota, &out.Quota, s); err != nil { return err } return nil @@ -240,7 +240,7 @@ func Convert_quota_ClusterResourceQuotaSpec_To_v1_ClusterResourceQuotaSpec(in *q } func autoConvert_v1_ClusterResourceQuotaStatus_To_quota_ClusterResourceQuotaStatus(in *v1.ClusterResourceQuotaStatus, out *quota.ClusterResourceQuotaStatus, s conversion.Scope) error { - if err := api_v1.Convert_v1_ResourceQuotaStatus_To_api_ResourceQuotaStatus(&in.Total, &out.Total, s); err != nil { + if err := core_v1.Convert_v1_ResourceQuotaStatus_To_core_ResourceQuotaStatus(&in.Total, &out.Total, s); err != nil { return err } if err := Convert_v1_ResourceQuotasStatusByNamespace_To_quota_ResourceQuotasStatusByNamespace(&in.Namespaces, &out.Namespaces, s); err != nil { @@ -255,7 +255,7 @@ func Convert_v1_ClusterResourceQuotaStatus_To_quota_ClusterResourceQuotaStatus(i } func autoConvert_quota_ClusterResourceQuotaStatus_To_v1_ClusterResourceQuotaStatus(in *quota.ClusterResourceQuotaStatus, out *v1.ClusterResourceQuotaStatus, s conversion.Scope) error { - if err := api_v1.Convert_api_ResourceQuotaStatus_To_v1_ResourceQuotaStatus(&in.Total, &out.Total, s); err != nil { + if err := core_v1.Convert_core_ResourceQuotaStatus_To_v1_ResourceQuotaStatus(&in.Total, &out.Total, s); err != nil { return err } if err := Convert_quota_ResourceQuotasStatusByNamespace_To_v1_ResourceQuotasStatusByNamespace(&in.Namespaces, &out.Namespaces, s); err != nil { diff --git a/pkg/quota/apis/quota/v1/zz_generated.defaults.go b/pkg/quota/apis/quota/v1/zz_generated.defaults.go index b4228742be15..3d5c1f3abac5 100644 --- a/pkg/quota/apis/quota/v1/zz_generated.defaults.go +++ b/pkg/quota/apis/quota/v1/zz_generated.defaults.go @@ -7,7 +7,7 @@ package v1 import ( v1 "github.com/openshift/api/quota/v1" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -26,13 +26,13 @@ func RegisterDefaults(scheme *runtime.Scheme) error { } func SetObjectDefaults_AppliedClusterResourceQuota(in *v1.AppliedClusterResourceQuota) { - api_v1.SetDefaults_ResourceList(&in.Spec.Quota.Hard) - api_v1.SetDefaults_ResourceList(&in.Status.Total.Hard) - api_v1.SetDefaults_ResourceList(&in.Status.Total.Used) + core_v1.SetDefaults_ResourceList(&in.Spec.Quota.Hard) + core_v1.SetDefaults_ResourceList(&in.Status.Total.Hard) + core_v1.SetDefaults_ResourceList(&in.Status.Total.Used) for i := range in.Status.Namespaces { a := &in.Status.Namespaces[i] - api_v1.SetDefaults_ResourceList(&a.Status.Hard) - api_v1.SetDefaults_ResourceList(&a.Status.Used) + core_v1.SetDefaults_ResourceList(&a.Status.Hard) + core_v1.SetDefaults_ResourceList(&a.Status.Used) } } @@ -44,13 +44,13 @@ func SetObjectDefaults_AppliedClusterResourceQuotaList(in *v1.AppliedClusterReso } func SetObjectDefaults_ClusterResourceQuota(in *v1.ClusterResourceQuota) { - api_v1.SetDefaults_ResourceList(&in.Spec.Quota.Hard) - api_v1.SetDefaults_ResourceList(&in.Status.Total.Hard) - api_v1.SetDefaults_ResourceList(&in.Status.Total.Used) + core_v1.SetDefaults_ResourceList(&in.Spec.Quota.Hard) + core_v1.SetDefaults_ResourceList(&in.Status.Total.Hard) + core_v1.SetDefaults_ResourceList(&in.Status.Total.Used) for i := range in.Status.Namespaces { a := &in.Status.Namespaces[i] - api_v1.SetDefaults_ResourceList(&a.Status.Hard) - api_v1.SetDefaults_ResourceList(&a.Status.Used) + core_v1.SetDefaults_ResourceList(&a.Status.Hard) + core_v1.SetDefaults_ResourceList(&a.Status.Used) } } diff --git a/pkg/quota/apis/quota/zz_generated.deepcopy.go b/pkg/quota/apis/quota/zz_generated.deepcopy.go index 8850f85c8ed6..bdebc1a0cfc3 100644 --- a/pkg/quota/apis/quota/zz_generated.deepcopy.go +++ b/pkg/quota/apis/quota/zz_generated.deepcopy.go @@ -6,56 +6,9 @@ package quota import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AppliedClusterResourceQuota).DeepCopyInto(out.(*AppliedClusterResourceQuota)) - return nil - }, InType: reflect.TypeOf(new(AppliedClusterResourceQuota))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AppliedClusterResourceQuotaList).DeepCopyInto(out.(*AppliedClusterResourceQuotaList)) - return nil - }, InType: reflect.TypeOf(new(AppliedClusterResourceQuotaList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterResourceQuota).DeepCopyInto(out.(*ClusterResourceQuota)) - return nil - }, InType: reflect.TypeOf(new(ClusterResourceQuota))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterResourceQuotaList).DeepCopyInto(out.(*ClusterResourceQuotaList)) - return nil - }, InType: reflect.TypeOf(new(ClusterResourceQuotaList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterResourceQuotaSelector).DeepCopyInto(out.(*ClusterResourceQuotaSelector)) - return nil - }, InType: reflect.TypeOf(new(ClusterResourceQuotaSelector))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterResourceQuotaSpec).DeepCopyInto(out.(*ClusterResourceQuotaSpec)) - return nil - }, InType: reflect.TypeOf(new(ClusterResourceQuotaSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ClusterResourceQuotaStatus).DeepCopyInto(out.(*ClusterResourceQuotaStatus)) - return nil - }, InType: reflect.TypeOf(new(ClusterResourceQuotaStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ResourceQuotasStatusByNamespace).DeepCopyInto(out.(*ResourceQuotasStatusByNamespace)) - return nil - }, InType: reflect.TypeOf(new(ResourceQuotasStatusByNamespace))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AppliedClusterResourceQuota) DeepCopyInto(out *AppliedClusterResourceQuota) { *out = *in diff --git a/pkg/quota/generated/informers/internalversion/factory.go b/pkg/quota/generated/informers/internalversion/factory.go index f1b21f36898d..70596b7e2975 100644 --- a/pkg/quota/generated/informers/internalversion/factory.go +++ b/pkg/quota/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/quota/generated/informers/internalversion/internalinterfaces" quota "github.com/openshift/origin/pkg/quota/generated/informers/internalversion/quota" internalclientset "github.com/openshift/origin/pkg/quota/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Quota() quota.Interface { - return quota.New(f) + return quota.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/quota/generated/informers/internalversion/generic.go b/pkg/quota/generated/informers/internalversion/generic.go index c34687d39d1f..0838e97e5883 100644 --- a/pkg/quota/generated/informers/internalversion/generic.go +++ b/pkg/quota/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Quota, Version=InternalVersion + // Group=quota.openshift.io, Version=internalVersion case quota.SchemeGroupVersion.WithResource("clusterresourcequotas"): return &genericInformer{resource: resource.GroupResource(), informer: f.Quota().InternalVersion().ClusterResourceQuotas().Informer()}, nil diff --git a/pkg/quota/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/quota/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index c31c24edfba6..4d00f79ca3d7 100644 --- a/pkg/quota/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/quota/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/quota/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/quota/generated/informers/internalversion/quota/interface.go b/pkg/quota/generated/informers/internalversion/quota/interface.go index b5c24a614fd0..4db328f8c59a 100644 --- a/pkg/quota/generated/informers/internalversion/quota/interface.go +++ b/pkg/quota/generated/informers/internalversion/quota/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/quota/generated/informers/internalversion/quota/internalversion/clusterresourcequota.go b/pkg/quota/generated/informers/internalversion/quota/internalversion/clusterresourcequota.go index 6d1ba93df3a6..e475f94fe6bf 100644 --- a/pkg/quota/generated/informers/internalversion/quota/internalversion/clusterresourcequota.go +++ b/pkg/quota/generated/informers/internalversion/quota/internalversion/clusterresourcequota.go @@ -22,19 +22,33 @@ type ClusterResourceQuotaInformer interface { } type clusterResourceQuotaInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewClusterResourceQuotaInformer constructs a new informer for ClusterResourceQuota type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewClusterResourceQuotaInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredClusterResourceQuotaInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredClusterResourceQuotaInformer constructs a new informer for ClusterResourceQuota type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredClusterResourceQuotaInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Quota().ClusterResourceQuotas().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Quota().ClusterResourceQuotas().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewClusterResourceQuotaInformer(client internalclientset.Interface, resyncP ) } -func defaultClusterResourceQuotaInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewClusterResourceQuotaInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *clusterResourceQuotaInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredClusterResourceQuotaInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *clusterResourceQuotaInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor("a.ClusterResourceQuota{}, defaultClusterResourceQuotaInformer) + return f.factory.InformerFor("a.ClusterResourceQuota{}, f.defaultInformer) } func (f *clusterResourceQuotaInformer) Lister() internalversion.ClusterResourceQuotaLister { diff --git a/pkg/quota/generated/informers/internalversion/quota/internalversion/interface.go b/pkg/quota/generated/informers/internalversion/quota/internalversion/interface.go index d769185d24f7..7d3ccc89d905 100644 --- a/pkg/quota/generated/informers/internalversion/quota/internalversion/interface.go +++ b/pkg/quota/generated/informers/internalversion/quota/internalversion/interface.go @@ -13,15 +13,17 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // ClusterResourceQuotas returns a ClusterResourceQuotaInformer. func (v *version) ClusterResourceQuotas() ClusterResourceQuotaInformer { - return &clusterResourceQuotaInformer{factory: v.SharedInformerFactory} + return &clusterResourceQuotaInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/quota/generated/internalclientset/doc.go b/pkg/quota/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/quota/generated/internalclientset/doc.go +++ b/pkg/quota/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/quota/generated/internalclientset/fake/doc.go b/pkg/quota/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/quota/generated/internalclientset/fake/doc.go +++ b/pkg/quota/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/quota/generated/internalclientset/scheme/doc.go b/pkg/quota/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/quota/generated/internalclientset/scheme/doc.go +++ b/pkg/quota/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/quota/generated/internalclientset/typed/quota/internalversion/doc.go b/pkg/quota/generated/internalclientset/typed/quota/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/quota/generated/internalclientset/typed/quota/internalversion/doc.go +++ b/pkg/quota/generated/internalclientset/typed/quota/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/quota/generated/internalclientset/typed/quota/internalversion/fake/doc.go b/pkg/quota/generated/internalclientset/typed/quota/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/quota/generated/internalclientset/typed/quota/internalversion/fake/doc.go +++ b/pkg/quota/generated/internalclientset/typed/quota/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/route/apis/route/v1/zz_generated.conversion.go b/pkg/route/apis/route/v1/zz_generated.conversion.go index c66df5546b7b..52d6b2400443 100644 --- a/pkg/route/apis/route/v1/zz_generated.conversion.go +++ b/pkg/route/apis/route/v1/zz_generated.conversion.go @@ -11,7 +11,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) @@ -108,7 +108,7 @@ func Convert_route_RouteIngress_To_v1_RouteIngress(in *route.RouteIngress, out * func autoConvert_v1_RouteIngressCondition_To_route_RouteIngressCondition(in *v1.RouteIngressCondition, out *route.RouteIngressCondition, s conversion.Scope) error { out.Type = route.RouteIngressConditionType(in.Type) - out.Status = api.ConditionStatus(in.Status) + out.Status = core.ConditionStatus(in.Status) out.Reason = in.Reason out.Message = in.Message out.LastTransitionTime = (*meta_v1.Time)(unsafe.Pointer(in.LastTransitionTime)) diff --git a/pkg/route/apis/route/zz_generated.deepcopy.go b/pkg/route/apis/route/zz_generated.deepcopy.go index b65ad67877a0..f8181e871746 100644 --- a/pkg/route/apis/route/zz_generated.deepcopy.go +++ b/pkg/route/apis/route/zz_generated.deepcopy.go @@ -6,81 +6,10 @@ package route import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*InsecureEdgeTerminationPolicyType).DeepCopyInto(out.(*InsecureEdgeTerminationPolicyType)) - return nil - }, InType: reflect.TypeOf(new(InsecureEdgeTerminationPolicyType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Route).DeepCopyInto(out.(*Route)) - return nil - }, InType: reflect.TypeOf(new(Route))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouteIngress).DeepCopyInto(out.(*RouteIngress)) - return nil - }, InType: reflect.TypeOf(new(RouteIngress))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouteIngressCondition).DeepCopyInto(out.(*RouteIngressCondition)) - return nil - }, InType: reflect.TypeOf(new(RouteIngressCondition))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouteIngressConditionType).DeepCopyInto(out.(*RouteIngressConditionType)) - return nil - }, InType: reflect.TypeOf(new(RouteIngressConditionType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouteList).DeepCopyInto(out.(*RouteList)) - return nil - }, InType: reflect.TypeOf(new(RouteList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RoutePort).DeepCopyInto(out.(*RoutePort)) - return nil - }, InType: reflect.TypeOf(new(RoutePort))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouteSpec).DeepCopyInto(out.(*RouteSpec)) - return nil - }, InType: reflect.TypeOf(new(RouteSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouteStatus).DeepCopyInto(out.(*RouteStatus)) - return nil - }, InType: reflect.TypeOf(new(RouteStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouteTargetReference).DeepCopyInto(out.(*RouteTargetReference)) - return nil - }, InType: reflect.TypeOf(new(RouteTargetReference))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RouterShard).DeepCopyInto(out.(*RouterShard)) - return nil - }, InType: reflect.TypeOf(new(RouterShard))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TLSConfig).DeepCopyInto(out.(*TLSConfig)) - return nil - }, InType: reflect.TypeOf(new(TLSConfig))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TLSTerminationType).DeepCopyInto(out.(*TLSTerminationType)) - return nil - }, InType: reflect.TypeOf(new(TLSTerminationType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*WildcardPolicyType).DeepCopyInto(out.(*WildcardPolicyType)) - return nil - }, InType: reflect.TypeOf(new(WildcardPolicyType))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *InsecureEdgeTerminationPolicyType) DeepCopyInto(out *InsecureEdgeTerminationPolicyType) { { diff --git a/pkg/route/generated/informers/internalversion/factory.go b/pkg/route/generated/informers/internalversion/factory.go index 80b47035995e..9d0cc18edb66 100644 --- a/pkg/route/generated/informers/internalversion/factory.go +++ b/pkg/route/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/route/generated/informers/internalversion/internalinterfaces" route "github.com/openshift/origin/pkg/route/generated/informers/internalversion/route" internalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Route() route.Interface { - return route.New(f) + return route.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/route/generated/informers/internalversion/generic.go b/pkg/route/generated/informers/internalversion/generic.go index 74a431f6d2b3..ee0a0b36c109 100644 --- a/pkg/route/generated/informers/internalversion/generic.go +++ b/pkg/route/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Route, Version=InternalVersion + // Group=route.openshift.io, Version=internalVersion case route.SchemeGroupVersion.WithResource("routes"): return &genericInformer{resource: resource.GroupResource(), informer: f.Route().InternalVersion().Routes().Informer()}, nil diff --git a/pkg/route/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/route/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index adabb253c5b2..0bf7983772d8 100644 --- a/pkg/route/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/route/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/route/generated/informers/internalversion/route/interface.go b/pkg/route/generated/informers/internalversion/route/interface.go index 78b86fc79e78..91b6c2946f7c 100644 --- a/pkg/route/generated/informers/internalversion/route/interface.go +++ b/pkg/route/generated/informers/internalversion/route/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/route/generated/informers/internalversion/route/internalversion/interface.go b/pkg/route/generated/informers/internalversion/route/internalversion/interface.go index fb6bf23b0b86..510fce66aa8d 100644 --- a/pkg/route/generated/informers/internalversion/route/internalversion/interface.go +++ b/pkg/route/generated/informers/internalversion/route/internalversion/interface.go @@ -13,15 +13,17 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // Routes returns a RouteInformer. func (v *version) Routes() RouteInformer { - return &routeInformer{factory: v.SharedInformerFactory} + return &routeInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/route/generated/informers/internalversion/route/internalversion/route.go b/pkg/route/generated/informers/internalversion/route/internalversion/route.go index 11d464284b46..bdac1b929a14 100644 --- a/pkg/route/generated/informers/internalversion/route/internalversion/route.go +++ b/pkg/route/generated/informers/internalversion/route/internalversion/route.go @@ -22,19 +22,34 @@ type RouteInformer interface { } type routeInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewRouteInformer constructs a new informer for Route type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewRouteInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredRouteInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredRouteInformer constructs a new informer for Route type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredRouteInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Route().Routes(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Route().Routes(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewRouteInformer(client internalclientset.Interface, namespace string, resy ) } -func defaultRouteInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewRouteInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *routeInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredRouteInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *routeInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&route.Route{}, defaultRouteInformer) + return f.factory.InformerFor(&route.Route{}, f.defaultInformer) } func (f *routeInformer) Lister() internalversion.RouteLister { diff --git a/pkg/route/generated/internalclientset/doc.go b/pkg/route/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/route/generated/internalclientset/doc.go +++ b/pkg/route/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/route/generated/internalclientset/fake/doc.go b/pkg/route/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/route/generated/internalclientset/fake/doc.go +++ b/pkg/route/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/route/generated/internalclientset/scheme/doc.go b/pkg/route/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/route/generated/internalclientset/scheme/doc.go +++ b/pkg/route/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/route/generated/internalclientset/typed/route/internalversion/doc.go b/pkg/route/generated/internalclientset/typed/route/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/route/generated/internalclientset/typed/route/internalversion/doc.go +++ b/pkg/route/generated/internalclientset/typed/route/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/route/generated/internalclientset/typed/route/internalversion/fake/doc.go b/pkg/route/generated/internalclientset/typed/route/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/route/generated/internalclientset/typed/route/internalversion/fake/doc.go +++ b/pkg/route/generated/internalclientset/typed/route/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/scheduler/admission/podnodeconstraints/api/v1/zz_generated.deepcopy.go b/pkg/scheduler/admission/podnodeconstraints/api/v1/zz_generated.deepcopy.go index 28e5ac31fece..4c599b349330 100644 --- a/pkg/scheduler/admission/podnodeconstraints/api/v1/zz_generated.deepcopy.go +++ b/pkg/scheduler/admission/podnodeconstraints/api/v1/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package v1 import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodNodeConstraintsConfig).DeepCopyInto(out.(*PodNodeConstraintsConfig)) - return nil - }, InType: reflect.TypeOf(new(PodNodeConstraintsConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PodNodeConstraintsConfig) DeepCopyInto(out *PodNodeConstraintsConfig) { *out = *in diff --git a/pkg/scheduler/admission/podnodeconstraints/api/zz_generated.deepcopy.go b/pkg/scheduler/admission/podnodeconstraints/api/zz_generated.deepcopy.go index 0c7f9bbce6b8..f53f813193a3 100644 --- a/pkg/scheduler/admission/podnodeconstraints/api/zz_generated.deepcopy.go +++ b/pkg/scheduler/admission/podnodeconstraints/api/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package api import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodNodeConstraintsConfig).DeepCopyInto(out.(*PodNodeConstraintsConfig)) - return nil - }, InType: reflect.TypeOf(new(PodNodeConstraintsConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PodNodeConstraintsConfig) DeepCopyInto(out *PodNodeConstraintsConfig) { *out = *in diff --git a/pkg/security/apis/security/v1/zz_generated.conversion.go b/pkg/security/apis/security/v1/zz_generated.conversion.go index 383351ca55fd..47d66d396329 100644 --- a/pkg/security/apis/security/v1/zz_generated.conversion.go +++ b/pkg/security/apis/security/v1/zz_generated.conversion.go @@ -7,11 +7,11 @@ package v1 import ( v1 "github.com/openshift/api/security/v1" security "github.com/openshift/origin/pkg/security/apis/security" - core_v1 "k8s.io/api/core/v1" + api_core_v1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/apis/core" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" unsafe "unsafe" ) @@ -155,7 +155,7 @@ func Convert_security_PodSecurityPolicyReview_To_v1_PodSecurityPolicyReview(in * } func autoConvert_v1_PodSecurityPolicyReviewSpec_To_security_PodSecurityPolicyReviewSpec(in *v1.PodSecurityPolicyReviewSpec, out *security.PodSecurityPolicyReviewSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.ServiceAccountNames = *(*[]string)(unsafe.Pointer(&in.ServiceAccountNames)) @@ -168,7 +168,7 @@ func Convert_v1_PodSecurityPolicyReviewSpec_To_security_PodSecurityPolicyReviewS } func autoConvert_security_PodSecurityPolicyReviewSpec_To_v1_PodSecurityPolicyReviewSpec(in *security.PodSecurityPolicyReviewSpec, out *v1.PodSecurityPolicyReviewSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.ServiceAccountNames = *(*[]string)(unsafe.Pointer(&in.ServiceAccountNames)) @@ -251,7 +251,7 @@ func Convert_security_PodSecurityPolicySelfSubjectReview_To_v1_PodSecurityPolicy } func autoConvert_v1_PodSecurityPolicySelfSubjectReviewSpec_To_security_PodSecurityPolicySelfSubjectReviewSpec(in *v1.PodSecurityPolicySelfSubjectReviewSpec, out *security.PodSecurityPolicySelfSubjectReviewSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -263,7 +263,7 @@ func Convert_v1_PodSecurityPolicySelfSubjectReviewSpec_To_security_PodSecurityPo } func autoConvert_security_PodSecurityPolicySelfSubjectReviewSpec_To_v1_PodSecurityPolicySelfSubjectReviewSpec(in *security.PodSecurityPolicySelfSubjectReviewSpec, out *v1.PodSecurityPolicySelfSubjectReviewSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -305,7 +305,7 @@ func Convert_security_PodSecurityPolicySubjectReview_To_v1_PodSecurityPolicySubj } func autoConvert_v1_PodSecurityPolicySubjectReviewSpec_To_security_PodSecurityPolicySubjectReviewSpec(in *v1.PodSecurityPolicySubjectReviewSpec, out *security.PodSecurityPolicySubjectReviewSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.User = in.User @@ -319,7 +319,7 @@ func Convert_v1_PodSecurityPolicySubjectReviewSpec_To_security_PodSecurityPolicy } func autoConvert_security_PodSecurityPolicySubjectReviewSpec_To_v1_PodSecurityPolicySubjectReviewSpec(in *security.PodSecurityPolicySubjectReviewSpec, out *v1.PodSecurityPolicySubjectReviewSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.User = in.User @@ -335,15 +335,15 @@ func Convert_security_PodSecurityPolicySubjectReviewSpec_To_v1_PodSecurityPolicy func autoConvert_v1_PodSecurityPolicySubjectReviewStatus_To_security_PodSecurityPolicySubjectReviewStatus(in *v1.PodSecurityPolicySubjectReviewStatus, out *security.PodSecurityPolicySubjectReviewStatus, s conversion.Scope) error { if in.AllowedBy != nil { in, out := &in.AllowedBy, &out.AllowedBy - *out = new(api.ObjectReference) - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(*in, *out, s); err != nil { + *out = new(core.ObjectReference) + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(*in, *out, s); err != nil { return err } } else { out.AllowedBy = nil } out.Reason = in.Reason - if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -357,15 +357,15 @@ func Convert_v1_PodSecurityPolicySubjectReviewStatus_To_security_PodSecurityPoli func autoConvert_security_PodSecurityPolicySubjectReviewStatus_To_v1_PodSecurityPolicySubjectReviewStatus(in *security.PodSecurityPolicySubjectReviewStatus, out *v1.PodSecurityPolicySubjectReviewStatus, s conversion.Scope) error { if in.AllowedBy != nil { in, out := &in.AllowedBy, &out.AllowedBy - *out = new(core_v1.ObjectReference) - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.ObjectReference) + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(*in, *out, s); err != nil { return err } } else { out.AllowedBy = nil } out.Reason = in.Reason - if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -406,8 +406,8 @@ func autoConvert_v1_SELinuxContextStrategyOptions_To_security_SELinuxContextStra out.Type = security.SELinuxContextStrategyType(in.Type) if in.SELinuxOptions != nil { in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(api.SELinuxOptions) - if err := api_v1.Convert_v1_SELinuxOptions_To_api_SELinuxOptions(*in, *out, s); err != nil { + *out = new(core.SELinuxOptions) + if err := core_v1.Convert_v1_SELinuxOptions_To_core_SELinuxOptions(*in, *out, s); err != nil { return err } } else { @@ -425,8 +425,8 @@ func autoConvert_security_SELinuxContextStrategyOptions_To_v1_SELinuxContextStra out.Type = v1.SELinuxContextStrategyType(in.Type) if in.SELinuxOptions != nil { in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(core_v1.SELinuxOptions) - if err := api_v1.Convert_api_SELinuxOptions_To_v1_SELinuxOptions(*in, *out, s); err != nil { + *out = new(api_core_v1.SELinuxOptions) + if err := core_v1.Convert_core_SELinuxOptions_To_v1_SELinuxOptions(*in, *out, s); err != nil { return err } } else { @@ -444,9 +444,9 @@ func autoConvert_v1_SecurityContextConstraints_To_security_SecurityContextConstr out.ObjectMeta = in.ObjectMeta out.Priority = (*int32)(unsafe.Pointer(in.Priority)) out.AllowPrivilegedContainer = in.AllowPrivilegedContainer - out.DefaultAddCapabilities = *(*[]api.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) - out.RequiredDropCapabilities = *(*[]api.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) - out.AllowedCapabilities = *(*[]api.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) + out.DefaultAddCapabilities = *(*[]core.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) + out.RequiredDropCapabilities = *(*[]core.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) + out.AllowedCapabilities = *(*[]core.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) // INFO: in.AllowHostDirVolumePlugin opted out of conversion generation out.Volumes = *(*[]security.FSType)(unsafe.Pointer(&in.Volumes)) out.AllowedFlexVolumes = *(*[]security.AllowedFlexVolume)(unsafe.Pointer(&in.AllowedFlexVolumes)) @@ -477,9 +477,9 @@ func autoConvert_security_SecurityContextConstraints_To_v1_SecurityContextConstr out.ObjectMeta = in.ObjectMeta out.Priority = (*int32)(unsafe.Pointer(in.Priority)) out.AllowPrivilegedContainer = in.AllowPrivilegedContainer - out.DefaultAddCapabilities = *(*[]core_v1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) - out.RequiredDropCapabilities = *(*[]core_v1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) - out.AllowedCapabilities = *(*[]core_v1.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) + out.DefaultAddCapabilities = *(*[]api_core_v1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) + out.RequiredDropCapabilities = *(*[]api_core_v1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) + out.AllowedCapabilities = *(*[]api_core_v1.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) out.Volumes = *(*[]v1.FSType)(unsafe.Pointer(&in.Volumes)) out.AllowedFlexVolumes = *(*[]v1.AllowedFlexVolume)(unsafe.Pointer(&in.AllowedFlexVolumes)) out.AllowHostNetwork = in.AllowHostNetwork diff --git a/pkg/security/apis/security/v1/zz_generated.defaults.go b/pkg/security/apis/security/v1/zz_generated.defaults.go index 22b9a414ed12..e24cf1c886a7 100644 --- a/pkg/security/apis/security/v1/zz_generated.defaults.go +++ b/pkg/security/apis/security/v1/zz_generated.defaults.go @@ -7,7 +7,7 @@ package v1 import ( v1 "github.com/openshift/api/security/v1" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -25,270 +25,270 @@ func RegisterDefaults(scheme *runtime.Scheme) error { } func SetObjectDefaults_PodSecurityPolicyReview(in *v1.PodSecurityPolicyReview) { - api_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - api_v1.SetDefaults_Volume(a) + core_v1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - api_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - api_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { - api_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) + core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - api_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) } if a.VolumeSource.DownwardAPI != nil { - api_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - api_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - api_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) } if a.VolumeSource.Projected != nil { - api_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } } } if a.VolumeSource.ScaleIO != nil { - api_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Status.AllowedServiceAccounts { a := &in.Status.AllowedServiceAccounts[i] - api_v1.SetDefaults_PodSpec(&a.PodSecurityPolicySubjectReviewStatus.Template.Spec) + core_v1.SetDefaults_PodSpec(&a.PodSecurityPolicySubjectReviewStatus.Template.Spec) for j := range a.PodSecurityPolicySubjectReviewStatus.Template.Spec.Volumes { b := &a.PodSecurityPolicySubjectReviewStatus.Template.Spec.Volumes[j] - api_v1.SetDefaults_Volume(b) + core_v1.SetDefaults_Volume(b) if b.VolumeSource.HostPath != nil { - api_v1.SetDefaults_HostPathVolumeSource(b.VolumeSource.HostPath) + core_v1.SetDefaults_HostPathVolumeSource(b.VolumeSource.HostPath) } if b.VolumeSource.Secret != nil { - api_v1.SetDefaults_SecretVolumeSource(b.VolumeSource.Secret) + core_v1.SetDefaults_SecretVolumeSource(b.VolumeSource.Secret) } if b.VolumeSource.ISCSI != nil { - api_v1.SetDefaults_ISCSIVolumeSource(b.VolumeSource.ISCSI) + core_v1.SetDefaults_ISCSIVolumeSource(b.VolumeSource.ISCSI) } if b.VolumeSource.RBD != nil { - api_v1.SetDefaults_RBDVolumeSource(b.VolumeSource.RBD) + core_v1.SetDefaults_RBDVolumeSource(b.VolumeSource.RBD) } if b.VolumeSource.DownwardAPI != nil { - api_v1.SetDefaults_DownwardAPIVolumeSource(b.VolumeSource.DownwardAPI) + core_v1.SetDefaults_DownwardAPIVolumeSource(b.VolumeSource.DownwardAPI) for k := range b.VolumeSource.DownwardAPI.Items { c := &b.VolumeSource.DownwardAPI.Items[k] if c.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.VolumeSource.ConfigMap != nil { - api_v1.SetDefaults_ConfigMapVolumeSource(b.VolumeSource.ConfigMap) + core_v1.SetDefaults_ConfigMapVolumeSource(b.VolumeSource.ConfigMap) } if b.VolumeSource.AzureDisk != nil { - api_v1.SetDefaults_AzureDiskVolumeSource(b.VolumeSource.AzureDisk) + core_v1.SetDefaults_AzureDiskVolumeSource(b.VolumeSource.AzureDisk) } if b.VolumeSource.Projected != nil { - api_v1.SetDefaults_ProjectedVolumeSource(b.VolumeSource.Projected) + core_v1.SetDefaults_ProjectedVolumeSource(b.VolumeSource.Projected) for k := range b.VolumeSource.Projected.Sources { c := &b.VolumeSource.Projected.Sources[k] if c.DownwardAPI != nil { for l := range c.DownwardAPI.Items { d := &c.DownwardAPI.Items[l] if d.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(d.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(d.FieldRef) } } } } } if b.VolumeSource.ScaleIO != nil { - api_v1.SetDefaults_ScaleIOVolumeSource(b.VolumeSource.ScaleIO) + core_v1.SetDefaults_ScaleIOVolumeSource(b.VolumeSource.ScaleIO) } } for j := range a.PodSecurityPolicySubjectReviewStatus.Template.Spec.InitContainers { b := &a.PodSecurityPolicySubjectReviewStatus.Template.Spec.InitContainers[j] - api_v1.SetDefaults_Container(b) + core_v1.SetDefaults_Container(b) for k := range b.Ports { c := &b.Ports[k] - api_v1.SetDefaults_ContainerPort(c) + core_v1.SetDefaults_ContainerPort(c) } for k := range b.Env { c := &b.Env[k] if c.ValueFrom != nil { if c.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&b.Resources.Limits) - api_v1.SetDefaults_ResourceList(&b.Resources.Requests) + core_v1.SetDefaults_ResourceList(&b.Resources.Limits) + core_v1.SetDefaults_ResourceList(&b.Resources.Requests) if b.LivenessProbe != nil { - api_v1.SetDefaults_Probe(b.LivenessProbe) + core_v1.SetDefaults_Probe(b.LivenessProbe) if b.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.LivenessProbe.Handler.HTTPGet) } } if b.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(b.ReadinessProbe) + core_v1.SetDefaults_Probe(b.ReadinessProbe) if b.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.ReadinessProbe.Handler.HTTPGet) } } if b.Lifecycle != nil { if b.Lifecycle.PostStart != nil { if b.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PostStart.HTTPGet) } } if b.Lifecycle.PreStop != nil { if b.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PreStop.HTTPGet) } } } } for j := range a.PodSecurityPolicySubjectReviewStatus.Template.Spec.Containers { b := &a.PodSecurityPolicySubjectReviewStatus.Template.Spec.Containers[j] - api_v1.SetDefaults_Container(b) + core_v1.SetDefaults_Container(b) for k := range b.Ports { c := &b.Ports[k] - api_v1.SetDefaults_ContainerPort(c) + core_v1.SetDefaults_ContainerPort(c) } for k := range b.Env { c := &b.Env[k] if c.ValueFrom != nil { if c.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&b.Resources.Limits) - api_v1.SetDefaults_ResourceList(&b.Resources.Requests) + core_v1.SetDefaults_ResourceList(&b.Resources.Limits) + core_v1.SetDefaults_ResourceList(&b.Resources.Requests) if b.LivenessProbe != nil { - api_v1.SetDefaults_Probe(b.LivenessProbe) + core_v1.SetDefaults_Probe(b.LivenessProbe) if b.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.LivenessProbe.Handler.HTTPGet) } } if b.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(b.ReadinessProbe) + core_v1.SetDefaults_Probe(b.ReadinessProbe) if b.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.ReadinessProbe.Handler.HTTPGet) } } if b.Lifecycle != nil { if b.Lifecycle.PostStart != nil { if b.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PostStart.HTTPGet) } } if b.Lifecycle.PreStop != nil { if b.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(b.Lifecycle.PreStop.HTTPGet) } } } @@ -297,268 +297,268 @@ func SetObjectDefaults_PodSecurityPolicyReview(in *v1.PodSecurityPolicyReview) { } func SetObjectDefaults_PodSecurityPolicySelfSubjectReview(in *v1.PodSecurityPolicySelfSubjectReview) { - api_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - api_v1.SetDefaults_Volume(a) + core_v1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - api_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - api_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { - api_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) + core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - api_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) } if a.VolumeSource.DownwardAPI != nil { - api_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - api_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - api_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) } if a.VolumeSource.Projected != nil { - api_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } } } if a.VolumeSource.ScaleIO != nil { - api_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } - api_v1.SetDefaults_PodSpec(&in.Status.Template.Spec) + core_v1.SetDefaults_PodSpec(&in.Status.Template.Spec) for i := range in.Status.Template.Spec.Volumes { a := &in.Status.Template.Spec.Volumes[i] - api_v1.SetDefaults_Volume(a) + core_v1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - api_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - api_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { - api_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) + core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - api_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) } if a.VolumeSource.DownwardAPI != nil { - api_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - api_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - api_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) } if a.VolumeSource.Projected != nil { - api_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } } } if a.VolumeSource.ScaleIO != nil { - api_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } } for i := range in.Status.Template.Spec.InitContainers { a := &in.Status.Template.Spec.InitContainers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Status.Template.Spec.Containers { a := &in.Status.Template.Spec.Containers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } @@ -566,268 +566,268 @@ func SetObjectDefaults_PodSecurityPolicySelfSubjectReview(in *v1.PodSecurityPoli } func SetObjectDefaults_PodSecurityPolicySubjectReview(in *v1.PodSecurityPolicySubjectReview) { - api_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - api_v1.SetDefaults_Volume(a) + core_v1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - api_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - api_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { - api_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) + core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - api_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) } if a.VolumeSource.DownwardAPI != nil { - api_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - api_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - api_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) } if a.VolumeSource.Projected != nil { - api_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } } } if a.VolumeSource.ScaleIO != nil { - api_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } - api_v1.SetDefaults_PodSpec(&in.Status.Template.Spec) + core_v1.SetDefaults_PodSpec(&in.Status.Template.Spec) for i := range in.Status.Template.Spec.Volumes { a := &in.Status.Template.Spec.Volumes[i] - api_v1.SetDefaults_Volume(a) + core_v1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - api_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - api_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { - api_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) + core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - api_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) } if a.VolumeSource.DownwardAPI != nil { - api_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - api_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - api_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) } if a.VolumeSource.Projected != nil { - api_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } } } if a.VolumeSource.ScaleIO != nil { - api_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } } for i := range in.Status.Template.Spec.InitContainers { a := &in.Status.Template.Spec.InitContainers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Status.Template.Spec.Containers { a := &in.Status.Template.Spec.Containers[i] - api_v1.SetDefaults_Container(a) + core_v1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] - api_v1.SetDefaults_ContainerPort(b) + core_v1.SetDefaults_ContainerPort(b) } for j := range a.Env { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - api_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - api_v1.SetDefaults_ResourceList(&a.Resources.Limits) - api_v1.SetDefaults_ResourceList(&a.Resources.Requests) + core_v1.SetDefaults_ResourceList(&a.Resources.Limits) + core_v1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - api_v1.SetDefaults_Probe(a.LivenessProbe) + core_v1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) } } if a.ReadinessProbe != nil { - api_v1.SetDefaults_Probe(a.ReadinessProbe) + core_v1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.Handler.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) } } if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - api_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } diff --git a/pkg/security/apis/security/zz_generated.deepcopy.go b/pkg/security/apis/security/zz_generated.deepcopy.go index e4f9b545de29..c6c8a5356afb 100644 --- a/pkg/security/apis/security/zz_generated.deepcopy.go +++ b/pkg/security/apis/security/zz_generated.deepcopy.go @@ -5,114 +5,11 @@ package security import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*AllowedFlexVolume).DeepCopyInto(out.(*AllowedFlexVolume)) - return nil - }, InType: reflect.TypeOf(new(AllowedFlexVolume))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*FSGroupStrategyOptions).DeepCopyInto(out.(*FSGroupStrategyOptions)) - return nil - }, InType: reflect.TypeOf(new(FSGroupStrategyOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*FSGroupStrategyType).DeepCopyInto(out.(*FSGroupStrategyType)) - return nil - }, InType: reflect.TypeOf(new(FSGroupStrategyType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*FSType).DeepCopyInto(out.(*FSType)) - return nil - }, InType: reflect.TypeOf(new(FSType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*IDRange).DeepCopyInto(out.(*IDRange)) - return nil - }, InType: reflect.TypeOf(new(IDRange))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicyReview).DeepCopyInto(out.(*PodSecurityPolicyReview)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicyReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicyReviewSpec).DeepCopyInto(out.(*PodSecurityPolicyReviewSpec)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicyReviewSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicyReviewStatus).DeepCopyInto(out.(*PodSecurityPolicyReviewStatus)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicyReviewStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicySelfSubjectReview).DeepCopyInto(out.(*PodSecurityPolicySelfSubjectReview)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicySelfSubjectReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicySelfSubjectReviewSpec).DeepCopyInto(out.(*PodSecurityPolicySelfSubjectReviewSpec)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicySelfSubjectReviewSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicySubjectReview).DeepCopyInto(out.(*PodSecurityPolicySubjectReview)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicySubjectReview))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicySubjectReviewSpec).DeepCopyInto(out.(*PodSecurityPolicySubjectReviewSpec)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicySubjectReviewSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*PodSecurityPolicySubjectReviewStatus).DeepCopyInto(out.(*PodSecurityPolicySubjectReviewStatus)) - return nil - }, InType: reflect.TypeOf(new(PodSecurityPolicySubjectReviewStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RunAsUserStrategyOptions).DeepCopyInto(out.(*RunAsUserStrategyOptions)) - return nil - }, InType: reflect.TypeOf(new(RunAsUserStrategyOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RunAsUserStrategyType).DeepCopyInto(out.(*RunAsUserStrategyType)) - return nil - }, InType: reflect.TypeOf(new(RunAsUserStrategyType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SELinuxContextStrategyOptions).DeepCopyInto(out.(*SELinuxContextStrategyOptions)) - return nil - }, InType: reflect.TypeOf(new(SELinuxContextStrategyOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SELinuxContextStrategyType).DeepCopyInto(out.(*SELinuxContextStrategyType)) - return nil - }, InType: reflect.TypeOf(new(SELinuxContextStrategyType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SecurityContextConstraints).DeepCopyInto(out.(*SecurityContextConstraints)) - return nil - }, InType: reflect.TypeOf(new(SecurityContextConstraints))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SecurityContextConstraintsList).DeepCopyInto(out.(*SecurityContextConstraintsList)) - return nil - }, InType: reflect.TypeOf(new(SecurityContextConstraintsList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ServiceAccountPodSecurityPolicyReviewStatus).DeepCopyInto(out.(*ServiceAccountPodSecurityPolicyReviewStatus)) - return nil - }, InType: reflect.TypeOf(new(ServiceAccountPodSecurityPolicyReviewStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SupplementalGroupsStrategyOptions).DeepCopyInto(out.(*SupplementalGroupsStrategyOptions)) - return nil - }, InType: reflect.TypeOf(new(SupplementalGroupsStrategyOptions))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*SupplementalGroupsStrategyType).DeepCopyInto(out.(*SupplementalGroupsStrategyType)) - return nil - }, InType: reflect.TypeOf(new(SupplementalGroupsStrategyType))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AllowedFlexVolume) DeepCopyInto(out *AllowedFlexVolume) { *out = *in @@ -382,7 +279,7 @@ func (in *PodSecurityPolicySubjectReviewStatus) DeepCopyInto(out *PodSecurityPol if *in == nil { *out = nil } else { - *out = new(api.ObjectReference) + *out = new(core.ObjectReference) **out = **in } } @@ -471,7 +368,7 @@ func (in *SELinuxContextStrategyOptions) DeepCopyInto(out *SELinuxContextStrateg if *in == nil { *out = nil } else { - *out = new(api.SELinuxOptions) + *out = new(core.SELinuxOptions) **out = **in } } @@ -524,17 +421,17 @@ func (in *SecurityContextConstraints) DeepCopyInto(out *SecurityContextConstrain } if in.DefaultAddCapabilities != nil { in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities - *out = make([]api.Capability, len(*in)) + *out = make([]core.Capability, len(*in)) copy(*out, *in) } if in.RequiredDropCapabilities != nil { in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities - *out = make([]api.Capability, len(*in)) + *out = make([]core.Capability, len(*in)) copy(*out, *in) } if in.AllowedCapabilities != nil { in, out := &in.AllowedCapabilities, &out.AllowedCapabilities - *out = make([]api.Capability, len(*in)) + *out = make([]core.Capability, len(*in)) copy(*out, *in) } if in.Volumes != nil { diff --git a/pkg/security/generated/informers/internalversion/factory.go b/pkg/security/generated/informers/internalversion/factory.go index 82133a1e8e65..04daf8a73ae2 100644 --- a/pkg/security/generated/informers/internalversion/factory.go +++ b/pkg/security/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/security/generated/informers/internalversion/internalinterfaces" security "github.com/openshift/origin/pkg/security/generated/informers/internalversion/security" internalclientset "github.com/openshift/origin/pkg/security/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Security() security.Interface { - return security.New(f) + return security.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/security/generated/informers/internalversion/generic.go b/pkg/security/generated/informers/internalversion/generic.go index d8545e69b96f..70c0db306b4d 100644 --- a/pkg/security/generated/informers/internalversion/generic.go +++ b/pkg/security/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Security, Version=InternalVersion + // Group=security.openshift.io, Version=internalVersion case security.SchemeGroupVersion.WithResource("securitycontextconstraints"): return &genericInformer{resource: resource.GroupResource(), informer: f.Security().InternalVersion().SecurityContextConstraints().Informer()}, nil diff --git a/pkg/security/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/security/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index 3189186bef6c..8b2a97216772 100644 --- a/pkg/security/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/security/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/security/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/security/generated/informers/internalversion/security/interface.go b/pkg/security/generated/informers/internalversion/security/interface.go index 35c54714dc13..15cfed0c633f 100644 --- a/pkg/security/generated/informers/internalversion/security/interface.go +++ b/pkg/security/generated/informers/internalversion/security/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/security/generated/informers/internalversion/security/internalversion/interface.go b/pkg/security/generated/informers/internalversion/security/internalversion/interface.go index 09d6796cc14f..0e44f8946df3 100644 --- a/pkg/security/generated/informers/internalversion/security/internalversion/interface.go +++ b/pkg/security/generated/informers/internalversion/security/internalversion/interface.go @@ -13,15 +13,17 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // SecurityContextConstraints returns a SecurityContextConstraintsInformer. func (v *version) SecurityContextConstraints() SecurityContextConstraintsInformer { - return &securityContextConstraintsInformer{factory: v.SharedInformerFactory} + return &securityContextConstraintsInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/security/generated/informers/internalversion/security/internalversion/securitycontextconstraints.go b/pkg/security/generated/informers/internalversion/security/internalversion/securitycontextconstraints.go index 3cb81101b520..ed8c39c9a909 100644 --- a/pkg/security/generated/informers/internalversion/security/internalversion/securitycontextconstraints.go +++ b/pkg/security/generated/informers/internalversion/security/internalversion/securitycontextconstraints.go @@ -22,19 +22,33 @@ type SecurityContextConstraintsInformer interface { } type securityContextConstraintsInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewSecurityContextConstraintsInformer constructs a new informer for SecurityContextConstraints type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewSecurityContextConstraintsInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredSecurityContextConstraintsInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredSecurityContextConstraintsInformer constructs a new informer for SecurityContextConstraints type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredSecurityContextConstraintsInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Security().SecurityContextConstraints().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Security().SecurityContextConstraints().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewSecurityContextConstraintsInformer(client internalclientset.Interface, r ) } -func defaultSecurityContextConstraintsInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewSecurityContextConstraintsInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *securityContextConstraintsInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredSecurityContextConstraintsInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *securityContextConstraintsInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&security.SecurityContextConstraints{}, defaultSecurityContextConstraintsInformer) + return f.factory.InformerFor(&security.SecurityContextConstraints{}, f.defaultInformer) } func (f *securityContextConstraintsInformer) Lister() internalversion.SecurityContextConstraintsLister { diff --git a/pkg/security/generated/internalclientset/doc.go b/pkg/security/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/security/generated/internalclientset/doc.go +++ b/pkg/security/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/security/generated/internalclientset/fake/doc.go b/pkg/security/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/security/generated/internalclientset/fake/doc.go +++ b/pkg/security/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/security/generated/internalclientset/scheme/doc.go b/pkg/security/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/security/generated/internalclientset/scheme/doc.go +++ b/pkg/security/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/security/generated/internalclientset/typed/security/internalversion/doc.go b/pkg/security/generated/internalclientset/typed/security/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/security/generated/internalclientset/typed/security/internalversion/doc.go +++ b/pkg/security/generated/internalclientset/typed/security/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/security/generated/internalclientset/typed/security/internalversion/fake/doc.go b/pkg/security/generated/internalclientset/typed/security/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/security/generated/internalclientset/typed/security/internalversion/fake/doc.go +++ b/pkg/security/generated/internalclientset/typed/security/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/template/apis/template/v1/zz_generated.conversion.go b/pkg/template/apis/template/v1/zz_generated.conversion.go index 32c6d09fd4b2..689c3ed2deaa 100644 --- a/pkg/template/apis/template/v1/zz_generated.conversion.go +++ b/pkg/template/apis/template/v1/zz_generated.conversion.go @@ -7,11 +7,11 @@ package v1 import ( v1 "github.com/openshift/api/template/v1" template "github.com/openshift/origin/pkg/template/apis/template" - core_v1 "k8s.io/api/core/v1" + api_core_v1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core "k8s.io/kubernetes/pkg/apis/core" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" unsafe "unsafe" ) @@ -121,10 +121,10 @@ func Convert_template_BrokerTemplateInstanceList_To_v1_BrokerTemplateInstanceLis } func autoConvert_v1_BrokerTemplateInstanceSpec_To_template_BrokerTemplateInstanceSpec(in *v1.BrokerTemplateInstanceSpec, out *template.BrokerTemplateInstanceSpec, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.TemplateInstance, &out.TemplateInstance, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.TemplateInstance, &out.TemplateInstance, s); err != nil { return err } - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.Secret, &out.Secret, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.Secret, &out.Secret, s); err != nil { return err } out.BindingIDs = *(*[]string)(unsafe.Pointer(&in.BindingIDs)) @@ -137,10 +137,10 @@ func Convert_v1_BrokerTemplateInstanceSpec_To_template_BrokerTemplateInstanceSpe } func autoConvert_template_BrokerTemplateInstanceSpec_To_v1_BrokerTemplateInstanceSpec(in *template.BrokerTemplateInstanceSpec, out *v1.BrokerTemplateInstanceSpec, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.TemplateInstance, &out.TemplateInstance, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.TemplateInstance, &out.TemplateInstance, s); err != nil { return err } - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.Secret, &out.Secret, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.Secret, &out.Secret, s); err != nil { return err } out.BindingIDs = *(*[]string)(unsafe.Pointer(&in.BindingIDs)) @@ -266,7 +266,7 @@ func Convert_template_TemplateInstance_To_v1_TemplateInstance(in *template.Templ func autoConvert_v1_TemplateInstanceCondition_To_template_TemplateInstanceCondition(in *v1.TemplateInstanceCondition, out *template.TemplateInstanceCondition, s conversion.Scope) error { out.Type = template.TemplateInstanceConditionType(in.Type) - out.Status = api.ConditionStatus(in.Status) + out.Status = core.ConditionStatus(in.Status) out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason out.Message = in.Message @@ -280,7 +280,7 @@ func Convert_v1_TemplateInstanceCondition_To_template_TemplateInstanceCondition( func autoConvert_template_TemplateInstanceCondition_To_v1_TemplateInstanceCondition(in *template.TemplateInstanceCondition, out *v1.TemplateInstanceCondition, s conversion.Scope) error { out.Type = v1.TemplateInstanceConditionType(in.Type) - out.Status = core_v1.ConditionStatus(in.Status) + out.Status = api_core_v1.ConditionStatus(in.Status) out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason out.Message = in.Message @@ -335,7 +335,7 @@ func Convert_template_TemplateInstanceList_To_v1_TemplateInstanceList(in *templa } func autoConvert_v1_TemplateInstanceObject_To_template_TemplateInstanceObject(in *v1.TemplateInstanceObject, out *template.TemplateInstanceObject, s conversion.Scope) error { - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.Ref, &out.Ref, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.Ref, &out.Ref, s); err != nil { return err } return nil @@ -347,7 +347,7 @@ func Convert_v1_TemplateInstanceObject_To_template_TemplateInstanceObject(in *v1 } func autoConvert_template_TemplateInstanceObject_To_v1_TemplateInstanceObject(in *template.TemplateInstanceObject, out *v1.TemplateInstanceObject, s conversion.Scope) error { - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.Ref, &out.Ref, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.Ref, &out.Ref, s); err != nil { return err } return nil @@ -390,8 +390,8 @@ func autoConvert_v1_TemplateInstanceSpec_To_template_TemplateInstanceSpec(in *v1 } if in.Secret != nil { in, out := &in.Secret, &out.Secret - *out = new(api.LocalObjectReference) - if err := api_v1.Convert_v1_LocalObjectReference_To_api_LocalObjectReference(*in, *out, s); err != nil { + *out = new(core.LocalObjectReference) + if err := core_v1.Convert_v1_LocalObjectReference_To_core_LocalObjectReference(*in, *out, s); err != nil { return err } } else { @@ -412,8 +412,8 @@ func autoConvert_template_TemplateInstanceSpec_To_v1_TemplateInstanceSpec(in *te } if in.Secret != nil { in, out := &in.Secret, &out.Secret - *out = new(core_v1.LocalObjectReference) - if err := api_v1.Convert_api_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { + *out = new(api_core_v1.LocalObjectReference) + if err := core_v1.Convert_core_LocalObjectReference_To_v1_LocalObjectReference(*in, *out, s); err != nil { return err } } else { diff --git a/pkg/template/apis/template/zz_generated.deepcopy.go b/pkg/template/apis/template/zz_generated.deepcopy.go index 1626bd764d91..bce66df95c63 100644 --- a/pkg/template/apis/template/zz_generated.deepcopy.go +++ b/pkg/template/apis/template/zz_generated.deepcopy.go @@ -5,86 +5,11 @@ package template import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api "k8s.io/kubernetes/pkg/api" - reflect "reflect" + core "k8s.io/kubernetes/pkg/apis/core" unsafe "unsafe" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BrokerTemplateInstance).DeepCopyInto(out.(*BrokerTemplateInstance)) - return nil - }, InType: reflect.TypeOf(new(BrokerTemplateInstance))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BrokerTemplateInstanceList).DeepCopyInto(out.(*BrokerTemplateInstanceList)) - return nil - }, InType: reflect.TypeOf(new(BrokerTemplateInstanceList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*BrokerTemplateInstanceSpec).DeepCopyInto(out.(*BrokerTemplateInstanceSpec)) - return nil - }, InType: reflect.TypeOf(new(BrokerTemplateInstanceSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*ExtraValue).DeepCopyInto(out.(*ExtraValue)) - return nil - }, InType: reflect.TypeOf(new(ExtraValue))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Parameter).DeepCopyInto(out.(*Parameter)) - return nil - }, InType: reflect.TypeOf(new(Parameter))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Template).DeepCopyInto(out.(*Template)) - return nil - }, InType: reflect.TypeOf(new(Template))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstance).DeepCopyInto(out.(*TemplateInstance)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstance))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstanceCondition).DeepCopyInto(out.(*TemplateInstanceCondition)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstanceCondition))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstanceConditionType).DeepCopyInto(out.(*TemplateInstanceConditionType)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstanceConditionType))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstanceList).DeepCopyInto(out.(*TemplateInstanceList)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstanceList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstanceObject).DeepCopyInto(out.(*TemplateInstanceObject)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstanceObject))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstanceRequester).DeepCopyInto(out.(*TemplateInstanceRequester)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstanceRequester))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstanceSpec).DeepCopyInto(out.(*TemplateInstanceSpec)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstanceSpec))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateInstanceStatus).DeepCopyInto(out.(*TemplateInstanceStatus)) - return nil - }, InType: reflect.TypeOf(new(TemplateInstanceStatus))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateList).DeepCopyInto(out.(*TemplateList)) - return nil - }, InType: reflect.TypeOf(new(TemplateList))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BrokerTemplateInstance) DeepCopyInto(out *BrokerTemplateInstance) { *out = *in @@ -413,7 +338,7 @@ func (in *TemplateInstanceSpec) DeepCopyInto(out *TemplateInstanceSpec) { if *in == nil { *out = nil } else { - *out = new(api.LocalObjectReference) + *out = new(core.LocalObjectReference) **out = **in } } diff --git a/pkg/template/generated/informers/internalversion/factory.go b/pkg/template/generated/informers/internalversion/factory.go index c720a480cc1a..f045b8716354 100644 --- a/pkg/template/generated/informers/internalversion/factory.go +++ b/pkg/template/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/template/generated/informers/internalversion/internalinterfaces" template "github.com/openshift/origin/pkg/template/generated/informers/internalversion/template" internalclientset "github.com/openshift/origin/pkg/template/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) Template() template.Interface { - return template.New(f) + return template.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/template/generated/informers/internalversion/generic.go b/pkg/template/generated/informers/internalversion/generic.go index 8af9469fdfac..aabb45b6f7fc 100644 --- a/pkg/template/generated/informers/internalversion/generic.go +++ b/pkg/template/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Template, Version=InternalVersion + // Group=template.openshift.io, Version=internalVersion case template.SchemeGroupVersion.WithResource("brokertemplateinstances"): return &genericInformer{resource: resource.GroupResource(), informer: f.Template().InternalVersion().BrokerTemplateInstances().Informer()}, nil case template.SchemeGroupVersion.WithResource("templates"): diff --git a/pkg/template/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/template/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index bd8bd15bb368..91c4ed011f45 100644 --- a/pkg/template/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/template/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/template/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/template/generated/informers/internalversion/template/interface.go b/pkg/template/generated/informers/internalversion/template/interface.go index ee628c2eb1dd..119aaeb7f99c 100644 --- a/pkg/template/generated/informers/internalversion/template/interface.go +++ b/pkg/template/generated/informers/internalversion/template/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/template/generated/informers/internalversion/template/internalversion/brokertemplateinstance.go b/pkg/template/generated/informers/internalversion/template/internalversion/brokertemplateinstance.go index 043a5766884c..6535b1ad693d 100644 --- a/pkg/template/generated/informers/internalversion/template/internalversion/brokertemplateinstance.go +++ b/pkg/template/generated/informers/internalversion/template/internalversion/brokertemplateinstance.go @@ -22,19 +22,33 @@ type BrokerTemplateInstanceInformer interface { } type brokerTemplateInstanceInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewBrokerTemplateInstanceInformer constructs a new informer for BrokerTemplateInstance type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewBrokerTemplateInstanceInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredBrokerTemplateInstanceInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredBrokerTemplateInstanceInformer constructs a new informer for BrokerTemplateInstance type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredBrokerTemplateInstanceInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Template().BrokerTemplateInstances().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Template().BrokerTemplateInstances().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewBrokerTemplateInstanceInformer(client internalclientset.Interface, resyn ) } -func defaultBrokerTemplateInstanceInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewBrokerTemplateInstanceInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *brokerTemplateInstanceInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredBrokerTemplateInstanceInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *brokerTemplateInstanceInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&template.BrokerTemplateInstance{}, defaultBrokerTemplateInstanceInformer) + return f.factory.InformerFor(&template.BrokerTemplateInstance{}, f.defaultInformer) } func (f *brokerTemplateInstanceInformer) Lister() internalversion.BrokerTemplateInstanceLister { diff --git a/pkg/template/generated/informers/internalversion/template/internalversion/interface.go b/pkg/template/generated/informers/internalversion/template/internalversion/interface.go index ff2115937d79..546ccd8e1988 100644 --- a/pkg/template/generated/informers/internalversion/template/internalversion/interface.go +++ b/pkg/template/generated/informers/internalversion/template/internalversion/interface.go @@ -17,25 +17,27 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // BrokerTemplateInstances returns a BrokerTemplateInstanceInformer. func (v *version) BrokerTemplateInstances() BrokerTemplateInstanceInformer { - return &brokerTemplateInstanceInformer{factory: v.SharedInformerFactory} + return &brokerTemplateInstanceInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // Templates returns a TemplateInformer. func (v *version) Templates() TemplateInformer { - return &templateInformer{factory: v.SharedInformerFactory} + return &templateInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // TemplateInstances returns a TemplateInstanceInformer. func (v *version) TemplateInstances() TemplateInstanceInformer { - return &templateInstanceInformer{factory: v.SharedInformerFactory} + return &templateInstanceInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/template/generated/informers/internalversion/template/internalversion/template.go b/pkg/template/generated/informers/internalversion/template/internalversion/template.go index f9ae7782b8bd..196f3ec3ac3f 100644 --- a/pkg/template/generated/informers/internalversion/template/internalversion/template.go +++ b/pkg/template/generated/informers/internalversion/template/internalversion/template.go @@ -22,19 +22,34 @@ type TemplateInformer interface { } type templateInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewTemplateInformer constructs a new informer for Template type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewTemplateInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredTemplateInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredTemplateInformer constructs a new informer for Template type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredTemplateInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Template().Templates(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Template().Templates(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewTemplateInformer(client internalclientset.Interface, namespace string, r ) } -func defaultTemplateInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewTemplateInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *templateInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredTemplateInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *templateInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&template.Template{}, defaultTemplateInformer) + return f.factory.InformerFor(&template.Template{}, f.defaultInformer) } func (f *templateInformer) Lister() internalversion.TemplateLister { diff --git a/pkg/template/generated/informers/internalversion/template/internalversion/templateinstance.go b/pkg/template/generated/informers/internalversion/template/internalversion/templateinstance.go index 582ba8a0b0e2..1a0a4dbe2331 100644 --- a/pkg/template/generated/informers/internalversion/template/internalversion/templateinstance.go +++ b/pkg/template/generated/informers/internalversion/template/internalversion/templateinstance.go @@ -22,19 +22,34 @@ type TemplateInstanceInformer interface { } type templateInstanceInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc + namespace string } // NewTemplateInstanceInformer constructs a new informer for TemplateInstance type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewTemplateInstanceInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredTemplateInstanceInformer(client, namespace, resyncPeriod, indexers, nil) +} + +// NewFilteredTemplateInstanceInformer constructs a new informer for TemplateInstance type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredTemplateInstanceInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Template().TemplateInstances(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.Template().TemplateInstances(namespace).Watch(options) }, }, @@ -44,12 +59,12 @@ func NewTemplateInstanceInformer(client internalclientset.Interface, namespace s ) } -func defaultTemplateInstanceInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewTemplateInstanceInformer(client, v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *templateInstanceInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredTemplateInstanceInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *templateInstanceInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&template.TemplateInstance{}, defaultTemplateInstanceInformer) + return f.factory.InformerFor(&template.TemplateInstance{}, f.defaultInformer) } func (f *templateInstanceInformer) Lister() internalversion.TemplateInstanceLister { diff --git a/pkg/template/generated/internalclientset/doc.go b/pkg/template/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/template/generated/internalclientset/doc.go +++ b/pkg/template/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/template/generated/internalclientset/fake/doc.go b/pkg/template/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/template/generated/internalclientset/fake/doc.go +++ b/pkg/template/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/template/generated/internalclientset/scheme/doc.go b/pkg/template/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/template/generated/internalclientset/scheme/doc.go +++ b/pkg/template/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/template/generated/internalclientset/typed/template/internalversion/doc.go b/pkg/template/generated/internalclientset/typed/template/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/template/generated/internalclientset/typed/template/internalversion/doc.go +++ b/pkg/template/generated/internalclientset/typed/template/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/template/generated/internalclientset/typed/template/internalversion/fake/doc.go b/pkg/template/generated/internalclientset/typed/template/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/template/generated/internalclientset/typed/template/internalversion/fake/doc.go +++ b/pkg/template/generated/internalclientset/typed/template/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/template/servicebroker/apis/config/v1/zz_generated.deepcopy.go b/pkg/template/servicebroker/apis/config/v1/zz_generated.deepcopy.go index 2fb45ff46cf4..88d097eb5d8f 100644 --- a/pkg/template/servicebroker/apis/config/v1/zz_generated.deepcopy.go +++ b/pkg/template/servicebroker/apis/config/v1/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package v1 import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateServiceBrokerConfig).DeepCopyInto(out.(*TemplateServiceBrokerConfig)) - return nil - }, InType: reflect.TypeOf(new(TemplateServiceBrokerConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TemplateServiceBrokerConfig) DeepCopyInto(out *TemplateServiceBrokerConfig) { *out = *in diff --git a/pkg/template/servicebroker/apis/config/zz_generated.deepcopy.go b/pkg/template/servicebroker/apis/config/zz_generated.deepcopy.go index d9aa30cb9fe3..7c9ba242bf64 100644 --- a/pkg/template/servicebroker/apis/config/zz_generated.deepcopy.go +++ b/pkg/template/servicebroker/apis/config/zz_generated.deepcopy.go @@ -5,28 +5,9 @@ package config import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TemplateServiceBrokerConfig).DeepCopyInto(out.(*TemplateServiceBrokerConfig)) - return nil - }, InType: reflect.TypeOf(new(TemplateServiceBrokerConfig))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TemplateServiceBrokerConfig) DeepCopyInto(out *TemplateServiceBrokerConfig) { *out = *in diff --git a/pkg/user/apis/user/v1/zz_generated.conversion.go b/pkg/user/apis/user/v1/zz_generated.conversion.go index 00fa3f0ef29a..6855e8c8a4e9 100644 --- a/pkg/user/apis/user/v1/zz_generated.conversion.go +++ b/pkg/user/apis/user/v1/zz_generated.conversion.go @@ -9,7 +9,7 @@ import ( user "github.com/openshift/origin/pkg/user/apis/user" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/kubernetes/pkg/api/v1" + core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" unsafe "unsafe" ) @@ -86,7 +86,7 @@ func autoConvert_v1_Identity_To_user_Identity(in *v1.Identity, out *user.Identit out.ObjectMeta = in.ObjectMeta out.ProviderName = in.ProviderName out.ProviderUserName = in.ProviderUserName - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.User, &out.User, s); err != nil { return err } out.Extra = *(*map[string]string)(unsafe.Pointer(&in.Extra)) @@ -102,7 +102,7 @@ func autoConvert_user_Identity_To_v1_Identity(in *user.Identity, out *v1.Identit out.ObjectMeta = in.ObjectMeta out.ProviderName = in.ProviderName out.ProviderUserName = in.ProviderUserName - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { return err } out.Extra = *(*map[string]string)(unsafe.Pointer(&in.Extra)) @@ -184,10 +184,10 @@ func Convert_user_User_To_v1_User(in *user.User, out *v1.User, s conversion.Scop func autoConvert_v1_UserIdentityMapping_To_user_UserIdentityMapping(in *v1.UserIdentityMapping, out *user.UserIdentityMapping, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.Identity, &out.Identity, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.Identity, &out.Identity, s); err != nil { return err } - if err := api_v1.Convert_v1_ObjectReference_To_api_ObjectReference(&in.User, &out.User, s); err != nil { + if err := core_v1.Convert_v1_ObjectReference_To_core_ObjectReference(&in.User, &out.User, s); err != nil { return err } return nil @@ -200,10 +200,10 @@ func Convert_v1_UserIdentityMapping_To_user_UserIdentityMapping(in *v1.UserIdent func autoConvert_user_UserIdentityMapping_To_v1_UserIdentityMapping(in *user.UserIdentityMapping, out *v1.UserIdentityMapping, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.Identity, &out.Identity, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.Identity, &out.Identity, s); err != nil { return err } - if err := api_v1.Convert_api_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { + if err := core_v1.Convert_core_ObjectReference_To_v1_ObjectReference(&in.User, &out.User, s); err != nil { return err } return nil diff --git a/pkg/user/apis/user/zz_generated.deepcopy.go b/pkg/user/apis/user/zz_generated.deepcopy.go index 8c63064c5ca0..d023563ced30 100644 --- a/pkg/user/apis/user/zz_generated.deepcopy.go +++ b/pkg/user/apis/user/zz_generated.deepcopy.go @@ -5,52 +5,9 @@ package user import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Group).DeepCopyInto(out.(*Group)) - return nil - }, InType: reflect.TypeOf(new(Group))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*GroupList).DeepCopyInto(out.(*GroupList)) - return nil - }, InType: reflect.TypeOf(new(GroupList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*Identity).DeepCopyInto(out.(*Identity)) - return nil - }, InType: reflect.TypeOf(new(Identity))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*IdentityList).DeepCopyInto(out.(*IdentityList)) - return nil - }, InType: reflect.TypeOf(new(IdentityList))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*User).DeepCopyInto(out.(*User)) - return nil - }, InType: reflect.TypeOf(new(User))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserIdentityMapping).DeepCopyInto(out.(*UserIdentityMapping)) - return nil - }, InType: reflect.TypeOf(new(UserIdentityMapping))}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*UserList).DeepCopyInto(out.(*UserList)) - return nil - }, InType: reflect.TypeOf(new(UserList))}, - ) -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Group) DeepCopyInto(out *Group) { *out = *in diff --git a/pkg/user/generated/informers/internalversion/factory.go b/pkg/user/generated/informers/internalversion/factory.go index 1e9d50aa11a0..453021c08496 100644 --- a/pkg/user/generated/informers/internalversion/factory.go +++ b/pkg/user/generated/informers/internalversion/factory.go @@ -6,6 +6,7 @@ import ( internalinterfaces "github.com/openshift/origin/pkg/user/generated/informers/internalversion/internalinterfaces" user "github.com/openshift/origin/pkg/user/generated/informers/internalversion/user" internalclientset "github.com/openshift/origin/pkg/user/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -15,9 +16,11 @@ import ( ) type sharedInformerFactory struct { - client internalclientset.Interface - lock sync.Mutex - defaultResync time.Duration + client internalclientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -27,8 +30,17 @@ type sharedInformerFactory struct { // NewSharedInformerFactory constructs a new instance of sharedInformerFactory func NewSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewFilteredSharedInformerFactory(client, defaultResync, v1.NamespaceAll, nil) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +func NewFilteredSharedInformerFactory(client internalclientset.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return &sharedInformerFactory{ client: client, + namespace: namespace, + tweakListOptions: tweakListOptions, defaultResync: defaultResync, informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), @@ -98,5 +110,5 @@ type SharedInformerFactory interface { } func (f *sharedInformerFactory) User() user.Interface { - return user.New(f) + return user.New(f, f.namespace, f.tweakListOptions) } diff --git a/pkg/user/generated/informers/internalversion/generic.go b/pkg/user/generated/informers/internalversion/generic.go index 7c2e97fa2ad8..351f68396352 100644 --- a/pkg/user/generated/informers/internalversion/generic.go +++ b/pkg/user/generated/informers/internalversion/generic.go @@ -35,7 +35,7 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=User, Version=InternalVersion + // Group=user.openshift.io, Version=internalVersion case user.SchemeGroupVersion.WithResource("groups"): return &genericInformer{resource: resource.GroupResource(), informer: f.User().InternalVersion().Groups().Informer()}, nil case user.SchemeGroupVersion.WithResource("identities"): diff --git a/pkg/user/generated/informers/internalversion/internalinterfaces/factory_interfaces.go b/pkg/user/generated/informers/internalversion/internalinterfaces/factory_interfaces.go index d2770501a19d..242bb68536af 100644 --- a/pkg/user/generated/informers/internalversion/internalinterfaces/factory_interfaces.go +++ b/pkg/user/generated/informers/internalversion/internalinterfaces/factory_interfaces.go @@ -4,6 +4,7 @@ package internalinterfaces import ( internalclientset "github.com/openshift/origin/pkg/user/generated/internalclientset" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" time "time" @@ -16,3 +17,5 @@ type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer } + +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/user/generated/informers/internalversion/user/interface.go b/pkg/user/generated/informers/internalversion/user/interface.go index a035bb5ee919..7cd677115d23 100644 --- a/pkg/user/generated/informers/internalversion/user/interface.go +++ b/pkg/user/generated/informers/internalversion/user/interface.go @@ -14,15 +14,17 @@ type Interface interface { } type group struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &group{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // InternalVersion returns a new internalversion.Interface. func (g *group) InternalVersion() internalversion.Interface { - return internalversion.New(g.SharedInformerFactory) + return internalversion.New(g.factory, g.namespace, g.tweakListOptions) } diff --git a/pkg/user/generated/informers/internalversion/user/internalversion/group.go b/pkg/user/generated/informers/internalversion/user/internalversion/group.go index 6987c857eb24..8dc306b1a501 100644 --- a/pkg/user/generated/informers/internalversion/user/internalversion/group.go +++ b/pkg/user/generated/informers/internalversion/user/internalversion/group.go @@ -22,19 +22,33 @@ type GroupInformer interface { } type groupInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewGroupInformer constructs a new informer for Group type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewGroupInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredGroupInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredGroupInformer constructs a new informer for Group type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredGroupInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.User().Groups().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.User().Groups().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewGroupInformer(client internalclientset.Interface, resyncPeriod time.Dura ) } -func defaultGroupInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewGroupInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *groupInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredGroupInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *groupInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&user.Group{}, defaultGroupInformer) + return f.factory.InformerFor(&user.Group{}, f.defaultInformer) } func (f *groupInformer) Lister() internalversion.GroupLister { diff --git a/pkg/user/generated/informers/internalversion/user/internalversion/identity.go b/pkg/user/generated/informers/internalversion/user/internalversion/identity.go index e914794fc8db..b617e58dc6ab 100644 --- a/pkg/user/generated/informers/internalversion/user/internalversion/identity.go +++ b/pkg/user/generated/informers/internalversion/user/internalversion/identity.go @@ -22,19 +22,33 @@ type IdentityInformer interface { } type identityInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewIdentityInformer constructs a new informer for Identity type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewIdentityInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredIdentityInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredIdentityInformer constructs a new informer for Identity type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredIdentityInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.User().Identities().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.User().Identities().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewIdentityInformer(client internalclientset.Interface, resyncPeriod time.D ) } -func defaultIdentityInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewIdentityInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *identityInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredIdentityInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *identityInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&user.Identity{}, defaultIdentityInformer) + return f.factory.InformerFor(&user.Identity{}, f.defaultInformer) } func (f *identityInformer) Lister() internalversion.IdentityLister { diff --git a/pkg/user/generated/informers/internalversion/user/internalversion/interface.go b/pkg/user/generated/informers/internalversion/user/internalversion/interface.go index 6c5bdde12843..b93ebd6b6566 100644 --- a/pkg/user/generated/informers/internalversion/user/internalversion/interface.go +++ b/pkg/user/generated/informers/internalversion/user/internalversion/interface.go @@ -17,25 +17,27 @@ type Interface interface { } type version struct { - internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc } // New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory) Interface { - return &version{f} +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } // Groups returns a GroupInformer. func (v *version) Groups() GroupInformer { - return &groupInformer{factory: v.SharedInformerFactory} + return &groupInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // Identities returns a IdentityInformer. func (v *version) Identities() IdentityInformer { - return &identityInformer{factory: v.SharedInformerFactory} + return &identityInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } // Users returns a UserInformer. func (v *version) Users() UserInformer { - return &userInformer{factory: v.SharedInformerFactory} + return &userInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/user/generated/informers/internalversion/user/internalversion/user.go b/pkg/user/generated/informers/internalversion/user/internalversion/user.go index 8bc16a6c98ac..c15730b73a55 100644 --- a/pkg/user/generated/informers/internalversion/user/internalversion/user.go +++ b/pkg/user/generated/informers/internalversion/user/internalversion/user.go @@ -22,19 +22,33 @@ type UserInformer interface { } type userInformer struct { - factory internalinterfaces.SharedInformerFactory + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc } // NewUserInformer constructs a new informer for User type. // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewUserInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredUserInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredUserInformer constructs a new informer for User type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredUserInformer(client internalclientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.User().Users().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } return client.User().Users().Watch(options) }, }, @@ -44,12 +58,12 @@ func NewUserInformer(client internalclientset.Interface, resyncPeriod time.Durat ) } -func defaultUserInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewUserInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) +func (f *userInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredUserInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *userInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&user.User{}, defaultUserInformer) + return f.factory.InformerFor(&user.User{}, f.defaultInformer) } func (f *userInformer) Lister() internalversion.UserLister { diff --git a/pkg/user/generated/internalclientset/doc.go b/pkg/user/generated/internalclientset/doc.go index 3ad051e407e8..6235ff8cb61c 100644 --- a/pkg/user/generated/internalclientset/doc.go +++ b/pkg/user/generated/internalclientset/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/user/generated/internalclientset/fake/doc.go b/pkg/user/generated/internalclientset/fake/doc.go index 760aaa82536d..4edd3fa14271 100644 --- a/pkg/user/generated/internalclientset/fake/doc.go +++ b/pkg/user/generated/internalclientset/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/user/generated/internalclientset/scheme/doc.go b/pkg/user/generated/internalclientset/scheme/doc.go index d1c53d03b21b..d6cdaa7cd03b 100644 --- a/pkg/user/generated/internalclientset/scheme/doc.go +++ b/pkg/user/generated/internalclientset/scheme/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/user/generated/internalclientset/typed/user/internalversion/doc.go b/pkg/user/generated/internalclientset/typed/user/internalversion/doc.go index db6e92ab2392..8fae6092cb91 100644 --- a/pkg/user/generated/internalclientset/typed/user/internalversion/doc.go +++ b/pkg/user/generated/internalclientset/typed/user/internalversion/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/user/generated/internalclientset/typed/user/internalversion/fake/doc.go b/pkg/user/generated/internalclientset/typed/user/internalversion/fake/doc.go index e3bbd12a2bac..798b81175562 100644 --- a/pkg/user/generated/internalclientset/typed/user/internalversion/fake/doc.go +++ b/pkg/user/generated/internalclientset/typed/user/internalversion/fake/doc.go @@ -1,4 +1,2 @@ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/util/testing/zz_generated.deepcopy.go b/pkg/util/testing/zz_generated.deepcopy.go index 7babaf7e6f92..cbda49b9a660 100644 --- a/pkg/util/testing/zz_generated.deepcopy.go +++ b/pkg/util/testing/zz_generated.deepcopy.go @@ -5,23 +5,9 @@ package testing import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc { - return []conversion.GeneratedDeepCopyFunc{ - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*FakeLabelsResource).DeepCopyInto(out.(*FakeLabelsResource)) - return nil - }, InType: reflect.TypeOf(new(FakeLabelsResource))}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FakeLabelsResource) DeepCopyInto(out *FakeLabelsResource) { *out = *in diff --git a/test/integration/testing/zz_generated.deepcopy.go b/test/integration/testing/zz_generated.deepcopy.go index 82cb7cc42bc6..1ff7e0ef20f5 100644 --- a/test/integration/testing/zz_generated.deepcopy.go +++ b/test/integration/testing/zz_generated.deepcopy.go @@ -5,23 +5,9 @@ package testing import ( - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - reflect "reflect" ) -// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them. -// -// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented. -func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc { - return []conversion.GeneratedDeepCopyFunc{ - {Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*TestPluginConfig).DeepCopyInto(out.(*TestPluginConfig)) - return nil - }, InType: reflect.TypeOf(new(TestPluginConfig))}, - } -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TestPluginConfig) DeepCopyInto(out *TestPluginConfig) { *out = *in