diff --git a/apis/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go b/apis/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go index 524a514d..462a38ad 100644 --- a/apis/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go +++ b/apis/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go @@ -170,7 +170,6 @@ func (c *apiServiceController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *apiServiceController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler APIServiceHandlerFunc) { - resource.PutClusterScoped(APIServiceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *apiServiceController) AddClusterScopedHandler(ctx context.Context, name } func (c *apiServiceController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler APIServiceHandlerFunc) { - resource.PutClusterScoped(APIServiceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/apiregistration.k8s.io/v1/zz_generated_api_service_lifecycle_adapter.go b/apis/apiregistration.k8s.io/v1/zz_generated_api_service_lifecycle_adapter.go index e89d0c7e..a07dff36 100644 --- a/apis/apiregistration.k8s.io/v1/zz_generated_api_service_lifecycle_adapter.go +++ b/apis/apiregistration.k8s.io/v1/zz_generated_api_service_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" v1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" ) @@ -51,6 +52,9 @@ func (w *apiServiceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewAPIServiceLifecycleAdapter(name string, clusterScoped bool, client APIServiceInterface, l APIServiceLifecycle) APIServiceHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(APIServiceGroupVersionResource) + } adapter := &apiServiceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.APIService) (runtime.Object, error) { diff --git a/apis/apps/v1beta2/zz_generated_daemon_set_controller.go b/apis/apps/v1beta2/zz_generated_daemon_set_controller.go index c2b75ebf..a0541c2a 100644 --- a/apis/apps/v1beta2/zz_generated_daemon_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_daemon_set_controller.go @@ -171,7 +171,6 @@ func (c *daemonSetController) AddFeatureHandler(ctx context.Context, enabled fun } func (c *daemonSetController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler DaemonSetHandlerFunc) { - resource.PutClusterScoped(DaemonSetGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *daemonSetController) AddClusterScopedHandler(ctx context.Context, name, } func (c *daemonSetController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler DaemonSetHandlerFunc) { - resource.PutClusterScoped(DaemonSetGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/apps/v1beta2/zz_generated_daemon_set_lifecycle_adapter.go b/apis/apps/v1beta2/zz_generated_daemon_set_lifecycle_adapter.go index 38523994..5c55c8b1 100644 --- a/apis/apps/v1beta2/zz_generated_daemon_set_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_daemon_set_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1beta2 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *daemonSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewDaemonSetLifecycleAdapter(name string, clusterScoped bool, client DaemonSetInterface, l DaemonSetLifecycle) DaemonSetHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(DaemonSetGroupVersionResource) + } adapter := &daemonSetLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1beta2.DaemonSet) (runtime.Object, error) { diff --git a/apis/apps/v1beta2/zz_generated_deployment_controller.go b/apis/apps/v1beta2/zz_generated_deployment_controller.go index 25d30638..c6d9a4f9 100644 --- a/apis/apps/v1beta2/zz_generated_deployment_controller.go +++ b/apis/apps/v1beta2/zz_generated_deployment_controller.go @@ -171,7 +171,6 @@ func (c *deploymentController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *deploymentController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler DeploymentHandlerFunc) { - resource.PutClusterScoped(DeploymentGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *deploymentController) AddClusterScopedHandler(ctx context.Context, name } func (c *deploymentController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler DeploymentHandlerFunc) { - resource.PutClusterScoped(DeploymentGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go b/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go index 53e353d1..2f02ea7d 100644 --- a/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1beta2 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *deploymentLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewDeploymentLifecycleAdapter(name string, clusterScoped bool, client DeploymentInterface, l DeploymentLifecycle) DeploymentHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(DeploymentGroupVersionResource) + } adapter := &deploymentLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1beta2.Deployment) (runtime.Object, error) { diff --git a/apis/apps/v1beta2/zz_generated_replica_set_controller.go b/apis/apps/v1beta2/zz_generated_replica_set_controller.go index a03b5c60..d1851b62 100644 --- a/apis/apps/v1beta2/zz_generated_replica_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_replica_set_controller.go @@ -171,7 +171,6 @@ func (c *replicaSetController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *replicaSetController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ReplicaSetHandlerFunc) { - resource.PutClusterScoped(ReplicaSetGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *replicaSetController) AddClusterScopedHandler(ctx context.Context, name } func (c *replicaSetController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ReplicaSetHandlerFunc) { - resource.PutClusterScoped(ReplicaSetGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/apps/v1beta2/zz_generated_replica_set_lifecycle_adapter.go b/apis/apps/v1beta2/zz_generated_replica_set_lifecycle_adapter.go index 70293d5b..710761e1 100644 --- a/apis/apps/v1beta2/zz_generated_replica_set_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_replica_set_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1beta2 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *replicaSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewReplicaSetLifecycleAdapter(name string, clusterScoped bool, client ReplicaSetInterface, l ReplicaSetLifecycle) ReplicaSetHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ReplicaSetGroupVersionResource) + } adapter := &replicaSetLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1beta2.ReplicaSet) (runtime.Object, error) { diff --git a/apis/apps/v1beta2/zz_generated_stateful_set_controller.go b/apis/apps/v1beta2/zz_generated_stateful_set_controller.go index aa314f5a..e61ff725 100644 --- a/apis/apps/v1beta2/zz_generated_stateful_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_stateful_set_controller.go @@ -171,7 +171,6 @@ func (c *statefulSetController) AddFeatureHandler(ctx context.Context, enabled f } func (c *statefulSetController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler StatefulSetHandlerFunc) { - resource.PutClusterScoped(StatefulSetGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *statefulSetController) AddClusterScopedHandler(ctx context.Context, nam } func (c *statefulSetController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler StatefulSetHandlerFunc) { - resource.PutClusterScoped(StatefulSetGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/apps/v1beta2/zz_generated_stateful_set_lifecycle_adapter.go b/apis/apps/v1beta2/zz_generated_stateful_set_lifecycle_adapter.go index 65ddd46b..c4b8e14c 100644 --- a/apis/apps/v1beta2/zz_generated_stateful_set_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_stateful_set_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1beta2 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *statefulSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec } func NewStatefulSetLifecycleAdapter(name string, clusterScoped bool, client StatefulSetInterface, l StatefulSetLifecycle) StatefulSetHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(StatefulSetGroupVersionResource) + } adapter := &statefulSetLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1beta2.StatefulSet) (runtime.Object, error) { diff --git a/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_controller.go b/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_controller.go index 5af1117b..2d5ef59a 100644 --- a/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_controller.go +++ b/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_controller.go @@ -171,7 +171,6 @@ func (c *horizontalPodAutoscalerController) AddFeatureHandler(ctx context.Contex } func (c *horizontalPodAutoscalerController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler HorizontalPodAutoscalerHandlerFunc) { - resource.PutClusterScoped(HorizontalPodAutoscalerGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *horizontalPodAutoscalerController) AddClusterScopedHandler(ctx context. } func (c *horizontalPodAutoscalerController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler HorizontalPodAutoscalerHandlerFunc) { - resource.PutClusterScoped(HorizontalPodAutoscalerGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_lifecycle_adapter.go b/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_lifecycle_adapter.go index f0ef840f..45ef568f 100644 --- a/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_lifecycle_adapter.go +++ b/apis/autoscaling/v2beta2/zz_generated_horizontal_pod_autoscaler_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v2beta2 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/autoscaling/v2beta2" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *horizontalPodAutoscalerLifecycleAdapter) Updated(obj runtime.Object) (r } func NewHorizontalPodAutoscalerLifecycleAdapter(name string, clusterScoped bool, client HorizontalPodAutoscalerInterface, l HorizontalPodAutoscalerLifecycle) HorizontalPodAutoscalerHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(HorizontalPodAutoscalerGroupVersionResource) + } adapter := &horizontalPodAutoscalerLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v2beta2.HorizontalPodAutoscaler) (runtime.Object, error) { diff --git a/apis/batch/v1/zz_generated_job_controller.go b/apis/batch/v1/zz_generated_job_controller.go index c4cad4ba..75e7fd18 100644 --- a/apis/batch/v1/zz_generated_job_controller.go +++ b/apis/batch/v1/zz_generated_job_controller.go @@ -171,7 +171,6 @@ func (c *jobController) AddFeatureHandler(ctx context.Context, enabled func() bo } func (c *jobController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler JobHandlerFunc) { - resource.PutClusterScoped(JobGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *jobController) AddClusterScopedHandler(ctx context.Context, name, clust } func (c *jobController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler JobHandlerFunc) { - resource.PutClusterScoped(JobGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/batch/v1/zz_generated_job_lifecycle_adapter.go b/apis/batch/v1/zz_generated_job_lifecycle_adapter.go index 1294f834..a0da519c 100644 --- a/apis/batch/v1/zz_generated_job_lifecycle_adapter.go +++ b/apis/batch/v1/zz_generated_job_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *jobLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error } func NewJobLifecycleAdapter(name string, clusterScoped bool, client JobInterface, l JobLifecycle) JobHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(JobGroupVersionResource) + } adapter := &jobLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Job) (runtime.Object, error) { diff --git a/apis/batch/v1beta1/zz_generated_cron_job_controller.go b/apis/batch/v1beta1/zz_generated_cron_job_controller.go index ede16871..5d8b36ef 100644 --- a/apis/batch/v1beta1/zz_generated_cron_job_controller.go +++ b/apis/batch/v1beta1/zz_generated_cron_job_controller.go @@ -171,7 +171,6 @@ func (c *cronJobController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *cronJobController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler CronJobHandlerFunc) { - resource.PutClusterScoped(CronJobGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *cronJobController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *cronJobController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler CronJobHandlerFunc) { - resource.PutClusterScoped(CronJobGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/batch/v1beta1/zz_generated_cron_job_lifecycle_adapter.go b/apis/batch/v1beta1/zz_generated_cron_job_lifecycle_adapter.go index 65968e0f..3caaf55f 100644 --- a/apis/batch/v1beta1/zz_generated_cron_job_lifecycle_adapter.go +++ b/apis/batch/v1beta1/zz_generated_cron_job_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1beta1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/batch/v1beta1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *cronJobLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewCronJobLifecycleAdapter(name string, clusterScoped bool, client CronJobInterface, l CronJobLifecycle) CronJobHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(CronJobGroupVersionResource) + } adapter := &cronJobLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1beta1.CronJob) (runtime.Object, error) { diff --git a/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_controller.go b/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_controller.go index e0e990c6..3548045c 100644 --- a/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_controller.go +++ b/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_controller.go @@ -170,7 +170,6 @@ func (c *clusterAuthTokenController) AddFeatureHandler(ctx context.Context, enab } func (c *clusterAuthTokenController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterAuthTokenHandlerFunc) { - resource.PutClusterScoped(ClusterAuthTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterAuthTokenController) AddClusterScopedHandler(ctx context.Context } func (c *clusterAuthTokenController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterAuthTokenHandlerFunc) { - resource.PutClusterScoped(ClusterAuthTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_lifecycle_adapter.go b/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_lifecycle_adapter.go index a92897fc..5ea78b43 100644 --- a/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_lifecycle_adapter.go +++ b/apis/cluster.cattle.io/v3/zz_generated_cluster_auth_token_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterAuthTokenLifecycleAdapter) Updated(obj runtime.Object) (runtime. } func NewClusterAuthTokenLifecycleAdapter(name string, clusterScoped bool, client ClusterAuthTokenInterface, l ClusterAuthTokenLifecycle) ClusterAuthTokenHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterAuthTokenGroupVersionResource) + } adapter := &clusterAuthTokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterAuthToken) (runtime.Object, error) { diff --git a/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_controller.go b/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_controller.go index 39f8f7c8..6fa17ccc 100644 --- a/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_controller.go +++ b/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_controller.go @@ -170,7 +170,6 @@ func (c *clusterUserAttributeController) AddFeatureHandler(ctx context.Context, } func (c *clusterUserAttributeController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterUserAttributeHandlerFunc) { - resource.PutClusterScoped(ClusterUserAttributeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterUserAttributeController) AddClusterScopedHandler(ctx context.Con } func (c *clusterUserAttributeController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterUserAttributeHandlerFunc) { - resource.PutClusterScoped(ClusterUserAttributeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_lifecycle_adapter.go b/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_lifecycle_adapter.go index 98453c1e..90afdf49 100644 --- a/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_lifecycle_adapter.go +++ b/apis/cluster.cattle.io/v3/zz_generated_cluster_user_attribute_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterUserAttributeLifecycleAdapter) Updated(obj runtime.Object) (runt } func NewClusterUserAttributeLifecycleAdapter(name string, clusterScoped bool, client ClusterUserAttributeInterface, l ClusterUserAttributeLifecycle) ClusterUserAttributeHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterUserAttributeGroupVersionResource) + } adapter := &clusterUserAttributeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterUserAttribute) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_component_status_controller.go b/apis/core/v1/zz_generated_component_status_controller.go index d512b17b..3f347575 100644 --- a/apis/core/v1/zz_generated_component_status_controller.go +++ b/apis/core/v1/zz_generated_component_status_controller.go @@ -170,7 +170,6 @@ func (c *componentStatusController) AddFeatureHandler(ctx context.Context, enabl } func (c *componentStatusController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ComponentStatusHandlerFunc) { - resource.PutClusterScoped(ComponentStatusGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *componentStatusController) AddClusterScopedHandler(ctx context.Context, } func (c *componentStatusController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ComponentStatusHandlerFunc) { - resource.PutClusterScoped(ComponentStatusGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go b/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go index 1fadf330..291bed1d 100644 --- a/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *componentStatusLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewComponentStatusLifecycleAdapter(name string, clusterScoped bool, client ComponentStatusInterface, l ComponentStatusLifecycle) ComponentStatusHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ComponentStatusGroupVersionResource) + } adapter := &componentStatusLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ComponentStatus) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_config_map_controller.go b/apis/core/v1/zz_generated_config_map_controller.go index b620b361..9c21e1f8 100644 --- a/apis/core/v1/zz_generated_config_map_controller.go +++ b/apis/core/v1/zz_generated_config_map_controller.go @@ -171,7 +171,6 @@ func (c *configMapController) AddFeatureHandler(ctx context.Context, enabled fun } func (c *configMapController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ConfigMapHandlerFunc) { - resource.PutClusterScoped(ConfigMapGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *configMapController) AddClusterScopedHandler(ctx context.Context, name, } func (c *configMapController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ConfigMapHandlerFunc) { - resource.PutClusterScoped(ConfigMapGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go b/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go index d707c27d..7cfdf831 100644 --- a/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *configMapLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewConfigMapLifecycleAdapter(name string, clusterScoped bool, client ConfigMapInterface, l ConfigMapLifecycle) ConfigMapHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ConfigMapGroupVersionResource) + } adapter := &configMapLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ConfigMap) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_endpoints_controller.go b/apis/core/v1/zz_generated_endpoints_controller.go index 79d3ed28..f226502b 100644 --- a/apis/core/v1/zz_generated_endpoints_controller.go +++ b/apis/core/v1/zz_generated_endpoints_controller.go @@ -171,7 +171,6 @@ func (c *endpointsController) AddFeatureHandler(ctx context.Context, enabled fun } func (c *endpointsController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler EndpointsHandlerFunc) { - resource.PutClusterScoped(EndpointsGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *endpointsController) AddClusterScopedHandler(ctx context.Context, name, } func (c *endpointsController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler EndpointsHandlerFunc) { - resource.PutClusterScoped(EndpointsGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go b/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go index f4cfe481..a8b805c4 100644 --- a/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *endpointsLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewEndpointsLifecycleAdapter(name string, clusterScoped bool, client EndpointsInterface, l EndpointsLifecycle) EndpointsHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(EndpointsGroupVersionResource) + } adapter := &endpointsLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Endpoints) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_event_controller.go b/apis/core/v1/zz_generated_event_controller.go index 50bf792f..39ecfe3d 100644 --- a/apis/core/v1/zz_generated_event_controller.go +++ b/apis/core/v1/zz_generated_event_controller.go @@ -170,7 +170,6 @@ func (c *eventController) AddFeatureHandler(ctx context.Context, enabled func() } func (c *eventController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler EventHandlerFunc) { - resource.PutClusterScoped(EventGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *eventController) AddClusterScopedHandler(ctx context.Context, name, clu } func (c *eventController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler EventHandlerFunc) { - resource.PutClusterScoped(EventGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_event_lifecycle_adapter.go b/apis/core/v1/zz_generated_event_lifecycle_adapter.go index 787dcc37..e8378880 100644 --- a/apis/core/v1/zz_generated_event_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_event_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *eventLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, err } func NewEventLifecycleAdapter(name string, clusterScoped bool, client EventInterface, l EventLifecycle) EventHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(EventGroupVersionResource) + } adapter := &eventLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Event) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_limit_range_controller.go b/apis/core/v1/zz_generated_limit_range_controller.go index fd3df349..698d1ab2 100644 --- a/apis/core/v1/zz_generated_limit_range_controller.go +++ b/apis/core/v1/zz_generated_limit_range_controller.go @@ -171,7 +171,6 @@ func (c *limitRangeController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *limitRangeController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler LimitRangeHandlerFunc) { - resource.PutClusterScoped(LimitRangeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *limitRangeController) AddClusterScopedHandler(ctx context.Context, name } func (c *limitRangeController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler LimitRangeHandlerFunc) { - resource.PutClusterScoped(LimitRangeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go b/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go index 6cb9426b..ff8b44d5 100644 --- a/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *limitRangeLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewLimitRangeLifecycleAdapter(name string, clusterScoped bool, client LimitRangeInterface, l LimitRangeLifecycle) LimitRangeHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(LimitRangeGroupVersionResource) + } adapter := &limitRangeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.LimitRange) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_namespace_controller.go b/apis/core/v1/zz_generated_namespace_controller.go index c204a18f..002d791d 100644 --- a/apis/core/v1/zz_generated_namespace_controller.go +++ b/apis/core/v1/zz_generated_namespace_controller.go @@ -170,7 +170,6 @@ func (c *namespaceController) AddFeatureHandler(ctx context.Context, enabled fun } func (c *namespaceController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NamespaceHandlerFunc) { - resource.PutClusterScoped(NamespaceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *namespaceController) AddClusterScopedHandler(ctx context.Context, name, } func (c *namespaceController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NamespaceHandlerFunc) { - resource.PutClusterScoped(NamespaceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go b/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go index 81d1a333..c80e2b23 100644 --- a/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *namespaceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewNamespaceLifecycleAdapter(name string, clusterScoped bool, client NamespaceInterface, l NamespaceLifecycle) NamespaceHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NamespaceGroupVersionResource) + } adapter := &namespaceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Namespace) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_node_controller.go b/apis/core/v1/zz_generated_node_controller.go index be33ea41..239d4e56 100644 --- a/apis/core/v1/zz_generated_node_controller.go +++ b/apis/core/v1/zz_generated_node_controller.go @@ -170,7 +170,6 @@ func (c *nodeController) AddFeatureHandler(ctx context.Context, enabled func() b } func (c *nodeController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NodeHandlerFunc) { - resource.PutClusterScoped(NodeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *nodeController) AddClusterScopedHandler(ctx context.Context, name, clus } func (c *nodeController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NodeHandlerFunc) { - resource.PutClusterScoped(NodeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_node_lifecycle_adapter.go b/apis/core/v1/zz_generated_node_lifecycle_adapter.go index 9cd3306a..b4a16506 100644 --- a/apis/core/v1/zz_generated_node_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_node_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *nodeLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro } func NewNodeLifecycleAdapter(name string, clusterScoped bool, client NodeInterface, l NodeLifecycle) NodeHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NodeGroupVersionResource) + } adapter := &nodeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Node) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_persistent_volume_claim_controller.go b/apis/core/v1/zz_generated_persistent_volume_claim_controller.go index d5a117b7..189c4c1e 100644 --- a/apis/core/v1/zz_generated_persistent_volume_claim_controller.go +++ b/apis/core/v1/zz_generated_persistent_volume_claim_controller.go @@ -171,7 +171,6 @@ func (c *persistentVolumeClaimController) AddFeatureHandler(ctx context.Context, } func (c *persistentVolumeClaimController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PersistentVolumeClaimHandlerFunc) { - resource.PutClusterScoped(PersistentVolumeClaimGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *persistentVolumeClaimController) AddClusterScopedHandler(ctx context.Co } func (c *persistentVolumeClaimController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PersistentVolumeClaimHandlerFunc) { - resource.PutClusterScoped(PersistentVolumeClaimGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go b/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go index beedf99d..63ee0df1 100644 --- a/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *persistentVolumeClaimLifecycleAdapter) Updated(obj runtime.Object) (run } func NewPersistentVolumeClaimLifecycleAdapter(name string, clusterScoped bool, client PersistentVolumeClaimInterface, l PersistentVolumeClaimLifecycle) PersistentVolumeClaimHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PersistentVolumeClaimGroupVersionResource) + } adapter := &persistentVolumeClaimLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.PersistentVolumeClaim) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_pod_controller.go b/apis/core/v1/zz_generated_pod_controller.go index 16d1f29b..a636d746 100644 --- a/apis/core/v1/zz_generated_pod_controller.go +++ b/apis/core/v1/zz_generated_pod_controller.go @@ -171,7 +171,6 @@ func (c *podController) AddFeatureHandler(ctx context.Context, enabled func() bo } func (c *podController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PodHandlerFunc) { - resource.PutClusterScoped(PodGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *podController) AddClusterScopedHandler(ctx context.Context, name, clust } func (c *podController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PodHandlerFunc) { - resource.PutClusterScoped(PodGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_pod_lifecycle_adapter.go b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go index aa761ded..d9d38fb8 100644 --- a/apis/core/v1/zz_generated_pod_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *podLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error } func NewPodLifecycleAdapter(name string, clusterScoped bool, client PodInterface, l PodLifecycle) PodHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PodGroupVersionResource) + } adapter := &podLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Pod) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_replication_controller_controller.go b/apis/core/v1/zz_generated_replication_controller_controller.go index 71373d6c..a12fb99a 100644 --- a/apis/core/v1/zz_generated_replication_controller_controller.go +++ b/apis/core/v1/zz_generated_replication_controller_controller.go @@ -171,7 +171,6 @@ func (c *replicationControllerController) AddFeatureHandler(ctx context.Context, } func (c *replicationControllerController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ReplicationControllerHandlerFunc) { - resource.PutClusterScoped(ReplicationControllerGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *replicationControllerController) AddClusterScopedHandler(ctx context.Co } func (c *replicationControllerController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ReplicationControllerHandlerFunc) { - resource.PutClusterScoped(ReplicationControllerGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go b/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go index 88eb0d75..3723d5e4 100644 --- a/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *replicationControllerLifecycleAdapter) Updated(obj runtime.Object) (run } func NewReplicationControllerLifecycleAdapter(name string, clusterScoped bool, client ReplicationControllerInterface, l ReplicationControllerLifecycle) ReplicationControllerHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ReplicationControllerGroupVersionResource) + } adapter := &replicationControllerLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ReplicationController) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_resource_quota_controller.go b/apis/core/v1/zz_generated_resource_quota_controller.go index c53ff980..c472c55f 100644 --- a/apis/core/v1/zz_generated_resource_quota_controller.go +++ b/apis/core/v1/zz_generated_resource_quota_controller.go @@ -171,7 +171,6 @@ func (c *resourceQuotaController) AddFeatureHandler(ctx context.Context, enabled } func (c *resourceQuotaController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ResourceQuotaHandlerFunc) { - resource.PutClusterScoped(ResourceQuotaGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *resourceQuotaController) AddClusterScopedHandler(ctx context.Context, n } func (c *resourceQuotaController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ResourceQuotaHandlerFunc) { - resource.PutClusterScoped(ResourceQuotaGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go b/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go index ba25159b..74c81865 100644 --- a/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *resourceQuotaLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj } func NewResourceQuotaLifecycleAdapter(name string, clusterScoped bool, client ResourceQuotaInterface, l ResourceQuotaLifecycle) ResourceQuotaHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ResourceQuotaGroupVersionResource) + } adapter := &resourceQuotaLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ResourceQuota) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_secret_controller.go b/apis/core/v1/zz_generated_secret_controller.go index 700db5b7..b0e94345 100644 --- a/apis/core/v1/zz_generated_secret_controller.go +++ b/apis/core/v1/zz_generated_secret_controller.go @@ -171,7 +171,6 @@ func (c *secretController) AddFeatureHandler(ctx context.Context, enabled func() } func (c *secretController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler SecretHandlerFunc) { - resource.PutClusterScoped(SecretGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *secretController) AddClusterScopedHandler(ctx context.Context, name, cl } func (c *secretController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler SecretHandlerFunc) { - resource.PutClusterScoped(SecretGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_secret_lifecycle_adapter.go b/apis/core/v1/zz_generated_secret_lifecycle_adapter.go index c59a7f6a..ef561b06 100644 --- a/apis/core/v1/zz_generated_secret_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_secret_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *secretLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, er } func NewSecretLifecycleAdapter(name string, clusterScoped bool, client SecretInterface, l SecretLifecycle) SecretHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(SecretGroupVersionResource) + } adapter := &secretLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Secret) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_service_account_controller.go b/apis/core/v1/zz_generated_service_account_controller.go index 96d598f0..abbd8e8d 100644 --- a/apis/core/v1/zz_generated_service_account_controller.go +++ b/apis/core/v1/zz_generated_service_account_controller.go @@ -171,7 +171,6 @@ func (c *serviceAccountController) AddFeatureHandler(ctx context.Context, enable } func (c *serviceAccountController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ServiceAccountHandlerFunc) { - resource.PutClusterScoped(ServiceAccountGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *serviceAccountController) AddClusterScopedHandler(ctx context.Context, } func (c *serviceAccountController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ServiceAccountHandlerFunc) { - resource.PutClusterScoped(ServiceAccountGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go b/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go index ca281c4f..af3bcf54 100644 --- a/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *serviceAccountLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewServiceAccountLifecycleAdapter(name string, clusterScoped bool, client ServiceAccountInterface, l ServiceAccountLifecycle) ServiceAccountHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ServiceAccountGroupVersionResource) + } adapter := &serviceAccountLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ServiceAccount) (runtime.Object, error) { diff --git a/apis/core/v1/zz_generated_service_controller.go b/apis/core/v1/zz_generated_service_controller.go index c71863d7..f41ef1ef 100644 --- a/apis/core/v1/zz_generated_service_controller.go +++ b/apis/core/v1/zz_generated_service_controller.go @@ -171,7 +171,6 @@ func (c *serviceController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *serviceController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ServiceHandlerFunc) { - resource.PutClusterScoped(ServiceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *serviceController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *serviceController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ServiceHandlerFunc) { - resource.PutClusterScoped(ServiceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/core/v1/zz_generated_service_lifecycle_adapter.go b/apis/core/v1/zz_generated_service_lifecycle_adapter.go index 37a28afd..0870e155 100644 --- a/apis/core/v1/zz_generated_service_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_service_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *serviceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewServiceLifecycleAdapter(name string, clusterScoped bool, client ServiceInterface, l ServiceLifecycle) ServiceHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ServiceGroupVersionResource) + } adapter := &serviceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Service) (runtime.Object, error) { diff --git a/apis/extensions/v1beta1/zz_generated_ingress_controller.go b/apis/extensions/v1beta1/zz_generated_ingress_controller.go index 4a5eaa01..666e450b 100644 --- a/apis/extensions/v1beta1/zz_generated_ingress_controller.go +++ b/apis/extensions/v1beta1/zz_generated_ingress_controller.go @@ -171,7 +171,6 @@ func (c *ingressController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *ingressController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler IngressHandlerFunc) { - resource.PutClusterScoped(IngressGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *ingressController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *ingressController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler IngressHandlerFunc) { - resource.PutClusterScoped(IngressGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go b/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go index 953894c2..04cf9788 100644 --- a/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go +++ b/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1beta1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *ingressLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewIngressLifecycleAdapter(name string, clusterScoped bool, client IngressInterface, l IngressLifecycle) IngressHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(IngressGroupVersionResource) + } adapter := &ingressLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1beta1.Ingress) (runtime.Object, error) { diff --git a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go index b921f849..6daf0d3e 100644 --- a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go +++ b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go @@ -170,7 +170,6 @@ func (c *podSecurityPolicyController) AddFeatureHandler(ctx context.Context, ena } func (c *podSecurityPolicyController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PodSecurityPolicyHandlerFunc) { - resource.PutClusterScoped(PodSecurityPolicyGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *podSecurityPolicyController) AddClusterScopedHandler(ctx context.Contex } func (c *podSecurityPolicyController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PodSecurityPolicyHandlerFunc) { - resource.PutClusterScoped(PodSecurityPolicyGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/extensions/v1beta1/zz_generated_pod_security_policy_lifecycle_adapter.go b/apis/extensions/v1beta1/zz_generated_pod_security_policy_lifecycle_adapter.go index 7aebebba..e024f114 100644 --- a/apis/extensions/v1beta1/zz_generated_pod_security_policy_lifecycle_adapter.go +++ b/apis/extensions/v1beta1/zz_generated_pod_security_policy_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1beta1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *podSecurityPolicyLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewPodSecurityPolicyLifecycleAdapter(name string, clusterScoped bool, client PodSecurityPolicyInterface, l PodSecurityPolicyLifecycle) PodSecurityPolicyHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PodSecurityPolicyGroupVersionResource) + } adapter := &podSecurityPolicyLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1beta1.PodSecurityPolicy) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go b/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go index c8de457d..5d75da80 100644 --- a/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_auth_config_controller.go @@ -169,7 +169,6 @@ func (c *authConfigController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *authConfigController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler AuthConfigHandlerFunc) { - resource.PutClusterScoped(AuthConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *authConfigController) AddClusterScopedHandler(ctx context.Context, name } func (c *authConfigController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler AuthConfigHandlerFunc) { - resource.PutClusterScoped(AuthConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_auth_config_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_auth_config_lifecycle_adapter.go index 13f14ecf..6f941782 100644 --- a/apis/management.cattle.io/v3/zz_generated_auth_config_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_auth_config_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *authConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewAuthConfigLifecycleAdapter(name string, clusterScoped bool, client AuthConfigInterface, l AuthConfigLifecycle) AuthConfigHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(AuthConfigGroupVersionResource) + } adapter := &authConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *AuthConfig) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go index 2651940f..11615598 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go @@ -169,7 +169,6 @@ func (c *catalogController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *catalogController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler CatalogHandlerFunc) { - resource.PutClusterScoped(CatalogGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *catalogController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *catalogController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler CatalogHandlerFunc) { - resource.PutClusterScoped(CatalogGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_catalog_lifecycle_adapter.go index 5123f5fc..6704e439 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *catalogLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewCatalogLifecycleAdapter(name string, clusterScoped bool, client CatalogInterface, l CatalogLifecycle) CatalogHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(CatalogGroupVersionResource) + } adapter := &catalogLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Catalog) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_template_controller.go b/apis/management.cattle.io/v3/zz_generated_catalog_template_controller.go index 76746821..cdf3766e 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_template_controller.go @@ -170,7 +170,6 @@ func (c *catalogTemplateController) AddFeatureHandler(ctx context.Context, enabl } func (c *catalogTemplateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler CatalogTemplateHandlerFunc) { - resource.PutClusterScoped(CatalogTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *catalogTemplateController) AddClusterScopedHandler(ctx context.Context, } func (c *catalogTemplateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler CatalogTemplateHandlerFunc) { - resource.PutClusterScoped(CatalogTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_catalog_template_lifecycle_adapter.go index 8f2f5340..c7510f33 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_template_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_template_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *catalogTemplateLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewCatalogTemplateLifecycleAdapter(name string, clusterScoped bool, client CatalogTemplateInterface, l CatalogTemplateLifecycle) CatalogTemplateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(CatalogTemplateGroupVersionResource) + } adapter := &catalogTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *CatalogTemplate) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_template_version_controller.go b/apis/management.cattle.io/v3/zz_generated_catalog_template_version_controller.go index f8e48ddc..ac365a46 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_template_version_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_template_version_controller.go @@ -170,7 +170,6 @@ func (c *catalogTemplateVersionController) AddFeatureHandler(ctx context.Context } func (c *catalogTemplateVersionController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler CatalogTemplateVersionHandlerFunc) { - resource.PutClusterScoped(CatalogTemplateVersionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *catalogTemplateVersionController) AddClusterScopedHandler(ctx context.C } func (c *catalogTemplateVersionController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler CatalogTemplateVersionHandlerFunc) { - resource.PutClusterScoped(CatalogTemplateVersionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_template_version_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_catalog_template_version_lifecycle_adapter.go index d4071a00..d1abf2a0 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_template_version_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_template_version_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *catalogTemplateVersionLifecycleAdapter) Updated(obj runtime.Object) (ru } func NewCatalogTemplateVersionLifecycleAdapter(name string, clusterScoped bool, client CatalogTemplateVersionInterface, l CatalogTemplateVersionLifecycle) CatalogTemplateVersionHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(CatalogTemplateVersionGroupVersionResource) + } adapter := &catalogTemplateVersionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *CatalogTemplateVersion) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cloud_credential_controller.go b/apis/management.cattle.io/v3/zz_generated_cloud_credential_controller.go index 6ed29b9b..64fc2bc1 100644 --- a/apis/management.cattle.io/v3/zz_generated_cloud_credential_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cloud_credential_controller.go @@ -170,7 +170,6 @@ func (c *cloudCredentialController) AddFeatureHandler(ctx context.Context, enabl } func (c *cloudCredentialController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler CloudCredentialHandlerFunc) { - resource.PutClusterScoped(CloudCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *cloudCredentialController) AddClusterScopedHandler(ctx context.Context, } func (c *cloudCredentialController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler CloudCredentialHandlerFunc) { - resource.PutClusterScoped(CloudCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cloud_credential_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cloud_credential_lifecycle_adapter.go index 4195c432..1290ebcd 100644 --- a/apis/management.cattle.io/v3/zz_generated_cloud_credential_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cloud_credential_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *cloudCredentialLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewCloudCredentialLifecycleAdapter(name string, clusterScoped bool, client CloudCredentialInterface, l CloudCredentialLifecycle) CloudCredentialHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(CloudCredentialGroupVersionResource) + } adapter := &cloudCredentialLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *CloudCredential) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go index 3a740b9d..ced78970 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_controller.go @@ -170,7 +170,6 @@ func (c *clusterAlertController) AddFeatureHandler(ctx context.Context, enabled } func (c *clusterAlertController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterAlertHandlerFunc) { - resource.PutClusterScoped(ClusterAlertGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterAlertController) AddClusterScopedHandler(ctx context.Context, na } func (c *clusterAlertController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterAlertHandlerFunc) { - resource.PutClusterScoped(ClusterAlertGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go index fbc13904..c4ee951e 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go @@ -170,7 +170,6 @@ func (c *clusterAlertGroupController) AddFeatureHandler(ctx context.Context, ena } func (c *clusterAlertGroupController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterAlertGroupHandlerFunc) { - resource.PutClusterScoped(ClusterAlertGroupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterAlertGroupController) AddClusterScopedHandler(ctx context.Contex } func (c *clusterAlertGroupController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterAlertGroupHandlerFunc) { - resource.PutClusterScoped(ClusterAlertGroupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_lifecycle_adapter.go index 2d9db443..708d1afe 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterAlertGroupLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewClusterAlertGroupLifecycleAdapter(name string, clusterScoped bool, client ClusterAlertGroupInterface, l ClusterAlertGroupLifecycle) ClusterAlertGroupHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterAlertGroupGroupVersionResource) + } adapter := &clusterAlertGroupLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterAlertGroup) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_lifecycle_adapter.go index 91f32a09..0c40e776 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterAlertLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewClusterAlertLifecycleAdapter(name string, clusterScoped bool, client ClusterAlertInterface, l ClusterAlertLifecycle) ClusterAlertHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterAlertGroupVersionResource) + } adapter := &clusterAlertLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterAlert) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go index f36b8624..d0a0dc83 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go @@ -170,7 +170,6 @@ func (c *clusterAlertRuleController) AddFeatureHandler(ctx context.Context, enab } func (c *clusterAlertRuleController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterAlertRuleHandlerFunc) { - resource.PutClusterScoped(ClusterAlertRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterAlertRuleController) AddClusterScopedHandler(ctx context.Context } func (c *clusterAlertRuleController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterAlertRuleHandlerFunc) { - resource.PutClusterScoped(ClusterAlertRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_lifecycle_adapter.go index 87d21225..a8762448 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterAlertRuleLifecycleAdapter) Updated(obj runtime.Object) (runtime. } func NewClusterAlertRuleLifecycleAdapter(name string, clusterScoped bool, client ClusterAlertRuleInterface, l ClusterAlertRuleLifecycle) ClusterAlertRuleHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterAlertRuleGroupVersionResource) + } adapter := &clusterAlertRuleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterAlertRule) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_catalog_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_catalog_controller.go index f8660ba1..ff72503f 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_catalog_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_catalog_controller.go @@ -170,7 +170,6 @@ func (c *clusterCatalogController) AddFeatureHandler(ctx context.Context, enable } func (c *clusterCatalogController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterCatalogHandlerFunc) { - resource.PutClusterScoped(ClusterCatalogGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterCatalogController) AddClusterScopedHandler(ctx context.Context, } func (c *clusterCatalogController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterCatalogHandlerFunc) { - resource.PutClusterScoped(ClusterCatalogGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_catalog_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_catalog_lifecycle_adapter.go index 03040fac..c18dca6e 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_catalog_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_catalog_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterCatalogLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewClusterCatalogLifecycleAdapter(name string, clusterScoped bool, client ClusterCatalogInterface, l ClusterCatalogLifecycle) ClusterCatalogHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterCatalogGroupVersionResource) + } adapter := &clusterCatalogLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterCatalog) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go index 87cface3..f47b8d5e 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -169,7 +169,6 @@ func (c *clusterController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *clusterController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterHandlerFunc) { - resource.PutClusterScoped(ClusterGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *clusterController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *clusterController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterHandlerFunc) { - resource.PutClusterScoped(ClusterGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_lifecycle_adapter.go index 4bb39910..93177eb0 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewClusterLifecycleAdapter(name string, clusterScoped bool, client ClusterInterface, l ClusterLifecycle) ClusterHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterGroupVersionResource) + } adapter := &clusterLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Cluster) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go index 9800e1bc..73c18807 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_logging_controller.go @@ -170,7 +170,6 @@ func (c *clusterLoggingController) AddFeatureHandler(ctx context.Context, enable } func (c *clusterLoggingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterLoggingHandlerFunc) { - resource.PutClusterScoped(ClusterLoggingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterLoggingController) AddClusterScopedHandler(ctx context.Context, } func (c *clusterLoggingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterLoggingHandlerFunc) { - resource.PutClusterScoped(ClusterLoggingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_logging_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_logging_lifecycle_adapter.go index 0443105f..ae3c474e 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_logging_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_logging_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterLoggingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewClusterLoggingLifecycleAdapter(name string, clusterScoped bool, client ClusterLoggingInterface, l ClusterLoggingLifecycle) ClusterLoggingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterLoggingGroupVersionResource) + } adapter := &clusterLoggingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterLogging) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go index 8f44f4cb..18c2223c 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go @@ -170,7 +170,6 @@ func (c *clusterMonitorGraphController) AddFeatureHandler(ctx context.Context, e } func (c *clusterMonitorGraphController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterMonitorGraphHandlerFunc) { - resource.PutClusterScoped(ClusterMonitorGraphGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterMonitorGraphController) AddClusterScopedHandler(ctx context.Cont } func (c *clusterMonitorGraphController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterMonitorGraphHandlerFunc) { - resource.PutClusterScoped(ClusterMonitorGraphGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_lifecycle_adapter.go index cd5c0ab3..d236dd76 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterMonitorGraphLifecycleAdapter) Updated(obj runtime.Object) (runti } func NewClusterMonitorGraphLifecycleAdapter(name string, clusterScoped bool, client ClusterMonitorGraphInterface, l ClusterMonitorGraphLifecycle) ClusterMonitorGraphHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterMonitorGraphGroupVersionResource) + } adapter := &clusterMonitorGraphLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterMonitorGraph) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go index 78fb09b2..d7891d1e 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_controller.go @@ -170,7 +170,6 @@ func (c *clusterRegistrationTokenController) AddFeatureHandler(ctx context.Conte } func (c *clusterRegistrationTokenController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterRegistrationTokenHandlerFunc) { - resource.PutClusterScoped(ClusterRegistrationTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterRegistrationTokenController) AddClusterScopedHandler(ctx context } func (c *clusterRegistrationTokenController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterRegistrationTokenHandlerFunc) { - resource.PutClusterScoped(ClusterRegistrationTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_lifecycle_adapter.go index dceea5d9..d8572e83 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_registration_token_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterRegistrationTokenLifecycleAdapter) Updated(obj runtime.Object) ( } func NewClusterRegistrationTokenLifecycleAdapter(name string, clusterScoped bool, client ClusterRegistrationTokenInterface, l ClusterRegistrationTokenLifecycle) ClusterRegistrationTokenHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterRegistrationTokenGroupVersionResource) + } adapter := &clusterRegistrationTokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterRegistrationToken) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go index b356f905..039ca94b 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go @@ -170,7 +170,6 @@ func (c *clusterRoleTemplateBindingController) AddFeatureHandler(ctx context.Con } func (c *clusterRoleTemplateBindingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterRoleTemplateBindingHandlerFunc) { - resource.PutClusterScoped(ClusterRoleTemplateBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterRoleTemplateBindingController) AddClusterScopedHandler(ctx conte } func (c *clusterRoleTemplateBindingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterRoleTemplateBindingHandlerFunc) { - resource.PutClusterScoped(ClusterRoleTemplateBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_lifecycle_adapter.go index 988898cb..37bc691d 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterRoleTemplateBindingLifecycleAdapter) Updated(obj runtime.Object) } func NewClusterRoleTemplateBindingLifecycleAdapter(name string, clusterScoped bool, client ClusterRoleTemplateBindingInterface, l ClusterRoleTemplateBindingLifecycle) ClusterRoleTemplateBindingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterRoleTemplateBindingGroupVersionResource) + } adapter := &clusterRoleTemplateBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterRoleTemplateBinding) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_scan_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_scan_controller.go index 99cc9df4..f29b08ef 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_scan_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_scan_controller.go @@ -170,7 +170,6 @@ func (c *clusterScanController) AddFeatureHandler(ctx context.Context, enabled f } func (c *clusterScanController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterScanHandlerFunc) { - resource.PutClusterScoped(ClusterScanGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterScanController) AddClusterScopedHandler(ctx context.Context, nam } func (c *clusterScanController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterScanHandlerFunc) { - resource.PutClusterScoped(ClusterScanGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_scan_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_scan_lifecycle_adapter.go index 67db4bf9..83569806 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_scan_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_scan_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterScanLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec } func NewClusterScanLifecycleAdapter(name string, clusterScoped bool, client ClusterScanInterface, l ClusterScanLifecycle) ClusterScanHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterScanGroupVersionResource) + } adapter := &clusterScanLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterScan) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_template_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_template_controller.go index a51ab8fc..e2d59b14 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_template_controller.go @@ -170,7 +170,6 @@ func (c *clusterTemplateController) AddFeatureHandler(ctx context.Context, enabl } func (c *clusterTemplateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterTemplateHandlerFunc) { - resource.PutClusterScoped(ClusterTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterTemplateController) AddClusterScopedHandler(ctx context.Context, } func (c *clusterTemplateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterTemplateHandlerFunc) { - resource.PutClusterScoped(ClusterTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_template_lifecycle_adapter.go index 8aeb1fdd..ffb3fcdc 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_template_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_template_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterTemplateLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewClusterTemplateLifecycleAdapter(name string, clusterScoped bool, client ClusterTemplateInterface, l ClusterTemplateLifecycle) ClusterTemplateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterTemplateGroupVersionResource) + } adapter := &clusterTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterTemplate) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_controller.go index ff8e227d..6b7f9788 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_controller.go @@ -170,7 +170,6 @@ func (c *clusterTemplateRevisionController) AddFeatureHandler(ctx context.Contex } func (c *clusterTemplateRevisionController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterTemplateRevisionHandlerFunc) { - resource.PutClusterScoped(ClusterTemplateRevisionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterTemplateRevisionController) AddClusterScopedHandler(ctx context. } func (c *clusterTemplateRevisionController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterTemplateRevisionHandlerFunc) { - resource.PutClusterScoped(ClusterTemplateRevisionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_lifecycle_adapter.go index 32eeac38..cdd8ad3a 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_template_revision_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *clusterTemplateRevisionLifecycleAdapter) Updated(obj runtime.Object) (r } func NewClusterTemplateRevisionLifecycleAdapter(name string, clusterScoped bool, client ClusterTemplateRevisionInterface, l ClusterTemplateRevisionLifecycle) ClusterTemplateRevisionHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterTemplateRevisionGroupVersionResource) + } adapter := &clusterTemplateRevisionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ClusterTemplateRevision) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go b/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go index ead2003a..6ebb0de9 100644 --- a/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_compose_config_controller.go @@ -169,7 +169,6 @@ func (c *composeConfigController) AddFeatureHandler(ctx context.Context, enabled } func (c *composeConfigController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ComposeConfigHandlerFunc) { - resource.PutClusterScoped(ComposeConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *composeConfigController) AddClusterScopedHandler(ctx context.Context, n } func (c *composeConfigController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ComposeConfigHandlerFunc) { - resource.PutClusterScoped(ComposeConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_compose_config_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_compose_config_lifecycle_adapter.go index 760b7bb6..c16f2b1c 100644 --- a/apis/management.cattle.io/v3/zz_generated_compose_config_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_compose_config_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *composeConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj } func NewComposeConfigLifecycleAdapter(name string, clusterScoped bool, client ComposeConfigInterface, l ComposeConfigLifecycle) ComposeConfigHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ComposeConfigGroupVersionResource) + } adapter := &composeConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ComposeConfig) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go b/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go index 8a30847c..cb7ad94c 100644 --- a/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go @@ -169,7 +169,6 @@ func (c *dynamicSchemaController) AddFeatureHandler(ctx context.Context, enabled } func (c *dynamicSchemaController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler DynamicSchemaHandlerFunc) { - resource.PutClusterScoped(DynamicSchemaGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *dynamicSchemaController) AddClusterScopedHandler(ctx context.Context, n } func (c *dynamicSchemaController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler DynamicSchemaHandlerFunc) { - resource.PutClusterScoped(DynamicSchemaGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_dynamic_schema_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_dynamic_schema_lifecycle_adapter.go index e57fd2c6..dc1f5cbc 100644 --- a/apis/management.cattle.io/v3/zz_generated_dynamic_schema_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_dynamic_schema_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *dynamicSchemaLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj } func NewDynamicSchemaLifecycleAdapter(name string, clusterScoped bool, client DynamicSchemaInterface, l DynamicSchemaLifecycle) DynamicSchemaHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(DynamicSchemaGroupVersionResource) + } adapter := &dynamicSchemaLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *DynamicSchema) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_etcd_backup_controller.go b/apis/management.cattle.io/v3/zz_generated_etcd_backup_controller.go index bb09bf71..def4960a 100644 --- a/apis/management.cattle.io/v3/zz_generated_etcd_backup_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_etcd_backup_controller.go @@ -170,7 +170,6 @@ func (c *etcdBackupController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *etcdBackupController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler EtcdBackupHandlerFunc) { - resource.PutClusterScoped(EtcdBackupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *etcdBackupController) AddClusterScopedHandler(ctx context.Context, name } func (c *etcdBackupController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler EtcdBackupHandlerFunc) { - resource.PutClusterScoped(EtcdBackupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_etcd_backup_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_etcd_backup_lifecycle_adapter.go index 02e1dc4b..84e46e8b 100644 --- a/apis/management.cattle.io/v3/zz_generated_etcd_backup_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_etcd_backup_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *etcdBackupLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewEtcdBackupLifecycleAdapter(name string, clusterScoped bool, client EtcdBackupInterface, l EtcdBackupLifecycle) EtcdBackupHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(EtcdBackupGroupVersionResource) + } adapter := &etcdBackupLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *EtcdBackup) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_feature_controller.go b/apis/management.cattle.io/v3/zz_generated_feature_controller.go index 83b9e703..14341b57 100644 --- a/apis/management.cattle.io/v3/zz_generated_feature_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_feature_controller.go @@ -169,7 +169,6 @@ func (c *featureController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *featureController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler FeatureHandlerFunc) { - resource.PutClusterScoped(FeatureGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *featureController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *featureController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler FeatureHandlerFunc) { - resource.PutClusterScoped(FeatureGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_feature_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_feature_lifecycle_adapter.go index 07339e23..b10732a7 100644 --- a/apis/management.cattle.io/v3/zz_generated_feature_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_feature_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *featureLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewFeatureLifecycleAdapter(name string, clusterScoped bool, client FeatureInterface, l FeatureLifecycle) FeatureHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(FeatureGroupVersionResource) + } adapter := &featureLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Feature) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go b/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go index 56b12dfe..16c2834a 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go @@ -170,7 +170,6 @@ func (c *globalDnsController) AddFeatureHandler(ctx context.Context, enabled fun } func (c *globalDnsController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler GlobalDNSHandlerFunc) { - resource.PutClusterScoped(GlobalDNSGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *globalDnsController) AddClusterScopedHandler(ctx context.Context, name, } func (c *globalDnsController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler GlobalDNSHandlerFunc) { - resource.PutClusterScoped(GlobalDNSGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_global_dns_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_global_dns_lifecycle_adapter.go index 6b126732..90645722 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_dns_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_global_dns_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *globalDnsLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewGlobalDNSLifecycleAdapter(name string, clusterScoped bool, client GlobalDNSInterface, l GlobalDNSLifecycle) GlobalDNSHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(GlobalDNSGroupVersionResource) + } adapter := &globalDnsLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *GlobalDNS) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go b/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go index 2465d629..84de2d07 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go @@ -170,7 +170,6 @@ func (c *globalDnsProviderController) AddFeatureHandler(ctx context.Context, ena } func (c *globalDnsProviderController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler GlobalDNSProviderHandlerFunc) { - resource.PutClusterScoped(GlobalDNSProviderGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *globalDnsProviderController) AddClusterScopedHandler(ctx context.Contex } func (c *globalDnsProviderController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler GlobalDNSProviderHandlerFunc) { - resource.PutClusterScoped(GlobalDNSProviderGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_global_dns_provider_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_global_dns_provider_lifecycle_adapter.go index 3755bca7..a6f6fb7f 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_dns_provider_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_global_dns_provider_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *globalDnsProviderLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewGlobalDNSProviderLifecycleAdapter(name string, clusterScoped bool, client GlobalDNSProviderInterface, l GlobalDNSProviderLifecycle) GlobalDNSProviderHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(GlobalDNSProviderGroupVersionResource) + } adapter := &globalDnsProviderLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *GlobalDNSProvider) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go index 34b8c940..f2af37b6 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_role_binding_controller.go @@ -169,7 +169,6 @@ func (c *globalRoleBindingController) AddFeatureHandler(ctx context.Context, ena } func (c *globalRoleBindingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler GlobalRoleBindingHandlerFunc) { - resource.PutClusterScoped(GlobalRoleBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *globalRoleBindingController) AddClusterScopedHandler(ctx context.Contex } func (c *globalRoleBindingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler GlobalRoleBindingHandlerFunc) { - resource.PutClusterScoped(GlobalRoleBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_global_role_binding_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_global_role_binding_lifecycle_adapter.go index 708c3574..a2f75e54 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_role_binding_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_global_role_binding_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *globalRoleBindingLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewGlobalRoleBindingLifecycleAdapter(name string, clusterScoped bool, client GlobalRoleBindingInterface, l GlobalRoleBindingLifecycle) GlobalRoleBindingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(GlobalRoleBindingGroupVersionResource) + } adapter := &globalRoleBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *GlobalRoleBinding) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_global_role_controller.go b/apis/management.cattle.io/v3/zz_generated_global_role_controller.go index d52a8ae4..c6911777 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_role_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_role_controller.go @@ -169,7 +169,6 @@ func (c *globalRoleController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *globalRoleController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler GlobalRoleHandlerFunc) { - resource.PutClusterScoped(GlobalRoleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *globalRoleController) AddClusterScopedHandler(ctx context.Context, name } func (c *globalRoleController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler GlobalRoleHandlerFunc) { - resource.PutClusterScoped(GlobalRoleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_global_role_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_global_role_lifecycle_adapter.go index 19760482..9e8091f9 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_role_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_global_role_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *globalRoleLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewGlobalRoleLifecycleAdapter(name string, clusterScoped bool, client GlobalRoleInterface, l GlobalRoleLifecycle) GlobalRoleHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(GlobalRoleGroupVersionResource) + } adapter := &globalRoleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *GlobalRole) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_group_controller.go b/apis/management.cattle.io/v3/zz_generated_group_controller.go index aa300c6a..49d01c6a 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_group_controller.go @@ -169,7 +169,6 @@ func (c *groupController) AddFeatureHandler(ctx context.Context, enabled func() } func (c *groupController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler GroupHandlerFunc) { - resource.PutClusterScoped(GroupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *groupController) AddClusterScopedHandler(ctx context.Context, name, clu } func (c *groupController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler GroupHandlerFunc) { - resource.PutClusterScoped(GroupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_group_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_group_lifecycle_adapter.go index 3707988b..c306d1e0 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_group_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *groupLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, err } func NewGroupLifecycleAdapter(name string, clusterScoped bool, client GroupInterface, l GroupLifecycle) GroupHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(GroupGroupVersionResource) + } adapter := &groupLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Group) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_group_member_controller.go b/apis/management.cattle.io/v3/zz_generated_group_member_controller.go index 880a8c0b..47c9087d 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_member_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_group_member_controller.go @@ -169,7 +169,6 @@ func (c *groupMemberController) AddFeatureHandler(ctx context.Context, enabled f } func (c *groupMemberController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler GroupMemberHandlerFunc) { - resource.PutClusterScoped(GroupMemberGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *groupMemberController) AddClusterScopedHandler(ctx context.Context, nam } func (c *groupMemberController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler GroupMemberHandlerFunc) { - resource.PutClusterScoped(GroupMemberGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_group_member_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_group_member_lifecycle_adapter.go index 26d0c139..d14d4533 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_member_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_group_member_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *groupMemberLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec } func NewGroupMemberLifecycleAdapter(name string, clusterScoped bool, client GroupMemberInterface, l GroupMemberLifecycle) GroupMemberHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(GroupMemberGroupVersionResource) + } adapter := &groupMemberLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *GroupMember) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go index bbf81fc0..8ec58bee 100644 --- a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go @@ -169,7 +169,6 @@ func (c *kontainerDriverController) AddFeatureHandler(ctx context.Context, enabl } func (c *kontainerDriverController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler KontainerDriverHandlerFunc) { - resource.PutClusterScoped(KontainerDriverGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *kontainerDriverController) AddClusterScopedHandler(ctx context.Context, } func (c *kontainerDriverController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler KontainerDriverHandlerFunc) { - resource.PutClusterScoped(KontainerDriverGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_lifecycle_adapter.go index 5f6daa04..413759c9 100644 --- a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *kontainerDriverLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewKontainerDriverLifecycleAdapter(name string, clusterScoped bool, client KontainerDriverInterface, l KontainerDriverLifecycle) KontainerDriverHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(KontainerDriverGroupVersionResource) + } adapter := &kontainerDriverLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *KontainerDriver) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go b/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go index a28a0dbe..3695b590 100644 --- a/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_ldap_config_controller.go @@ -169,7 +169,6 @@ func (c *ldapConfigController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *ldapConfigController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler LdapConfigHandlerFunc) { - resource.PutClusterScoped(LdapConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *ldapConfigController) AddClusterScopedHandler(ctx context.Context, name } func (c *ldapConfigController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler LdapConfigHandlerFunc) { - resource.PutClusterScoped(LdapConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_ldap_config_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_ldap_config_lifecycle_adapter.go index 220a0235..2173fdc4 100644 --- a/apis/management.cattle.io/v3/zz_generated_ldap_config_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_ldap_config_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *ldapConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewLdapConfigLifecycleAdapter(name string, clusterScoped bool, client LdapConfigInterface, l LdapConfigLifecycle) LdapConfigHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(LdapConfigGroupVersionResource) + } adapter := &ldapConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *LdapConfig) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go b/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go index d09755a4..e884ba77 100644 --- a/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_listen_config_controller.go @@ -169,7 +169,6 @@ func (c *listenConfigController) AddFeatureHandler(ctx context.Context, enabled } func (c *listenConfigController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ListenConfigHandlerFunc) { - resource.PutClusterScoped(ListenConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *listenConfigController) AddClusterScopedHandler(ctx context.Context, na } func (c *listenConfigController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ListenConfigHandlerFunc) { - resource.PutClusterScoped(ListenConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_listen_config_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_listen_config_lifecycle_adapter.go index 66a27270..3adf9d58 100644 --- a/apis/management.cattle.io/v3/zz_generated_listen_config_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_listen_config_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *listenConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewListenConfigLifecycleAdapter(name string, clusterScoped bool, client ListenConfigInterface, l ListenConfigLifecycle) ListenConfigHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ListenConfigGroupVersionResource) + } adapter := &listenConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ListenConfig) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go b/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go index e7f5ef1e..dc7a99b1 100644 --- a/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go @@ -170,7 +170,6 @@ func (c *monitorMetricController) AddFeatureHandler(ctx context.Context, enabled } func (c *monitorMetricController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler MonitorMetricHandlerFunc) { - resource.PutClusterScoped(MonitorMetricGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *monitorMetricController) AddClusterScopedHandler(ctx context.Context, n } func (c *monitorMetricController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler MonitorMetricHandlerFunc) { - resource.PutClusterScoped(MonitorMetricGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_monitor_metric_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_monitor_metric_lifecycle_adapter.go index fd3ed209..27968bbf 100644 --- a/apis/management.cattle.io/v3/zz_generated_monitor_metric_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_monitor_metric_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *monitorMetricLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj } func NewMonitorMetricLifecycleAdapter(name string, clusterScoped bool, client MonitorMetricInterface, l MonitorMetricLifecycle) MonitorMetricHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(MonitorMetricGroupVersionResource) + } adapter := &monitorMetricLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *MonitorMetric) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go index 071cfa6b..02817938 100644 --- a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go @@ -170,7 +170,6 @@ func (c *multiClusterAppController) AddFeatureHandler(ctx context.Context, enabl } func (c *multiClusterAppController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler MultiClusterAppHandlerFunc) { - resource.PutClusterScoped(MultiClusterAppGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *multiClusterAppController) AddClusterScopedHandler(ctx context.Context, } func (c *multiClusterAppController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler MultiClusterAppHandlerFunc) { - resource.PutClusterScoped(MultiClusterAppGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_lifecycle_adapter.go index f99a7d9a..29732ad7 100644 --- a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *multiClusterAppLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewMultiClusterAppLifecycleAdapter(name string, clusterScoped bool, client MultiClusterAppInterface, l MultiClusterAppLifecycle) MultiClusterAppHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(MultiClusterAppGroupVersionResource) + } adapter := &multiClusterAppLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *MultiClusterApp) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_controller.go b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_controller.go index a32cd0aa..1afdb8c5 100644 --- a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_controller.go @@ -170,7 +170,6 @@ func (c *multiClusterAppRevisionController) AddFeatureHandler(ctx context.Contex } func (c *multiClusterAppRevisionController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler MultiClusterAppRevisionHandlerFunc) { - resource.PutClusterScoped(MultiClusterAppRevisionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *multiClusterAppRevisionController) AddClusterScopedHandler(ctx context. } func (c *multiClusterAppRevisionController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler MultiClusterAppRevisionHandlerFunc) { - resource.PutClusterScoped(MultiClusterAppRevisionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_lifecycle_adapter.go index edbafd56..2f76c86b 100644 --- a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_revision_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *multiClusterAppRevisionLifecycleAdapter) Updated(obj runtime.Object) (r } func NewMultiClusterAppRevisionLifecycleAdapter(name string, clusterScoped bool, client MultiClusterAppRevisionInterface, l MultiClusterAppRevisionLifecycle) MultiClusterAppRevisionHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(MultiClusterAppRevisionGroupVersionResource) + } adapter := &multiClusterAppRevisionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *MultiClusterAppRevision) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_node_controller.go b/apis/management.cattle.io/v3/zz_generated_node_controller.go index 8e9d19d5..20452264 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_node_controller.go @@ -170,7 +170,6 @@ func (c *nodeController) AddFeatureHandler(ctx context.Context, enabled func() b } func (c *nodeController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NodeHandlerFunc) { - resource.PutClusterScoped(NodeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *nodeController) AddClusterScopedHandler(ctx context.Context, name, clus } func (c *nodeController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NodeHandlerFunc) { - resource.PutClusterScoped(NodeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go b/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go index 8f735ef0..2eca4596 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_node_driver_controller.go @@ -169,7 +169,6 @@ func (c *nodeDriverController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *nodeDriverController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NodeDriverHandlerFunc) { - resource.PutClusterScoped(NodeDriverGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *nodeDriverController) AddClusterScopedHandler(ctx context.Context, name } func (c *nodeDriverController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NodeDriverHandlerFunc) { - resource.PutClusterScoped(NodeDriverGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_node_driver_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_node_driver_lifecycle_adapter.go index 7607389e..4d0b2fd0 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_driver_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_node_driver_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *nodeDriverLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewNodeDriverLifecycleAdapter(name string, clusterScoped bool, client NodeDriverInterface, l NodeDriverLifecycle) NodeDriverHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NodeDriverGroupVersionResource) + } adapter := &nodeDriverLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NodeDriver) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_node_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_node_lifecycle_adapter.go index 2b8502a9..285dd478 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_node_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *nodeLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro } func NewNodeLifecycleAdapter(name string, clusterScoped bool, client NodeInterface, l NodeLifecycle) NodeHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NodeGroupVersionResource) + } adapter := &nodeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Node) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go b/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go index f4c55545..0729e88c 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_node_pool_controller.go @@ -170,7 +170,6 @@ func (c *nodePoolController) AddFeatureHandler(ctx context.Context, enabled func } func (c *nodePoolController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NodePoolHandlerFunc) { - resource.PutClusterScoped(NodePoolGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *nodePoolController) AddClusterScopedHandler(ctx context.Context, name, } func (c *nodePoolController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NodePoolHandlerFunc) { - resource.PutClusterScoped(NodePoolGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_node_pool_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_node_pool_lifecycle_adapter.go index e7d187e1..d9e2a3b9 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_pool_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_node_pool_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *nodePoolLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewNodePoolLifecycleAdapter(name string, clusterScoped bool, client NodePoolInterface, l NodePoolLifecycle) NodePoolHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NodePoolGroupVersionResource) + } adapter := &nodePoolLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NodePool) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_node_template_controller.go b/apis/management.cattle.io/v3/zz_generated_node_template_controller.go index 22f728b5..adb4b4f2 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_node_template_controller.go @@ -170,7 +170,6 @@ func (c *nodeTemplateController) AddFeatureHandler(ctx context.Context, enabled } func (c *nodeTemplateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NodeTemplateHandlerFunc) { - resource.PutClusterScoped(NodeTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *nodeTemplateController) AddClusterScopedHandler(ctx context.Context, na } func (c *nodeTemplateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NodeTemplateHandlerFunc) { - resource.PutClusterScoped(NodeTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_node_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_node_template_lifecycle_adapter.go index cc21ddd6..eedda074 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_template_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_node_template_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *nodeTemplateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewNodeTemplateLifecycleAdapter(name string, clusterScoped bool, client NodeTemplateInterface, l NodeTemplateLifecycle) NodeTemplateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NodeTemplateGroupVersionResource) + } adapter := &nodeTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NodeTemplate) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_notifier_controller.go b/apis/management.cattle.io/v3/zz_generated_notifier_controller.go index 2e7d04a7..4c88b74d 100644 --- a/apis/management.cattle.io/v3/zz_generated_notifier_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_notifier_controller.go @@ -170,7 +170,6 @@ func (c *notifierController) AddFeatureHandler(ctx context.Context, enabled func } func (c *notifierController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NotifierHandlerFunc) { - resource.PutClusterScoped(NotifierGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *notifierController) AddClusterScopedHandler(ctx context.Context, name, } func (c *notifierController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NotifierHandlerFunc) { - resource.PutClusterScoped(NotifierGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_notifier_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_notifier_lifecycle_adapter.go index 4b031b27..2f3beee1 100644 --- a/apis/management.cattle.io/v3/zz_generated_notifier_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_notifier_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *notifierLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewNotifierLifecycleAdapter(name string, clusterScoped bool, client NotifierInterface, l NotifierLifecycle) NotifierHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NotifierGroupVersionResource) + } adapter := ¬ifierLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Notifier) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go index ced942c8..5975d226 100644 --- a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go @@ -169,7 +169,6 @@ func (c *podSecurityPolicyTemplateController) AddFeatureHandler(ctx context.Cont } func (c *podSecurityPolicyTemplateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PodSecurityPolicyTemplateHandlerFunc) { - resource.PutClusterScoped(PodSecurityPolicyTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *podSecurityPolicyTemplateController) AddClusterScopedHandler(ctx contex } func (c *podSecurityPolicyTemplateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PodSecurityPolicyTemplateHandlerFunc) { - resource.PutClusterScoped(PodSecurityPolicyTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_lifecycle_adapter.go index db3667da..bc159728 100644 --- a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *podSecurityPolicyTemplateLifecycleAdapter) Updated(obj runtime.Object) } func NewPodSecurityPolicyTemplateLifecycleAdapter(name string, clusterScoped bool, client PodSecurityPolicyTemplateInterface, l PodSecurityPolicyTemplateLifecycle) PodSecurityPolicyTemplateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PodSecurityPolicyTemplateGroupVersionResource) + } adapter := &podSecurityPolicyTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *PodSecurityPolicyTemplate) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go index ae9faaeb..cbc7b58c 100644 --- a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_controller.go @@ -170,7 +170,6 @@ func (c *podSecurityPolicyTemplateProjectBindingController) AddFeatureHandler(ct } func (c *podSecurityPolicyTemplateProjectBindingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PodSecurityPolicyTemplateProjectBindingHandlerFunc) { - resource.PutClusterScoped(PodSecurityPolicyTemplateProjectBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *podSecurityPolicyTemplateProjectBindingController) AddClusterScopedHand } func (c *podSecurityPolicyTemplateProjectBindingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PodSecurityPolicyTemplateProjectBindingHandlerFunc) { - resource.PutClusterScoped(PodSecurityPolicyTemplateProjectBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_lifecycle_adapter.go index ac581165..c917eac5 100644 --- a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_project_binding_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *podSecurityPolicyTemplateProjectBindingLifecycleAdapter) Updated(obj ru } func NewPodSecurityPolicyTemplateProjectBindingLifecycleAdapter(name string, clusterScoped bool, client PodSecurityPolicyTemplateProjectBindingInterface, l PodSecurityPolicyTemplateProjectBindingLifecycle) PodSecurityPolicyTemplateProjectBindingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PodSecurityPolicyTemplateProjectBindingGroupVersionResource) + } adapter := &podSecurityPolicyTemplateProjectBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *PodSecurityPolicyTemplateProjectBinding) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_preference_controller.go b/apis/management.cattle.io/v3/zz_generated_preference_controller.go index 9636aff4..d3b23acf 100644 --- a/apis/management.cattle.io/v3/zz_generated_preference_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_preference_controller.go @@ -170,7 +170,6 @@ func (c *preferenceController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *preferenceController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PreferenceHandlerFunc) { - resource.PutClusterScoped(PreferenceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *preferenceController) AddClusterScopedHandler(ctx context.Context, name } func (c *preferenceController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PreferenceHandlerFunc) { - resource.PutClusterScoped(PreferenceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_preference_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_preference_lifecycle_adapter.go index 27c5b2ca..99cc77f0 100644 --- a/apis/management.cattle.io/v3/zz_generated_preference_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_preference_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *preferenceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewPreferenceLifecycleAdapter(name string, clusterScoped bool, client PreferenceInterface, l PreferenceLifecycle) PreferenceHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PreferenceGroupVersionResource) + } adapter := &preferenceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Preference) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_principal_controller.go b/apis/management.cattle.io/v3/zz_generated_principal_controller.go index 3d5ef83d..a98e2b19 100644 --- a/apis/management.cattle.io/v3/zz_generated_principal_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_principal_controller.go @@ -169,7 +169,6 @@ func (c *principalController) AddFeatureHandler(ctx context.Context, enabled fun } func (c *principalController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PrincipalHandlerFunc) { - resource.PutClusterScoped(PrincipalGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *principalController) AddClusterScopedHandler(ctx context.Context, name, } func (c *principalController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PrincipalHandlerFunc) { - resource.PutClusterScoped(PrincipalGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_principal_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_principal_lifecycle_adapter.go index 87c8977e..8c813362 100644 --- a/apis/management.cattle.io/v3/zz_generated_principal_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_principal_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *principalLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewPrincipalLifecycleAdapter(name string, clusterScoped bool, client PrincipalInterface, l PrincipalLifecycle) PrincipalHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PrincipalGroupVersionResource) + } adapter := &principalLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Principal) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go b/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go index 8b23b36a..3516ab1d 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_controller.go @@ -170,7 +170,6 @@ func (c *projectAlertController) AddFeatureHandler(ctx context.Context, enabled } func (c *projectAlertController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectAlertHandlerFunc) { - resource.PutClusterScoped(ProjectAlertGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectAlertController) AddClusterScopedHandler(ctx context.Context, na } func (c *projectAlertController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectAlertHandlerFunc) { - resource.PutClusterScoped(ProjectAlertGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go b/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go index 357fcba1..bb95b471 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go @@ -170,7 +170,6 @@ func (c *projectAlertGroupController) AddFeatureHandler(ctx context.Context, ena } func (c *projectAlertGroupController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectAlertGroupHandlerFunc) { - resource.PutClusterScoped(ProjectAlertGroupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectAlertGroupController) AddClusterScopedHandler(ctx context.Contex } func (c *projectAlertGroupController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectAlertGroupHandlerFunc) { - resource.PutClusterScoped(ProjectAlertGroupGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_group_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_alert_group_lifecycle_adapter.go index 4ff4dd2b..8062970f 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_group_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_group_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectAlertGroupLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewProjectAlertGroupLifecycleAdapter(name string, clusterScoped bool, client ProjectAlertGroupInterface, l ProjectAlertGroupLifecycle) ProjectAlertGroupHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectAlertGroupGroupVersionResource) + } adapter := &projectAlertGroupLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectAlertGroup) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_alert_lifecycle_adapter.go index 7e67c19a..a4a01248 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectAlertLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewProjectAlertLifecycleAdapter(name string, clusterScoped bool, client ProjectAlertInterface, l ProjectAlertLifecycle) ProjectAlertHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectAlertGroupVersionResource) + } adapter := &projectAlertLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectAlert) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go b/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go index effe2774..4d464599 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go @@ -170,7 +170,6 @@ func (c *projectAlertRuleController) AddFeatureHandler(ctx context.Context, enab } func (c *projectAlertRuleController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectAlertRuleHandlerFunc) { - resource.PutClusterScoped(ProjectAlertRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectAlertRuleController) AddClusterScopedHandler(ctx context.Context } func (c *projectAlertRuleController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectAlertRuleHandlerFunc) { - resource.PutClusterScoped(ProjectAlertRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_rule_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_alert_rule_lifecycle_adapter.go index 20531062..041dbbe2 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_rule_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_rule_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectAlertRuleLifecycleAdapter) Updated(obj runtime.Object) (runtime. } func NewProjectAlertRuleLifecycleAdapter(name string, clusterScoped bool, client ProjectAlertRuleInterface, l ProjectAlertRuleLifecycle) ProjectAlertRuleHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectAlertRuleGroupVersionResource) + } adapter := &projectAlertRuleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectAlertRule) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_catalog_controller.go b/apis/management.cattle.io/v3/zz_generated_project_catalog_controller.go index 6d39c39b..7b011e71 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_catalog_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_catalog_controller.go @@ -170,7 +170,6 @@ func (c *projectCatalogController) AddFeatureHandler(ctx context.Context, enable } func (c *projectCatalogController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectCatalogHandlerFunc) { - resource.PutClusterScoped(ProjectCatalogGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectCatalogController) AddClusterScopedHandler(ctx context.Context, } func (c *projectCatalogController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectCatalogHandlerFunc) { - resource.PutClusterScoped(ProjectCatalogGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_catalog_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_catalog_lifecycle_adapter.go index 208f1389..7d276428 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_catalog_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_catalog_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectCatalogLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewProjectCatalogLifecycleAdapter(name string, clusterScoped bool, client ProjectCatalogInterface, l ProjectCatalogLifecycle) ProjectCatalogHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectCatalogGroupVersionResource) + } adapter := &projectCatalogLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectCatalog) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_controller.go b/apis/management.cattle.io/v3/zz_generated_project_controller.go index 426b39c3..2066405c 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -170,7 +170,6 @@ func (c *projectController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *projectController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectHandlerFunc) { - resource.PutClusterScoped(ProjectGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *projectController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectHandlerFunc) { - resource.PutClusterScoped(ProjectGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_lifecycle_adapter.go index a2c2f4f0..d46148f7 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewProjectLifecycleAdapter(name string, clusterScoped bool, client ProjectInterface, l ProjectLifecycle) ProjectHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectGroupVersionResource) + } adapter := &projectLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Project) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go b/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go index 80213a86..59e99485 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_logging_controller.go @@ -170,7 +170,6 @@ func (c *projectLoggingController) AddFeatureHandler(ctx context.Context, enable } func (c *projectLoggingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectLoggingHandlerFunc) { - resource.PutClusterScoped(ProjectLoggingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectLoggingController) AddClusterScopedHandler(ctx context.Context, } func (c *projectLoggingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectLoggingHandlerFunc) { - resource.PutClusterScoped(ProjectLoggingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_logging_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_logging_lifecycle_adapter.go index 70bb7d0a..d25e89ee 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_logging_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_logging_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectLoggingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewProjectLoggingLifecycleAdapter(name string, clusterScoped bool, client ProjectLoggingInterface, l ProjectLoggingLifecycle) ProjectLoggingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectLoggingGroupVersionResource) + } adapter := &projectLoggingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectLogging) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go b/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go index 7ce54848..ec5f8553 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go @@ -170,7 +170,6 @@ func (c *projectMonitorGraphController) AddFeatureHandler(ctx context.Context, e } func (c *projectMonitorGraphController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectMonitorGraphHandlerFunc) { - resource.PutClusterScoped(ProjectMonitorGraphGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectMonitorGraphController) AddClusterScopedHandler(ctx context.Cont } func (c *projectMonitorGraphController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectMonitorGraphHandlerFunc) { - resource.PutClusterScoped(ProjectMonitorGraphGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_lifecycle_adapter.go index 832d8cc2..584e48e1 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectMonitorGraphLifecycleAdapter) Updated(obj runtime.Object) (runti } func NewProjectMonitorGraphLifecycleAdapter(name string, clusterScoped bool, client ProjectMonitorGraphInterface, l ProjectMonitorGraphLifecycle) ProjectMonitorGraphHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectMonitorGraphGroupVersionResource) + } adapter := &projectMonitorGraphLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectMonitorGraph) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go b/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go index c9f2d02b..e00798b1 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_network_policy_controller.go @@ -170,7 +170,6 @@ func (c *projectNetworkPolicyController) AddFeatureHandler(ctx context.Context, } func (c *projectNetworkPolicyController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectNetworkPolicyHandlerFunc) { - resource.PutClusterScoped(ProjectNetworkPolicyGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectNetworkPolicyController) AddClusterScopedHandler(ctx context.Con } func (c *projectNetworkPolicyController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectNetworkPolicyHandlerFunc) { - resource.PutClusterScoped(ProjectNetworkPolicyGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_network_policy_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_network_policy_lifecycle_adapter.go index de93cd98..c175f8a9 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_network_policy_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_network_policy_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectNetworkPolicyLifecycleAdapter) Updated(obj runtime.Object) (runt } func NewProjectNetworkPolicyLifecycleAdapter(name string, clusterScoped bool, client ProjectNetworkPolicyInterface, l ProjectNetworkPolicyLifecycle) ProjectNetworkPolicyHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectNetworkPolicyGroupVersionResource) + } adapter := &projectNetworkPolicyLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectNetworkPolicy) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go index 9bbebdf3..3d15c738 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go @@ -170,7 +170,6 @@ func (c *projectRoleTemplateBindingController) AddFeatureHandler(ctx context.Con } func (c *projectRoleTemplateBindingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ProjectRoleTemplateBindingHandlerFunc) { - resource.PutClusterScoped(ProjectRoleTemplateBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *projectRoleTemplateBindingController) AddClusterScopedHandler(ctx conte } func (c *projectRoleTemplateBindingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ProjectRoleTemplateBindingHandlerFunc) { - resource.PutClusterScoped(ProjectRoleTemplateBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_lifecycle_adapter.go index 5ee848d1..cad2188f 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *projectRoleTemplateBindingLifecycleAdapter) Updated(obj runtime.Object) } func NewProjectRoleTemplateBindingLifecycleAdapter(name string, clusterScoped bool, client ProjectRoleTemplateBindingInterface, l ProjectRoleTemplateBindingLifecycle) ProjectRoleTemplateBindingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ProjectRoleTemplateBindingGroupVersionResource) + } adapter := &projectRoleTemplateBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ProjectRoleTemplateBinding) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_rke_addon_controller.go b/apis/management.cattle.io/v3/zz_generated_rke_addon_controller.go index 0d70352e..b607e2d2 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_addon_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_addon_controller.go @@ -170,7 +170,6 @@ func (c *rkeAddonController) AddFeatureHandler(ctx context.Context, enabled func } func (c *rkeAddonController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler RKEAddonHandlerFunc) { - resource.PutClusterScoped(RKEAddonGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *rkeAddonController) AddClusterScopedHandler(ctx context.Context, name, } func (c *rkeAddonController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler RKEAddonHandlerFunc) { - resource.PutClusterScoped(RKEAddonGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_rke_addon_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_rke_addon_lifecycle_adapter.go index 2cb06f7d..bd027df0 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_addon_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_addon_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *rkeAddonLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewRKEAddonLifecycleAdapter(name string, clusterScoped bool, client RKEAddonInterface, l RKEAddonLifecycle) RKEAddonHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(RKEAddonGroupVersionResource) + } adapter := &rkeAddonLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *RKEAddon) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_controller.go b/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_controller.go index 1e4ed07e..b254ebb0 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_controller.go @@ -170,7 +170,6 @@ func (c *rkeK8sServiceOptionController) AddFeatureHandler(ctx context.Context, e } func (c *rkeK8sServiceOptionController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler RKEK8sServiceOptionHandlerFunc) { - resource.PutClusterScoped(RKEK8sServiceOptionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *rkeK8sServiceOptionController) AddClusterScopedHandler(ctx context.Cont } func (c *rkeK8sServiceOptionController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler RKEK8sServiceOptionHandlerFunc) { - resource.PutClusterScoped(RKEK8sServiceOptionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_lifecycle_adapter.go index 4578da52..92100c4c 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_k8s_service_option_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *rkeK8sServiceOptionLifecycleAdapter) Updated(obj runtime.Object) (runti } func NewRKEK8sServiceOptionLifecycleAdapter(name string, clusterScoped bool, client RKEK8sServiceOptionInterface, l RKEK8sServiceOptionLifecycle) RKEK8sServiceOptionHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(RKEK8sServiceOptionGroupVersionResource) + } adapter := &rkeK8sServiceOptionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *RKEK8sServiceOption) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_controller.go b/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_controller.go index 86afcfc5..29568f39 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_controller.go @@ -170,7 +170,6 @@ func (c *rkeK8sSystemImageController) AddFeatureHandler(ctx context.Context, ena } func (c *rkeK8sSystemImageController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler RKEK8sSystemImageHandlerFunc) { - resource.PutClusterScoped(RKEK8sSystemImageGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *rkeK8sSystemImageController) AddClusterScopedHandler(ctx context.Contex } func (c *rkeK8sSystemImageController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler RKEK8sSystemImageHandlerFunc) { - resource.PutClusterScoped(RKEK8sSystemImageGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_lifecycle_adapter.go index 52763f10..e88af380 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_k8s_system_image_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *rkeK8sSystemImageLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewRKEK8sSystemImageLifecycleAdapter(name string, clusterScoped bool, client RKEK8sSystemImageInterface, l RKEK8sSystemImageLifecycle) RKEK8sSystemImageHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(RKEK8sSystemImageGroupVersionResource) + } adapter := &rkeK8sSystemImageLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *RKEK8sSystemImage) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_controller.go b/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_controller.go index 467f16f2..50090c75 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_controller.go @@ -170,7 +170,6 @@ func (c *rkeK8sWindowsSystemImageController) AddFeatureHandler(ctx context.Conte } func (c *rkeK8sWindowsSystemImageController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler RKEK8sWindowsSystemImageHandlerFunc) { - resource.PutClusterScoped(RKEK8sWindowsSystemImageGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *rkeK8sWindowsSystemImageController) AddClusterScopedHandler(ctx context } func (c *rkeK8sWindowsSystemImageController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler RKEK8sWindowsSystemImageHandlerFunc) { - resource.PutClusterScoped(RKEK8sWindowsSystemImageGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_lifecycle_adapter.go index 85853aa1..20d9a37b 100644 --- a/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_rke_k8s_windows_system_image_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *rkeK8sWindowsSystemImageLifecycleAdapter) Updated(obj runtime.Object) ( } func NewRKEK8sWindowsSystemImageLifecycleAdapter(name string, clusterScoped bool, client RKEK8sWindowsSystemImageInterface, l RKEK8sWindowsSystemImageLifecycle) RKEK8sWindowsSystemImageHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(RKEK8sWindowsSystemImageGroupVersionResource) + } adapter := &rkeK8sWindowsSystemImageLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *RKEK8sWindowsSystemImage) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_role_template_controller.go b/apis/management.cattle.io/v3/zz_generated_role_template_controller.go index 55718712..45033156 100644 --- a/apis/management.cattle.io/v3/zz_generated_role_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_role_template_controller.go @@ -169,7 +169,6 @@ func (c *roleTemplateController) AddFeatureHandler(ctx context.Context, enabled } func (c *roleTemplateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler RoleTemplateHandlerFunc) { - resource.PutClusterScoped(RoleTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *roleTemplateController) AddClusterScopedHandler(ctx context.Context, na } func (c *roleTemplateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler RoleTemplateHandlerFunc) { - resource.PutClusterScoped(RoleTemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_role_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_role_template_lifecycle_adapter.go index 52b4e37d..1e85d93b 100644 --- a/apis/management.cattle.io/v3/zz_generated_role_template_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_role_template_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *roleTemplateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewRoleTemplateLifecycleAdapter(name string, clusterScoped bool, client RoleTemplateInterface, l RoleTemplateLifecycle) RoleTemplateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(RoleTemplateGroupVersionResource) + } adapter := &roleTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *RoleTemplate) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_setting_controller.go b/apis/management.cattle.io/v3/zz_generated_setting_controller.go index ddaff37c..03d481b5 100644 --- a/apis/management.cattle.io/v3/zz_generated_setting_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_setting_controller.go @@ -169,7 +169,6 @@ func (c *settingController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *settingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler SettingHandlerFunc) { - resource.PutClusterScoped(SettingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *settingController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *settingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler SettingHandlerFunc) { - resource.PutClusterScoped(SettingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_setting_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_setting_lifecycle_adapter.go index b999b176..5bb7e5b1 100644 --- a/apis/management.cattle.io/v3/zz_generated_setting_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_setting_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *settingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewSettingLifecycleAdapter(name string, clusterScoped bool, client SettingInterface, l SettingLifecycle) SettingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(SettingGroupVersionResource) + } adapter := &settingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Setting) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_template_content_controller.go b/apis/management.cattle.io/v3/zz_generated_template_content_controller.go index b1779ce7..1b17859c 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_content_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_content_controller.go @@ -169,7 +169,6 @@ func (c *templateContentController) AddFeatureHandler(ctx context.Context, enabl } func (c *templateContentController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler TemplateContentHandlerFunc) { - resource.PutClusterScoped(TemplateContentGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *templateContentController) AddClusterScopedHandler(ctx context.Context, } func (c *templateContentController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler TemplateContentHandlerFunc) { - resource.PutClusterScoped(TemplateContentGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go index 958fe949..6c09527d 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_template_content_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *templateContentLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewTemplateContentLifecycleAdapter(name string, clusterScoped bool, client TemplateContentInterface, l TemplateContentLifecycle) TemplateContentHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(TemplateContentGroupVersionResource) + } adapter := &templateContentLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *TemplateContent) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_template_controller.go b/apis/management.cattle.io/v3/zz_generated_template_controller.go index 7fb91e5f..149766ad 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_controller.go @@ -169,7 +169,6 @@ func (c *templateController) AddFeatureHandler(ctx context.Context, enabled func } func (c *templateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler TemplateHandlerFunc) { - resource.PutClusterScoped(TemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *templateController) AddClusterScopedHandler(ctx context.Context, name, } func (c *templateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler TemplateHandlerFunc) { - resource.PutClusterScoped(TemplateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_template_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_template_lifecycle_adapter.go index 9dfa67be..719467cc 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_template_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *templateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewTemplateLifecycleAdapter(name string, clusterScoped bool, client TemplateInterface, l TemplateLifecycle) TemplateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(TemplateGroupVersionResource) + } adapter := &templateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Template) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_template_version_controller.go b/apis/management.cattle.io/v3/zz_generated_template_version_controller.go index ac81690d..f15068a4 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_version_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_version_controller.go @@ -169,7 +169,6 @@ func (c *templateVersionController) AddFeatureHandler(ctx context.Context, enabl } func (c *templateVersionController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler TemplateVersionHandlerFunc) { - resource.PutClusterScoped(TemplateVersionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *templateVersionController) AddClusterScopedHandler(ctx context.Context, } func (c *templateVersionController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler TemplateVersionHandlerFunc) { - resource.PutClusterScoped(TemplateVersionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_template_version_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_template_version_lifecycle_adapter.go index f0659afb..bb7ea36a 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_version_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_template_version_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *templateVersionLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewTemplateVersionLifecycleAdapter(name string, clusterScoped bool, client TemplateVersionInterface, l TemplateVersionLifecycle) TemplateVersionHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(TemplateVersionGroupVersionResource) + } adapter := &templateVersionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *TemplateVersion) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_token_controller.go b/apis/management.cattle.io/v3/zz_generated_token_controller.go index c560b17c..dd1ed4a3 100644 --- a/apis/management.cattle.io/v3/zz_generated_token_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_token_controller.go @@ -169,7 +169,6 @@ func (c *tokenController) AddFeatureHandler(ctx context.Context, enabled func() } func (c *tokenController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler TokenHandlerFunc) { - resource.PutClusterScoped(TokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *tokenController) AddClusterScopedHandler(ctx context.Context, name, clu } func (c *tokenController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler TokenHandlerFunc) { - resource.PutClusterScoped(TokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_token_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_token_lifecycle_adapter.go index d25fd5d4..e82bf45a 100644 --- a/apis/management.cattle.io/v3/zz_generated_token_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_token_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *tokenLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, err } func NewTokenLifecycleAdapter(name string, clusterScoped bool, client TokenInterface, l TokenLifecycle) TokenHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(TokenGroupVersionResource) + } adapter := &tokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Token) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go b/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go index 0a8b66ea..a75767cd 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_user_attribute_controller.go @@ -169,7 +169,6 @@ func (c *userAttributeController) AddFeatureHandler(ctx context.Context, enabled } func (c *userAttributeController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler UserAttributeHandlerFunc) { - resource.PutClusterScoped(UserAttributeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *userAttributeController) AddClusterScopedHandler(ctx context.Context, n } func (c *userAttributeController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler UserAttributeHandlerFunc) { - resource.PutClusterScoped(UserAttributeGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_user_attribute_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_user_attribute_lifecycle_adapter.go index 1dc7a410..45605f1c 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_attribute_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_user_attribute_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *userAttributeLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj } func NewUserAttributeLifecycleAdapter(name string, clusterScoped bool, client UserAttributeInterface, l UserAttributeLifecycle) UserAttributeHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(UserAttributeGroupVersionResource) + } adapter := &userAttributeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *UserAttribute) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3/zz_generated_user_controller.go b/apis/management.cattle.io/v3/zz_generated_user_controller.go index 1ac21fad..25f5f332 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_user_controller.go @@ -169,7 +169,6 @@ func (c *userController) AddFeatureHandler(ctx context.Context, enabled func() b } func (c *userController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler UserHandlerFunc) { - resource.PutClusterScoped(UserGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *userController) AddClusterScopedHandler(ctx context.Context, name, clus } func (c *userController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler UserHandlerFunc) { - resource.PutClusterScoped(UserGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3/zz_generated_user_lifecycle_adapter.go b/apis/management.cattle.io/v3/zz_generated_user_lifecycle_adapter.go index 383d6c4a..ab2082bb 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3/zz_generated_user_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *userLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro } func NewUserLifecycleAdapter(name string, clusterScoped bool, client UserInterface, l UserLifecycle) UserHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(UserGroupVersionResource) + } adapter := &userLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *User) (runtime.Object, error) { diff --git a/apis/management.cattle.io/v3public/zz_generated_auth_provider_controller.go b/apis/management.cattle.io/v3public/zz_generated_auth_provider_controller.go index 190283f3..06bd7bf9 100644 --- a/apis/management.cattle.io/v3public/zz_generated_auth_provider_controller.go +++ b/apis/management.cattle.io/v3public/zz_generated_auth_provider_controller.go @@ -169,7 +169,6 @@ func (c *authProviderController) AddFeatureHandler(ctx context.Context, enabled } func (c *authProviderController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler AuthProviderHandlerFunc) { - resource.PutClusterScoped(AuthProviderGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *authProviderController) AddClusterScopedHandler(ctx context.Context, na } func (c *authProviderController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler AuthProviderHandlerFunc) { - resource.PutClusterScoped(AuthProviderGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/management.cattle.io/v3public/zz_generated_auth_provider_lifecycle_adapter.go b/apis/management.cattle.io/v3public/zz_generated_auth_provider_lifecycle_adapter.go index b6de60ab..b237098d 100644 --- a/apis/management.cattle.io/v3public/zz_generated_auth_provider_lifecycle_adapter.go +++ b/apis/management.cattle.io/v3public/zz_generated_auth_provider_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3public import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *authProviderLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewAuthProviderLifecycleAdapter(name string, clusterScoped bool, client AuthProviderInterface, l AuthProviderLifecycle) AuthProviderHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(AuthProviderGroupVersionResource) + } adapter := &authProviderLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *AuthProvider) (runtime.Object, error) { diff --git a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go index 315e1865..31f0931b 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go @@ -171,7 +171,6 @@ func (c *alertmanagerController) AddFeatureHandler(ctx context.Context, enabled } func (c *alertmanagerController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler AlertmanagerHandlerFunc) { - resource.PutClusterScoped(AlertmanagerGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *alertmanagerController) AddClusterScopedHandler(ctx context.Context, na } func (c *alertmanagerController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler AlertmanagerHandlerFunc) { - resource.PutClusterScoped(AlertmanagerGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go index 15788613..f9434ffe 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go @@ -3,6 +3,7 @@ package v1 import ( v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *alertmanagerLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewAlertmanagerLifecycleAdapter(name string, clusterScoped bool, client AlertmanagerInterface, l AlertmanagerLifecycle) AlertmanagerHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(AlertmanagerGroupVersionResource) + } adapter := &alertmanagerLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Alertmanager) (runtime.Object, error) { diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go index c5ebbff6..41fcf9e2 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go @@ -171,7 +171,6 @@ func (c *prometheusController) AddFeatureHandler(ctx context.Context, enabled fu } func (c *prometheusController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PrometheusHandlerFunc) { - resource.PutClusterScoped(PrometheusGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *prometheusController) AddClusterScopedHandler(ctx context.Context, name } func (c *prometheusController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PrometheusHandlerFunc) { - resource.PutClusterScoped(PrometheusGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go index 4ba13e3c..6c2bbb3b 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go @@ -3,6 +3,7 @@ package v1 import ( v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *prometheusLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object } func NewPrometheusLifecycleAdapter(name string, clusterScoped bool, client PrometheusInterface, l PrometheusLifecycle) PrometheusHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PrometheusGroupVersionResource) + } adapter := &prometheusLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Prometheus) (runtime.Object, error) { diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go index 424c694b..98b838fb 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go @@ -171,7 +171,6 @@ func (c *prometheusRuleController) AddFeatureHandler(ctx context.Context, enable } func (c *prometheusRuleController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PrometheusRuleHandlerFunc) { - resource.PutClusterScoped(PrometheusRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *prometheusRuleController) AddClusterScopedHandler(ctx context.Context, } func (c *prometheusRuleController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PrometheusRuleHandlerFunc) { - resource.PutClusterScoped(PrometheusRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go index 97791f98..50835302 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go @@ -3,6 +3,7 @@ package v1 import ( v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *prometheusRuleLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewPrometheusRuleLifecycleAdapter(name string, clusterScoped bool, client PrometheusRuleInterface, l PrometheusRuleLifecycle) PrometheusRuleHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PrometheusRuleGroupVersionResource) + } adapter := &prometheusRuleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.PrometheusRule) (runtime.Object, error) { diff --git a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go index 189b8dea..f2cd4ec3 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go @@ -171,7 +171,6 @@ func (c *serviceMonitorController) AddFeatureHandler(ctx context.Context, enable } func (c *serviceMonitorController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ServiceMonitorHandlerFunc) { - resource.PutClusterScoped(ServiceMonitorGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *serviceMonitorController) AddClusterScopedHandler(ctx context.Context, } func (c *serviceMonitorController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ServiceMonitorHandlerFunc) { - resource.PutClusterScoped(ServiceMonitorGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go index e83b78ad..e6fdc5e2 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go @@ -3,6 +3,7 @@ package v1 import ( v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *serviceMonitorLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewServiceMonitorLifecycleAdapter(name string, clusterScoped bool, client ServiceMonitorInterface, l ServiceMonitorLifecycle) ServiceMonitorHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ServiceMonitorGroupVersionResource) + } adapter := &serviceMonitorLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ServiceMonitor) (runtime.Object, error) { diff --git a/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_controller.go b/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_controller.go index 9ac50508..d7841ac8 100644 --- a/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_controller.go +++ b/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_controller.go @@ -171,7 +171,6 @@ func (c *destinationRuleController) AddFeatureHandler(ctx context.Context, enabl } func (c *destinationRuleController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler DestinationRuleHandlerFunc) { - resource.PutClusterScoped(DestinationRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *destinationRuleController) AddClusterScopedHandler(ctx context.Context, } func (c *destinationRuleController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler DestinationRuleHandlerFunc) { - resource.PutClusterScoped(DestinationRuleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_lifecycle_adapter.go b/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_lifecycle_adapter.go index 64519a9e..160a7d6e 100644 --- a/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_lifecycle_adapter.go +++ b/apis/networking.istio.io/v1alpha3/zz_generated_destination_rule_lifecycle_adapter.go @@ -3,6 +3,7 @@ package v1alpha3 import ( "github.com/knative/pkg/apis/istio/v1alpha3" "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *destinationRuleLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewDestinationRuleLifecycleAdapter(name string, clusterScoped bool, client DestinationRuleInterface, l DestinationRuleLifecycle) DestinationRuleHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(DestinationRuleGroupVersionResource) + } adapter := &destinationRuleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1alpha3.DestinationRule) (runtime.Object, error) { diff --git a/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_controller.go b/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_controller.go index de677292..13470205 100644 --- a/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_controller.go +++ b/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_controller.go @@ -171,7 +171,6 @@ func (c *virtualServiceController) AddFeatureHandler(ctx context.Context, enable } func (c *virtualServiceController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler VirtualServiceHandlerFunc) { - resource.PutClusterScoped(VirtualServiceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *virtualServiceController) AddClusterScopedHandler(ctx context.Context, } func (c *virtualServiceController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler VirtualServiceHandlerFunc) { - resource.PutClusterScoped(VirtualServiceGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_lifecycle_adapter.go b/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_lifecycle_adapter.go index bbd06a30..dea4e7d8 100644 --- a/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_lifecycle_adapter.go +++ b/apis/networking.istio.io/v1alpha3/zz_generated_virtual_service_lifecycle_adapter.go @@ -3,6 +3,7 @@ package v1alpha3 import ( "github.com/knative/pkg/apis/istio/v1alpha3" "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *virtualServiceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob } func NewVirtualServiceLifecycleAdapter(name string, clusterScoped bool, client VirtualServiceInterface, l VirtualServiceLifecycle) VirtualServiceHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(VirtualServiceGroupVersionResource) + } adapter := &virtualServiceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1alpha3.VirtualService) (runtime.Object, error) { diff --git a/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go b/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go index a433579a..0d9fa762 100644 --- a/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go +++ b/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go @@ -171,7 +171,6 @@ func (c *networkPolicyController) AddFeatureHandler(ctx context.Context, enabled } func (c *networkPolicyController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NetworkPolicyHandlerFunc) { - resource.PutClusterScoped(NetworkPolicyGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *networkPolicyController) AddClusterScopedHandler(ctx context.Context, n } func (c *networkPolicyController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NetworkPolicyHandlerFunc) { - resource.PutClusterScoped(NetworkPolicyGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go b/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go index cd5fe36a..cb68bfbc 100644 --- a/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go +++ b/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *networkPolicyLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj } func NewNetworkPolicyLifecycleAdapter(name string, clusterScoped bool, client NetworkPolicyInterface, l NetworkPolicyLifecycle) NetworkPolicyHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NetworkPolicyGroupVersionResource) + } adapter := &networkPolicyLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.NetworkPolicy) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_app_controller.go b/apis/project.cattle.io/v3/zz_generated_app_controller.go index cd7dce4f..1ff16b41 100644 --- a/apis/project.cattle.io/v3/zz_generated_app_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_app_controller.go @@ -170,7 +170,6 @@ func (c *appController) AddFeatureHandler(ctx context.Context, enabled func() bo } func (c *appController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler AppHandlerFunc) { - resource.PutClusterScoped(AppGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *appController) AddClusterScopedHandler(ctx context.Context, name, clust } func (c *appController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler AppHandlerFunc) { - resource.PutClusterScoped(AppGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_app_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_app_lifecycle_adapter.go index d8e0dacb..2a042fd5 100644 --- a/apis/project.cattle.io/v3/zz_generated_app_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_app_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *appLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error } func NewAppLifecycleAdapter(name string, clusterScoped bool, client AppInterface, l AppLifecycle) AppHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(AppGroupVersionResource) + } adapter := &appLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *App) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go b/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go index f6897688..979db665 100644 --- a/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_app_revision_controller.go @@ -170,7 +170,6 @@ func (c *appRevisionController) AddFeatureHandler(ctx context.Context, enabled f } func (c *appRevisionController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler AppRevisionHandlerFunc) { - resource.PutClusterScoped(AppRevisionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *appRevisionController) AddClusterScopedHandler(ctx context.Context, nam } func (c *appRevisionController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler AppRevisionHandlerFunc) { - resource.PutClusterScoped(AppRevisionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go index 95958211..a81aefc8 100644 --- a/apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_app_revision_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *appRevisionLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec } func NewAppRevisionLifecycleAdapter(name string, clusterScoped bool, client AppRevisionInterface, l AppRevisionLifecycle) AppRevisionHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(AppRevisionGroupVersionResource) + } adapter := &appRevisionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *AppRevision) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go index b2f62aa8..80c8ad98 100644 --- a/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_basic_auth_controller.go @@ -170,7 +170,6 @@ func (c *basicAuthController) AddFeatureHandler(ctx context.Context, enabled fun } func (c *basicAuthController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler BasicAuthHandlerFunc) { - resource.PutClusterScoped(BasicAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *basicAuthController) AddClusterScopedHandler(ctx context.Context, name, } func (c *basicAuthController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler BasicAuthHandlerFunc) { - resource.PutClusterScoped(BasicAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_basic_auth_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_basic_auth_lifecycle_adapter.go index ee2fc343..6101826b 100644 --- a/apis/project.cattle.io/v3/zz_generated_basic_auth_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_basic_auth_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *basicAuthLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewBasicAuthLifecycleAdapter(name string, clusterScoped bool, client BasicAuthInterface, l BasicAuthLifecycle) BasicAuthHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(BasicAuthGroupVersionResource) + } adapter := &basicAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *BasicAuth) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_certificate_controller.go b/apis/project.cattle.io/v3/zz_generated_certificate_controller.go index e1a695bd..64e63e12 100644 --- a/apis/project.cattle.io/v3/zz_generated_certificate_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_certificate_controller.go @@ -170,7 +170,6 @@ func (c *certificateController) AddFeatureHandler(ctx context.Context, enabled f } func (c *certificateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler CertificateHandlerFunc) { - resource.PutClusterScoped(CertificateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *certificateController) AddClusterScopedHandler(ctx context.Context, nam } func (c *certificateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler CertificateHandlerFunc) { - resource.PutClusterScoped(CertificateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_certificate_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_certificate_lifecycle_adapter.go index e2a5c3f7..b92cd168 100644 --- a/apis/project.cattle.io/v3/zz_generated_certificate_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_certificate_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *certificateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec } func NewCertificateLifecycleAdapter(name string, clusterScoped bool, client CertificateInterface, l CertificateLifecycle) CertificateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(CertificateGroupVersionResource) + } adapter := &certificateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Certificate) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go b/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go index 9287c571..adbe448d 100644 --- a/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_docker_credential_controller.go @@ -170,7 +170,6 @@ func (c *dockerCredentialController) AddFeatureHandler(ctx context.Context, enab } func (c *dockerCredentialController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler DockerCredentialHandlerFunc) { - resource.PutClusterScoped(DockerCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *dockerCredentialController) AddClusterScopedHandler(ctx context.Context } func (c *dockerCredentialController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler DockerCredentialHandlerFunc) { - resource.PutClusterScoped(DockerCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_docker_credential_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_docker_credential_lifecycle_adapter.go index f79173f3..4d06acd8 100644 --- a/apis/project.cattle.io/v3/zz_generated_docker_credential_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_docker_credential_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *dockerCredentialLifecycleAdapter) Updated(obj runtime.Object) (runtime. } func NewDockerCredentialLifecycleAdapter(name string, clusterScoped bool, client DockerCredentialInterface, l DockerCredentialLifecycle) DockerCredentialHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(DockerCredentialGroupVersionResource) + } adapter := &dockerCredentialLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *DockerCredential) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go index 49abed41..69f9464b 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_controller.go @@ -170,7 +170,6 @@ func (c *namespacedBasicAuthController) AddFeatureHandler(ctx context.Context, e } func (c *namespacedBasicAuthController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NamespacedBasicAuthHandlerFunc) { - resource.PutClusterScoped(NamespacedBasicAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *namespacedBasicAuthController) AddClusterScopedHandler(ctx context.Cont } func (c *namespacedBasicAuthController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NamespacedBasicAuthHandlerFunc) { - resource.PutClusterScoped(NamespacedBasicAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_lifecycle_adapter.go index c28b07d8..56346ecc 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_basic_auth_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *namespacedBasicAuthLifecycleAdapter) Updated(obj runtime.Object) (runti } func NewNamespacedBasicAuthLifecycleAdapter(name string, clusterScoped bool, client NamespacedBasicAuthInterface, l NamespacedBasicAuthLifecycle) NamespacedBasicAuthHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NamespacedBasicAuthGroupVersionResource) + } adapter := &namespacedBasicAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NamespacedBasicAuth) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go index a7bed807..54f70638 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_controller.go @@ -170,7 +170,6 @@ func (c *namespacedCertificateController) AddFeatureHandler(ctx context.Context, } func (c *namespacedCertificateController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NamespacedCertificateHandlerFunc) { - resource.PutClusterScoped(NamespacedCertificateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *namespacedCertificateController) AddClusterScopedHandler(ctx context.Co } func (c *namespacedCertificateController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NamespacedCertificateHandlerFunc) { - resource.PutClusterScoped(NamespacedCertificateGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_lifecycle_adapter.go index 81336594..bc23859d 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_certificate_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *namespacedCertificateLifecycleAdapter) Updated(obj runtime.Object) (run } func NewNamespacedCertificateLifecycleAdapter(name string, clusterScoped bool, client NamespacedCertificateInterface, l NamespacedCertificateLifecycle) NamespacedCertificateHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NamespacedCertificateGroupVersionResource) + } adapter := &namespacedCertificateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NamespacedCertificate) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go index ab16d274..a0c0aaba 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_controller.go @@ -170,7 +170,6 @@ func (c *namespacedDockerCredentialController) AddFeatureHandler(ctx context.Con } func (c *namespacedDockerCredentialController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NamespacedDockerCredentialHandlerFunc) { - resource.PutClusterScoped(NamespacedDockerCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *namespacedDockerCredentialController) AddClusterScopedHandler(ctx conte } func (c *namespacedDockerCredentialController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NamespacedDockerCredentialHandlerFunc) { - resource.PutClusterScoped(NamespacedDockerCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_lifecycle_adapter.go index 4be61112..2a8e7d19 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_docker_credential_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *namespacedDockerCredentialLifecycleAdapter) Updated(obj runtime.Object) } func NewNamespacedDockerCredentialLifecycleAdapter(name string, clusterScoped bool, client NamespacedDockerCredentialInterface, l NamespacedDockerCredentialLifecycle) NamespacedDockerCredentialHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NamespacedDockerCredentialGroupVersionResource) + } adapter := &namespacedDockerCredentialLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NamespacedDockerCredential) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go index d42029b2..90bcd998 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_controller.go @@ -170,7 +170,6 @@ func (c *namespacedServiceAccountTokenController) AddFeatureHandler(ctx context. } func (c *namespacedServiceAccountTokenController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NamespacedServiceAccountTokenHandlerFunc) { - resource.PutClusterScoped(NamespacedServiceAccountTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *namespacedServiceAccountTokenController) AddClusterScopedHandler(ctx co } func (c *namespacedServiceAccountTokenController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NamespacedServiceAccountTokenHandlerFunc) { - resource.PutClusterScoped(NamespacedServiceAccountTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_lifecycle_adapter.go index 81857c1d..932bbae3 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_service_account_token_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *namespacedServiceAccountTokenLifecycleAdapter) Updated(obj runtime.Obje } func NewNamespacedServiceAccountTokenLifecycleAdapter(name string, clusterScoped bool, client NamespacedServiceAccountTokenInterface, l NamespacedServiceAccountTokenLifecycle) NamespacedServiceAccountTokenHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NamespacedServiceAccountTokenGroupVersionResource) + } adapter := &namespacedServiceAccountTokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NamespacedServiceAccountToken) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go index ad4110db..5ada6e13 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_controller.go @@ -170,7 +170,6 @@ func (c *namespacedSshAuthController) AddFeatureHandler(ctx context.Context, ena } func (c *namespacedSshAuthController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler NamespacedSSHAuthHandlerFunc) { - resource.PutClusterScoped(NamespacedSSHAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *namespacedSshAuthController) AddClusterScopedHandler(ctx context.Contex } func (c *namespacedSshAuthController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler NamespacedSSHAuthHandlerFunc) { - resource.PutClusterScoped(NamespacedSSHAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_lifecycle_adapter.go index d2214b80..243a8ff4 100644 --- a/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_namespaced_ssh_auth_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *namespacedSshAuthLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewNamespacedSSHAuthLifecycleAdapter(name string, clusterScoped bool, client NamespacedSSHAuthInterface, l NamespacedSSHAuthLifecycle) NamespacedSSHAuthHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(NamespacedSSHAuthGroupVersionResource) + } adapter := &namespacedSshAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *NamespacedSSHAuth) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go b/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go index f6113384..b54fe287 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go @@ -170,7 +170,6 @@ func (c *pipelineController) AddFeatureHandler(ctx context.Context, enabled func } func (c *pipelineController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PipelineHandlerFunc) { - resource.PutClusterScoped(PipelineGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *pipelineController) AddClusterScopedHandler(ctx context.Context, name, } func (c *pipelineController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PipelineHandlerFunc) { - resource.PutClusterScoped(PipelineGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go b/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go index 6b28cabe..8fc2dde8 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_execution_controller.go @@ -170,7 +170,6 @@ func (c *pipelineExecutionController) AddFeatureHandler(ctx context.Context, ena } func (c *pipelineExecutionController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PipelineExecutionHandlerFunc) { - resource.PutClusterScoped(PipelineExecutionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *pipelineExecutionController) AddClusterScopedHandler(ctx context.Contex } func (c *pipelineExecutionController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PipelineExecutionHandlerFunc) { - resource.PutClusterScoped(PipelineExecutionGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_pipeline_execution_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_pipeline_execution_lifecycle_adapter.go index 17826f2c..57fb53d0 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_execution_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_execution_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *pipelineExecutionLifecycleAdapter) Updated(obj runtime.Object) (runtime } func NewPipelineExecutionLifecycleAdapter(name string, clusterScoped bool, client PipelineExecutionInterface, l PipelineExecutionLifecycle) PipelineExecutionHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PipelineExecutionGroupVersionResource) + } adapter := &pipelineExecutionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *PipelineExecution) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_pipeline_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_pipeline_lifecycle_adapter.go index fdafbe51..c42b78c5 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *pipelineLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewPipelineLifecycleAdapter(name string, clusterScoped bool, client PipelineInterface, l PipelineLifecycle) PipelineHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PipelineGroupVersionResource) + } adapter := &pipelineLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Pipeline) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go b/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go index 7e1bceab..bf6eb675 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_setting_controller.go @@ -170,7 +170,6 @@ func (c *pipelineSettingController) AddFeatureHandler(ctx context.Context, enabl } func (c *pipelineSettingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler PipelineSettingHandlerFunc) { - resource.PutClusterScoped(PipelineSettingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *pipelineSettingController) AddClusterScopedHandler(ctx context.Context, } func (c *pipelineSettingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler PipelineSettingHandlerFunc) { - resource.PutClusterScoped(PipelineSettingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_pipeline_setting_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_pipeline_setting_lifecycle_adapter.go index f5645d24..bcc97692 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_setting_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_setting_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *pipelineSettingLifecycleAdapter) Updated(obj runtime.Object) (runtime.O } func NewPipelineSettingLifecycleAdapter(name string, clusterScoped bool, client PipelineSettingInterface, l PipelineSettingLifecycle) PipelineSettingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(PipelineSettingGroupVersionResource) + } adapter := &pipelineSettingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *PipelineSetting) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go b/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go index 2fae3f42..f6e7406a 100644 --- a/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_service_account_token_controller.go @@ -170,7 +170,6 @@ func (c *serviceAccountTokenController) AddFeatureHandler(ctx context.Context, e } func (c *serviceAccountTokenController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ServiceAccountTokenHandlerFunc) { - resource.PutClusterScoped(ServiceAccountTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *serviceAccountTokenController) AddClusterScopedHandler(ctx context.Cont } func (c *serviceAccountTokenController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ServiceAccountTokenHandlerFunc) { - resource.PutClusterScoped(ServiceAccountTokenGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_service_account_token_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_service_account_token_lifecycle_adapter.go index 1a938426..b01dcbf5 100644 --- a/apis/project.cattle.io/v3/zz_generated_service_account_token_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_service_account_token_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *serviceAccountTokenLifecycleAdapter) Updated(obj runtime.Object) (runti } func NewServiceAccountTokenLifecycleAdapter(name string, clusterScoped bool, client ServiceAccountTokenInterface, l ServiceAccountTokenLifecycle) ServiceAccountTokenHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ServiceAccountTokenGroupVersionResource) + } adapter := &serviceAccountTokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *ServiceAccountToken) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go b/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go index ebdd9628..b7305867 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_credential_controller.go @@ -170,7 +170,6 @@ func (c *sourceCodeCredentialController) AddFeatureHandler(ctx context.Context, } func (c *sourceCodeCredentialController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler SourceCodeCredentialHandlerFunc) { - resource.PutClusterScoped(SourceCodeCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *sourceCodeCredentialController) AddClusterScopedHandler(ctx context.Con } func (c *sourceCodeCredentialController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler SourceCodeCredentialHandlerFunc) { - resource.PutClusterScoped(SourceCodeCredentialGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_credential_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_source_code_credential_lifecycle_adapter.go index 383636a7..873e6fff 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_credential_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_credential_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *sourceCodeCredentialLifecycleAdapter) Updated(obj runtime.Object) (runt } func NewSourceCodeCredentialLifecycleAdapter(name string, clusterScoped bool, client SourceCodeCredentialInterface, l SourceCodeCredentialLifecycle) SourceCodeCredentialHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(SourceCodeCredentialGroupVersionResource) + } adapter := &sourceCodeCredentialLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *SourceCodeCredential) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go b/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go index 9bf19562..7826d983 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_controller.go @@ -170,7 +170,6 @@ func (c *sourceCodeProviderConfigController) AddFeatureHandler(ctx context.Conte } func (c *sourceCodeProviderConfigController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler SourceCodeProviderConfigHandlerFunc) { - resource.PutClusterScoped(SourceCodeProviderConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *sourceCodeProviderConfigController) AddClusterScopedHandler(ctx context } func (c *sourceCodeProviderConfigController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler SourceCodeProviderConfigHandlerFunc) { - resource.PutClusterScoped(SourceCodeProviderConfigGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_lifecycle_adapter.go index 8fa6f860..325a4d4f 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_provider_config_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *sourceCodeProviderConfigLifecycleAdapter) Updated(obj runtime.Object) ( } func NewSourceCodeProviderConfigLifecycleAdapter(name string, clusterScoped bool, client SourceCodeProviderConfigInterface, l SourceCodeProviderConfigLifecycle) SourceCodeProviderConfigHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(SourceCodeProviderConfigGroupVersionResource) + } adapter := &sourceCodeProviderConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *SourceCodeProviderConfig) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go b/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go index 03e6907f..7fc9b38e 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_provider_controller.go @@ -169,7 +169,6 @@ func (c *sourceCodeProviderController) AddFeatureHandler(ctx context.Context, en } func (c *sourceCodeProviderController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler SourceCodeProviderHandlerFunc) { - resource.PutClusterScoped(SourceCodeProviderGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -182,7 +181,6 @@ func (c *sourceCodeProviderController) AddClusterScopedHandler(ctx context.Conte } func (c *sourceCodeProviderController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler SourceCodeProviderHandlerFunc) { - resource.PutClusterScoped(SourceCodeProviderGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_provider_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_source_code_provider_lifecycle_adapter.go index 70c2ef5d..37e6deaa 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_provider_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_provider_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *sourceCodeProviderLifecycleAdapter) Updated(obj runtime.Object) (runtim } func NewSourceCodeProviderLifecycleAdapter(name string, clusterScoped bool, client SourceCodeProviderInterface, l SourceCodeProviderLifecycle) SourceCodeProviderHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(SourceCodeProviderGroupVersionResource) + } adapter := &sourceCodeProviderLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *SourceCodeProvider) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go b/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go index 1663b571..93c552e8 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_repository_controller.go @@ -170,7 +170,6 @@ func (c *sourceCodeRepositoryController) AddFeatureHandler(ctx context.Context, } func (c *sourceCodeRepositoryController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler SourceCodeRepositoryHandlerFunc) { - resource.PutClusterScoped(SourceCodeRepositoryGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *sourceCodeRepositoryController) AddClusterScopedHandler(ctx context.Con } func (c *sourceCodeRepositoryController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler SourceCodeRepositoryHandlerFunc) { - resource.PutClusterScoped(SourceCodeRepositoryGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_source_code_repository_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_source_code_repository_lifecycle_adapter.go index e8dbc442..1099dcb3 100644 --- a/apis/project.cattle.io/v3/zz_generated_source_code_repository_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_source_code_repository_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *sourceCodeRepositoryLifecycleAdapter) Updated(obj runtime.Object) (runt } func NewSourceCodeRepositoryLifecycleAdapter(name string, clusterScoped bool, client SourceCodeRepositoryInterface, l SourceCodeRepositoryLifecycle) SourceCodeRepositoryHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(SourceCodeRepositoryGroupVersionResource) + } adapter := &sourceCodeRepositoryLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *SourceCodeRepository) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go b/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go index fa3abecb..bc4e3d72 100644 --- a/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_ssh_auth_controller.go @@ -170,7 +170,6 @@ func (c *sshAuthController) AddFeatureHandler(ctx context.Context, enabled func( } func (c *sshAuthController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler SSHAuthHandlerFunc) { - resource.PutClusterScoped(SSHAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *sshAuthController) AddClusterScopedHandler(ctx context.Context, name, c } func (c *sshAuthController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler SSHAuthHandlerFunc) { - resource.PutClusterScoped(SSHAuthGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_ssh_auth_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_ssh_auth_lifecycle_adapter.go index e26d80a9..2386f24a 100644 --- a/apis/project.cattle.io/v3/zz_generated_ssh_auth_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_ssh_auth_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *sshAuthLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e } func NewSSHAuthLifecycleAdapter(name string, clusterScoped bool, client SSHAuthInterface, l SSHAuthLifecycle) SSHAuthHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(SSHAuthGroupVersionResource) + } adapter := &sshAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *SSHAuth) (runtime.Object, error) { diff --git a/apis/project.cattle.io/v3/zz_generated_workload_controller.go b/apis/project.cattle.io/v3/zz_generated_workload_controller.go index 74c0e347..656b109c 100644 --- a/apis/project.cattle.io/v3/zz_generated_workload_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_workload_controller.go @@ -170,7 +170,6 @@ func (c *workloadController) AddFeatureHandler(ctx context.Context, enabled func } func (c *workloadController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler WorkloadHandlerFunc) { - resource.PutClusterScoped(WorkloadGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *workloadController) AddClusterScopedHandler(ctx context.Context, name, } func (c *workloadController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler WorkloadHandlerFunc) { - resource.PutClusterScoped(WorkloadGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/project.cattle.io/v3/zz_generated_workload_lifecycle_adapter.go b/apis/project.cattle.io/v3/zz_generated_workload_lifecycle_adapter.go index 050722bb..dd8fcea3 100644 --- a/apis/project.cattle.io/v3/zz_generated_workload_lifecycle_adapter.go +++ b/apis/project.cattle.io/v3/zz_generated_workload_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v3 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" "k8s.io/apimachinery/pkg/runtime" ) @@ -50,6 +51,9 @@ func (w *workloadLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, } func NewWorkloadLifecycleAdapter(name string, clusterScoped bool, client WorkloadInterface, l WorkloadLifecycle) WorkloadHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(WorkloadGroupVersionResource) + } adapter := &workloadLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *Workload) (runtime.Object, error) { diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go index a0f346b9..6e3c39fb 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go @@ -170,7 +170,6 @@ func (c *clusterRoleBindingController) AddFeatureHandler(ctx context.Context, en } func (c *clusterRoleBindingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterRoleBindingHandlerFunc) { - resource.PutClusterScoped(ClusterRoleBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterRoleBindingController) AddClusterScopedHandler(ctx context.Conte } func (c *clusterRoleBindingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterRoleBindingHandlerFunc) { - resource.PutClusterScoped(ClusterRoleBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go index 07d2b437..340c277e 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *clusterRoleBindingLifecycleAdapter) Updated(obj runtime.Object) (runtim } func NewClusterRoleBindingLifecycleAdapter(name string, clusterScoped bool, client ClusterRoleBindingInterface, l ClusterRoleBindingLifecycle) ClusterRoleBindingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterRoleBindingGroupVersionResource) + } adapter := &clusterRoleBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ClusterRoleBinding) (runtime.Object, error) { diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go index 09a3eda9..2998aeae 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go @@ -170,7 +170,6 @@ func (c *clusterRoleController) AddFeatureHandler(ctx context.Context, enabled f } func (c *clusterRoleController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler ClusterRoleHandlerFunc) { - resource.PutClusterScoped(ClusterRoleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *clusterRoleController) AddClusterScopedHandler(ctx context.Context, nam } func (c *clusterRoleController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler ClusterRoleHandlerFunc) { - resource.PutClusterScoped(ClusterRoleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go index 1d7548b0..a712abb0 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *clusterRoleLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec } func NewClusterRoleLifecycleAdapter(name string, clusterScoped bool, client ClusterRoleInterface, l ClusterRoleLifecycle) ClusterRoleHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(ClusterRoleGroupVersionResource) + } adapter := &clusterRoleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.ClusterRole) (runtime.Object, error) { diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go index 47e6137c..fab4636b 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go @@ -171,7 +171,6 @@ func (c *roleBindingController) AddFeatureHandler(ctx context.Context, enabled f } func (c *roleBindingController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler RoleBindingHandlerFunc) { - resource.PutClusterScoped(RoleBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *roleBindingController) AddClusterScopedHandler(ctx context.Context, nam } func (c *roleBindingController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler RoleBindingHandlerFunc) { - resource.PutClusterScoped(RoleBindingGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go index fe2e57dc..277b0477 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *roleBindingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec } func NewRoleBindingLifecycleAdapter(name string, clusterScoped bool, client RoleBindingInterface, l RoleBindingLifecycle) RoleBindingHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(RoleBindingGroupVersionResource) + } adapter := &roleBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.RoleBinding) (runtime.Object, error) { diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go index eda34d4a..4a2a62d7 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go @@ -171,7 +171,6 @@ func (c *roleController) AddFeatureHandler(ctx context.Context, enabled func() b } func (c *roleController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler RoleHandlerFunc) { - resource.PutClusterScoped(RoleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -184,7 +183,6 @@ func (c *roleController) AddClusterScopedHandler(ctx context.Context, name, clus } func (c *roleController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler RoleHandlerFunc) { - resource.PutClusterScoped(RoleGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go index e09ac89e..2290885e 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *roleLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro } func NewRoleLifecycleAdapter(name string, clusterScoped bool, client RoleInterface, l RoleLifecycle) RoleHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(RoleGroupVersionResource) + } adapter := &roleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.Role) (runtime.Object, error) { diff --git a/apis/storage.k8s.io/v1/zz_generated_storage_class_controller.go b/apis/storage.k8s.io/v1/zz_generated_storage_class_controller.go index 69032624..24000db8 100644 --- a/apis/storage.k8s.io/v1/zz_generated_storage_class_controller.go +++ b/apis/storage.k8s.io/v1/zz_generated_storage_class_controller.go @@ -170,7 +170,6 @@ func (c *storageClassController) AddFeatureHandler(ctx context.Context, enabled } func (c *storageClassController) AddClusterScopedHandler(ctx context.Context, name, cluster string, handler StorageClassHandlerFunc) { - resource.PutClusterScoped(StorageClassGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if obj == nil { return handler(key, nil) @@ -183,7 +182,6 @@ func (c *storageClassController) AddClusterScopedHandler(ctx context.Context, na } func (c *storageClassController) AddClusterScopedFeatureHandler(ctx context.Context, enabled func() bool, name, cluster string, handler StorageClassHandlerFunc) { - resource.PutClusterScoped(StorageClassGroupVersionResource) c.GenericController.AddHandler(ctx, name, func(key string, obj interface{}) (interface{}, error) { if !enabled() { return nil, nil diff --git a/apis/storage.k8s.io/v1/zz_generated_storage_class_lifecycle_adapter.go b/apis/storage.k8s.io/v1/zz_generated_storage_class_lifecycle_adapter.go index 976b17c4..dbe25b78 100644 --- a/apis/storage.k8s.io/v1/zz_generated_storage_class_lifecycle_adapter.go +++ b/apis/storage.k8s.io/v1/zz_generated_storage_class_lifecycle_adapter.go @@ -2,6 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" + "github.com/rancher/norman/resource" v1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -51,6 +52,9 @@ func (w *storageClassLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje } func NewStorageClassLifecycleAdapter(name string, clusterScoped bool, client StorageClassInterface, l StorageClassLifecycle) StorageClassHandlerFunc { + if clusterScoped { + resource.PutClusterScoped(StorageClassGroupVersionResource) + } adapter := &storageClassLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) return func(key string, obj *v1.StorageClass) (runtime.Object, error) {