diff --git a/apis/apps/v1beta2/zz_generated_daemon_set_controller.go b/apis/apps/v1beta2/zz_generated_daemon_set_controller.go index 2e81b006..94222ff8 100644 --- a/apis/apps/v1beta2/zz_generated_daemon_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_daemon_set_controller.go @@ -36,7 +36,7 @@ type DaemonSetList struct { Items []v1beta2.DaemonSet } -type DaemonSetHandlerFunc func(key string, obj *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) +type DaemonSetHandlerFunc func(key string, obj *v1beta2.DaemonSet) (runtime.Object, error) type DaemonSetLister interface { List(namespace string, selector labels.Selector) (ret []*v1beta2.DaemonSet, err error) 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 0fcf8d46..a2997672 100644 --- a/apis/apps/v1beta2/zz_generated_daemon_set_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_daemon_set_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type DaemonSetLifecycle interface { - Create(obj *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) - Remove(obj *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) - Updated(obj *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) + Create(obj *v1beta2.DaemonSet) (runtime.Object, error) + Remove(obj *v1beta2.DaemonSet) (runtime.Object, error) + Updated(obj *v1beta2.DaemonSet) (runtime.Object, error) } type daemonSetLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *daemonSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewDaemonSetLifecycleAdapter(name string, clusterScoped bool, client DaemonSetInterface, l DaemonSetLifecycle) DaemonSetHandlerFunc { adapter := &daemonSetLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1beta2.DaemonSet) (*v1beta2.DaemonSet, error) { + return func(key string, obj *v1beta2.DaemonSet) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1beta2.DaemonSet); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/apps/v1beta2/zz_generated_deployment_controller.go b/apis/apps/v1beta2/zz_generated_deployment_controller.go index b5b715eb..4da2fdda 100644 --- a/apis/apps/v1beta2/zz_generated_deployment_controller.go +++ b/apis/apps/v1beta2/zz_generated_deployment_controller.go @@ -36,7 +36,7 @@ type DeploymentList struct { Items []v1beta2.Deployment } -type DeploymentHandlerFunc func(key string, obj *v1beta2.Deployment) (*v1beta2.Deployment, error) +type DeploymentHandlerFunc func(key string, obj *v1beta2.Deployment) (runtime.Object, error) type DeploymentLister interface { List(namespace string, selector labels.Selector) (ret []*v1beta2.Deployment, err error) diff --git a/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go b/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go index ebc036fa..986a1e81 100644 --- a/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_deployment_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type DeploymentLifecycle interface { - Create(obj *v1beta2.Deployment) (*v1beta2.Deployment, error) - Remove(obj *v1beta2.Deployment) (*v1beta2.Deployment, error) - Updated(obj *v1beta2.Deployment) (*v1beta2.Deployment, error) + Create(obj *v1beta2.Deployment) (runtime.Object, error) + Remove(obj *v1beta2.Deployment) (runtime.Object, error) + Updated(obj *v1beta2.Deployment) (runtime.Object, error) } type deploymentLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *deploymentLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object func NewDeploymentLifecycleAdapter(name string, clusterScoped bool, client DeploymentInterface, l DeploymentLifecycle) DeploymentHandlerFunc { adapter := &deploymentLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1beta2.Deployment) (*v1beta2.Deployment, error) { + return func(key string, obj *v1beta2.Deployment) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1beta2.Deployment); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/apps/v1beta2/zz_generated_replica_set_controller.go b/apis/apps/v1beta2/zz_generated_replica_set_controller.go index c28dd7e4..a12ed8e7 100644 --- a/apis/apps/v1beta2/zz_generated_replica_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_replica_set_controller.go @@ -36,7 +36,7 @@ type ReplicaSetList struct { Items []v1beta2.ReplicaSet } -type ReplicaSetHandlerFunc func(key string, obj *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) +type ReplicaSetHandlerFunc func(key string, obj *v1beta2.ReplicaSet) (runtime.Object, error) type ReplicaSetLister interface { List(namespace string, selector labels.Selector) (ret []*v1beta2.ReplicaSet, err error) 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 b7abe9b1..e12fd4db 100644 --- a/apis/apps/v1beta2/zz_generated_replica_set_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_replica_set_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type ReplicaSetLifecycle interface { - Create(obj *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) - Remove(obj *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) - Updated(obj *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) + Create(obj *v1beta2.ReplicaSet) (runtime.Object, error) + Remove(obj *v1beta2.ReplicaSet) (runtime.Object, error) + Updated(obj *v1beta2.ReplicaSet) (runtime.Object, error) } type replicaSetLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *replicaSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object func NewReplicaSetLifecycleAdapter(name string, clusterScoped bool, client ReplicaSetInterface, l ReplicaSetLifecycle) ReplicaSetHandlerFunc { adapter := &replicaSetLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1beta2.ReplicaSet) (*v1beta2.ReplicaSet, error) { + return func(key string, obj *v1beta2.ReplicaSet) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1beta2.ReplicaSet); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/apps/v1beta2/zz_generated_stateful_set_controller.go b/apis/apps/v1beta2/zz_generated_stateful_set_controller.go index 0ea6a596..42c84a20 100644 --- a/apis/apps/v1beta2/zz_generated_stateful_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_stateful_set_controller.go @@ -36,7 +36,7 @@ type StatefulSetList struct { Items []v1beta2.StatefulSet } -type StatefulSetHandlerFunc func(key string, obj *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) +type StatefulSetHandlerFunc func(key string, obj *v1beta2.StatefulSet) (runtime.Object, error) type StatefulSetLister interface { List(namespace string, selector labels.Selector) (ret []*v1beta2.StatefulSet, err error) 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 12e84c2f..170b3cb1 100644 --- a/apis/apps/v1beta2/zz_generated_stateful_set_lifecycle_adapter.go +++ b/apis/apps/v1beta2/zz_generated_stateful_set_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type StatefulSetLifecycle interface { - Create(obj *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) - Remove(obj *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) - Updated(obj *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) + Create(obj *v1beta2.StatefulSet) (runtime.Object, error) + Remove(obj *v1beta2.StatefulSet) (runtime.Object, error) + Updated(obj *v1beta2.StatefulSet) (runtime.Object, error) } type statefulSetLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *statefulSetLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec func NewStatefulSetLifecycleAdapter(name string, clusterScoped bool, client StatefulSetInterface, l StatefulSetLifecycle) StatefulSetHandlerFunc { adapter := &statefulSetLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1beta2.StatefulSet) (*v1beta2.StatefulSet, error) { + return func(key string, obj *v1beta2.StatefulSet) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1beta2.StatefulSet); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/batch/v1/zz_generated_job_controller.go b/apis/batch/v1/zz_generated_job_controller.go index 6a296a1c..32ee8108 100644 --- a/apis/batch/v1/zz_generated_job_controller.go +++ b/apis/batch/v1/zz_generated_job_controller.go @@ -36,7 +36,7 @@ type JobList struct { Items []v1.Job } -type JobHandlerFunc func(key string, obj *v1.Job) (*v1.Job, error) +type JobHandlerFunc func(key string, obj *v1.Job) (runtime.Object, error) type JobLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Job, err error) diff --git a/apis/batch/v1/zz_generated_job_lifecycle_adapter.go b/apis/batch/v1/zz_generated_job_lifecycle_adapter.go index 126e1afd..95e96c93 100644 --- a/apis/batch/v1/zz_generated_job_lifecycle_adapter.go +++ b/apis/batch/v1/zz_generated_job_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type JobLifecycle interface { - Create(obj *v1.Job) (*v1.Job, error) - Remove(obj *v1.Job) (*v1.Job, error) - Updated(obj *v1.Job) (*v1.Job, error) + Create(obj *v1.Job) (runtime.Object, error) + Remove(obj *v1.Job) (runtime.Object, error) + Updated(obj *v1.Job) (runtime.Object, error) } type jobLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *jobLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error func NewJobLifecycleAdapter(name string, clusterScoped bool, client JobInterface, l JobLifecycle) JobHandlerFunc { adapter := &jobLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Job) (*v1.Job, error) { + return func(key string, obj *v1.Job) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Job); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/batch/v1beta1/zz_generated_cron_job_controller.go b/apis/batch/v1beta1/zz_generated_cron_job_controller.go index afd7d4d1..58d338ab 100644 --- a/apis/batch/v1beta1/zz_generated_cron_job_controller.go +++ b/apis/batch/v1beta1/zz_generated_cron_job_controller.go @@ -36,7 +36,7 @@ type CronJobList struct { Items []v1beta1.CronJob } -type CronJobHandlerFunc func(key string, obj *v1beta1.CronJob) (*v1beta1.CronJob, error) +type CronJobHandlerFunc func(key string, obj *v1beta1.CronJob) (runtime.Object, error) type CronJobLister interface { List(namespace string, selector labels.Selector) (ret []*v1beta1.CronJob, err error) 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 851a43eb..f91e7ee2 100644 --- a/apis/batch/v1beta1/zz_generated_cron_job_lifecycle_adapter.go +++ b/apis/batch/v1beta1/zz_generated_cron_job_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type CronJobLifecycle interface { - Create(obj *v1beta1.CronJob) (*v1beta1.CronJob, error) - Remove(obj *v1beta1.CronJob) (*v1beta1.CronJob, error) - Updated(obj *v1beta1.CronJob) (*v1beta1.CronJob, error) + Create(obj *v1beta1.CronJob) (runtime.Object, error) + Remove(obj *v1beta1.CronJob) (runtime.Object, error) + Updated(obj *v1beta1.CronJob) (runtime.Object, error) } type cronJobLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *cronJobLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewCronJobLifecycleAdapter(name string, clusterScoped bool, client CronJobInterface, l CronJobLifecycle) CronJobHandlerFunc { adapter := &cronJobLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1beta1.CronJob) (*v1beta1.CronJob, error) { + return func(key string, obj *v1beta1.CronJob) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1beta1.CronJob); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_component_status_controller.go b/apis/core/v1/zz_generated_component_status_controller.go index 51668ba7..0e4c6073 100644 --- a/apis/core/v1/zz_generated_component_status_controller.go +++ b/apis/core/v1/zz_generated_component_status_controller.go @@ -35,7 +35,7 @@ type ComponentStatusList struct { Items []v1.ComponentStatus } -type ComponentStatusHandlerFunc func(key string, obj *v1.ComponentStatus) (*v1.ComponentStatus, error) +type ComponentStatusHandlerFunc func(key string, obj *v1.ComponentStatus) (runtime.Object, error) type ComponentStatusLister interface { List(namespace string, selector labels.Selector) (ret []*v1.ComponentStatus, err error) 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 a62ff25a..27aa6613 100644 --- a/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type ComponentStatusLifecycle interface { - Create(obj *v1.ComponentStatus) (*v1.ComponentStatus, error) - Remove(obj *v1.ComponentStatus) (*v1.ComponentStatus, error) - Updated(obj *v1.ComponentStatus) (*v1.ComponentStatus, error) + Create(obj *v1.ComponentStatus) (runtime.Object, error) + Remove(obj *v1.ComponentStatus) (runtime.Object, error) + Updated(obj *v1.ComponentStatus) (runtime.Object, error) } type componentStatusLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *componentStatusLifecycleAdapter) Updated(obj runtime.Object) (runtime.O func NewComponentStatusLifecycleAdapter(name string, clusterScoped bool, client ComponentStatusInterface, l ComponentStatusLifecycle) ComponentStatusHandlerFunc { adapter := &componentStatusLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.ComponentStatus) (*v1.ComponentStatus, error) { + return func(key string, obj *v1.ComponentStatus) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.ComponentStatus); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_config_map_controller.go b/apis/core/v1/zz_generated_config_map_controller.go index 0e790bb1..8fc58e97 100644 --- a/apis/core/v1/zz_generated_config_map_controller.go +++ b/apis/core/v1/zz_generated_config_map_controller.go @@ -36,7 +36,7 @@ type ConfigMapList struct { Items []v1.ConfigMap } -type ConfigMapHandlerFunc func(key string, obj *v1.ConfigMap) (*v1.ConfigMap, error) +type ConfigMapHandlerFunc func(key string, obj *v1.ConfigMap) (runtime.Object, error) type ConfigMapLister interface { List(namespace string, selector labels.Selector) (ret []*v1.ConfigMap, err error) 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 f1128af3..4a4a8d57 100644 --- a/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type ConfigMapLifecycle interface { - Create(obj *v1.ConfigMap) (*v1.ConfigMap, error) - Remove(obj *v1.ConfigMap) (*v1.ConfigMap, error) - Updated(obj *v1.ConfigMap) (*v1.ConfigMap, error) + Create(obj *v1.ConfigMap) (runtime.Object, error) + Remove(obj *v1.ConfigMap) (runtime.Object, error) + Updated(obj *v1.ConfigMap) (runtime.Object, error) } type configMapLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *configMapLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewConfigMapLifecycleAdapter(name string, clusterScoped bool, client ConfigMapInterface, l ConfigMapLifecycle) ConfigMapHandlerFunc { adapter := &configMapLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.ConfigMap) (*v1.ConfigMap, error) { + return func(key string, obj *v1.ConfigMap) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.ConfigMap); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_endpoints_controller.go b/apis/core/v1/zz_generated_endpoints_controller.go index 0040fd6e..ebbb81f1 100644 --- a/apis/core/v1/zz_generated_endpoints_controller.go +++ b/apis/core/v1/zz_generated_endpoints_controller.go @@ -36,7 +36,7 @@ type EndpointsList struct { Items []v1.Endpoints } -type EndpointsHandlerFunc func(key string, obj *v1.Endpoints) (*v1.Endpoints, error) +type EndpointsHandlerFunc func(key string, obj *v1.Endpoints) (runtime.Object, error) type EndpointsLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Endpoints, err error) diff --git a/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go b/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go index 36a5ccfb..6b9aac8a 100644 --- a/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type EndpointsLifecycle interface { - Create(obj *v1.Endpoints) (*v1.Endpoints, error) - Remove(obj *v1.Endpoints) (*v1.Endpoints, error) - Updated(obj *v1.Endpoints) (*v1.Endpoints, error) + Create(obj *v1.Endpoints) (runtime.Object, error) + Remove(obj *v1.Endpoints) (runtime.Object, error) + Updated(obj *v1.Endpoints) (runtime.Object, error) } type endpointsLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *endpointsLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewEndpointsLifecycleAdapter(name string, clusterScoped bool, client EndpointsInterface, l EndpointsLifecycle) EndpointsHandlerFunc { adapter := &endpointsLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Endpoints) (*v1.Endpoints, error) { + return func(key string, obj *v1.Endpoints) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Endpoints); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_event_controller.go b/apis/core/v1/zz_generated_event_controller.go index 8d582f97..218ff4a9 100644 --- a/apis/core/v1/zz_generated_event_controller.go +++ b/apis/core/v1/zz_generated_event_controller.go @@ -35,7 +35,7 @@ type EventList struct { Items []v1.Event } -type EventHandlerFunc func(key string, obj *v1.Event) (*v1.Event, error) +type EventHandlerFunc func(key string, obj *v1.Event) (runtime.Object, error) type EventLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Event, err error) diff --git a/apis/core/v1/zz_generated_event_lifecycle_adapter.go b/apis/core/v1/zz_generated_event_lifecycle_adapter.go index b731eaf6..1e7afa42 100644 --- a/apis/core/v1/zz_generated_event_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_event_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type EventLifecycle interface { - Create(obj *v1.Event) (*v1.Event, error) - Remove(obj *v1.Event) (*v1.Event, error) - Updated(obj *v1.Event) (*v1.Event, error) + Create(obj *v1.Event) (runtime.Object, error) + Remove(obj *v1.Event) (runtime.Object, error) + Updated(obj *v1.Event) (runtime.Object, error) } type eventLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *eventLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, err func NewEventLifecycleAdapter(name string, clusterScoped bool, client EventInterface, l EventLifecycle) EventHandlerFunc { adapter := &eventLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Event) (*v1.Event, error) { + return func(key string, obj *v1.Event) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Event); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_namespace_controller.go b/apis/core/v1/zz_generated_namespace_controller.go index 6b950cc3..4aaf4eda 100644 --- a/apis/core/v1/zz_generated_namespace_controller.go +++ b/apis/core/v1/zz_generated_namespace_controller.go @@ -35,7 +35,7 @@ type NamespaceList struct { Items []v1.Namespace } -type NamespaceHandlerFunc func(key string, obj *v1.Namespace) (*v1.Namespace, error) +type NamespaceHandlerFunc func(key string, obj *v1.Namespace) (runtime.Object, error) type NamespaceLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Namespace, err error) diff --git a/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go b/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go index 5cba2d55..bafcee14 100644 --- a/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type NamespaceLifecycle interface { - Create(obj *v1.Namespace) (*v1.Namespace, error) - Remove(obj *v1.Namespace) (*v1.Namespace, error) - Updated(obj *v1.Namespace) (*v1.Namespace, error) + Create(obj *v1.Namespace) (runtime.Object, error) + Remove(obj *v1.Namespace) (runtime.Object, error) + Updated(obj *v1.Namespace) (runtime.Object, error) } type namespaceLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *namespaceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewNamespaceLifecycleAdapter(name string, clusterScoped bool, client NamespaceInterface, l NamespaceLifecycle) NamespaceHandlerFunc { adapter := &namespaceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Namespace) (*v1.Namespace, error) { + return func(key string, obj *v1.Namespace) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Namespace); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_node_controller.go b/apis/core/v1/zz_generated_node_controller.go index 344f8afd..ae889471 100644 --- a/apis/core/v1/zz_generated_node_controller.go +++ b/apis/core/v1/zz_generated_node_controller.go @@ -35,7 +35,7 @@ type NodeList struct { Items []v1.Node } -type NodeHandlerFunc func(key string, obj *v1.Node) (*v1.Node, error) +type NodeHandlerFunc func(key string, obj *v1.Node) (runtime.Object, error) type NodeLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Node, err error) diff --git a/apis/core/v1/zz_generated_node_lifecycle_adapter.go b/apis/core/v1/zz_generated_node_lifecycle_adapter.go index 3721786b..64344171 100644 --- a/apis/core/v1/zz_generated_node_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_node_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type NodeLifecycle interface { - Create(obj *v1.Node) (*v1.Node, error) - Remove(obj *v1.Node) (*v1.Node, error) - Updated(obj *v1.Node) (*v1.Node, error) + Create(obj *v1.Node) (runtime.Object, error) + Remove(obj *v1.Node) (runtime.Object, error) + Updated(obj *v1.Node) (runtime.Object, error) } type nodeLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *nodeLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro func NewNodeLifecycleAdapter(name string, clusterScoped bool, client NodeInterface, l NodeLifecycle) NodeHandlerFunc { adapter := &nodeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Node) (*v1.Node, error) { + return func(key string, obj *v1.Node) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Node); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 701db7b3..fafcb764 100644 --- a/apis/core/v1/zz_generated_persistent_volume_claim_controller.go +++ b/apis/core/v1/zz_generated_persistent_volume_claim_controller.go @@ -36,7 +36,7 @@ type PersistentVolumeClaimList struct { Items []v1.PersistentVolumeClaim } -type PersistentVolumeClaimHandlerFunc func(key string, obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) +type PersistentVolumeClaimHandlerFunc func(key string, obj *v1.PersistentVolumeClaim) (runtime.Object, error) type PersistentVolumeClaimLister interface { List(namespace string, selector labels.Selector) (ret []*v1.PersistentVolumeClaim, err error) 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 87a36a8e..ef705cef 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 @@ -7,9 +7,9 @@ import ( ) type PersistentVolumeClaimLifecycle interface { - Create(obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) - Remove(obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) - Updated(obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) + Create(obj *v1.PersistentVolumeClaim) (runtime.Object, error) + Remove(obj *v1.PersistentVolumeClaim) (runtime.Object, error) + Updated(obj *v1.PersistentVolumeClaim) (runtime.Object, error) } type persistentVolumeClaimLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *persistentVolumeClaimLifecycleAdapter) Updated(obj runtime.Object) (run func NewPersistentVolumeClaimLifecycleAdapter(name string, clusterScoped bool, client PersistentVolumeClaimInterface, l PersistentVolumeClaimLifecycle) PersistentVolumeClaimHandlerFunc { adapter := &persistentVolumeClaimLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) { + return func(key string, obj *v1.PersistentVolumeClaim) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.PersistentVolumeClaim); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_pod_controller.go b/apis/core/v1/zz_generated_pod_controller.go index 90864d59..cc168028 100644 --- a/apis/core/v1/zz_generated_pod_controller.go +++ b/apis/core/v1/zz_generated_pod_controller.go @@ -36,7 +36,7 @@ type PodList struct { Items []v1.Pod } -type PodHandlerFunc func(key string, obj *v1.Pod) (*v1.Pod, error) +type PodHandlerFunc func(key string, obj *v1.Pod) (runtime.Object, error) type PodLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Pod, err error) diff --git a/apis/core/v1/zz_generated_pod_lifecycle_adapter.go b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go index e33a309c..726f17c3 100644 --- a/apis/core/v1/zz_generated_pod_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type PodLifecycle interface { - Create(obj *v1.Pod) (*v1.Pod, error) - Remove(obj *v1.Pod) (*v1.Pod, error) - Updated(obj *v1.Pod) (*v1.Pod, error) + Create(obj *v1.Pod) (runtime.Object, error) + Remove(obj *v1.Pod) (runtime.Object, error) + Updated(obj *v1.Pod) (runtime.Object, error) } type podLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *podLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error func NewPodLifecycleAdapter(name string, clusterScoped bool, client PodInterface, l PodLifecycle) PodHandlerFunc { adapter := &podLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Pod) (*v1.Pod, error) { + return func(key string, obj *v1.Pod) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Pod); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_replication_controller_controller.go b/apis/core/v1/zz_generated_replication_controller_controller.go index bd6bf088..1d93a420 100644 --- a/apis/core/v1/zz_generated_replication_controller_controller.go +++ b/apis/core/v1/zz_generated_replication_controller_controller.go @@ -36,7 +36,7 @@ type ReplicationControllerList struct { Items []v1.ReplicationController } -type ReplicationControllerHandlerFunc func(key string, obj *v1.ReplicationController) (*v1.ReplicationController, error) +type ReplicationControllerHandlerFunc func(key string, obj *v1.ReplicationController) (runtime.Object, error) type ReplicationControllerLister interface { List(namespace string, selector labels.Selector) (ret []*v1.ReplicationController, err error) 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 93ab56e5..3be8dac3 100644 --- a/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type ReplicationControllerLifecycle interface { - Create(obj *v1.ReplicationController) (*v1.ReplicationController, error) - Remove(obj *v1.ReplicationController) (*v1.ReplicationController, error) - Updated(obj *v1.ReplicationController) (*v1.ReplicationController, error) + Create(obj *v1.ReplicationController) (runtime.Object, error) + Remove(obj *v1.ReplicationController) (runtime.Object, error) + Updated(obj *v1.ReplicationController) (runtime.Object, error) } type replicationControllerLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *replicationControllerLifecycleAdapter) Updated(obj runtime.Object) (run func NewReplicationControllerLifecycleAdapter(name string, clusterScoped bool, client ReplicationControllerInterface, l ReplicationControllerLifecycle) ReplicationControllerHandlerFunc { adapter := &replicationControllerLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.ReplicationController) (*v1.ReplicationController, error) { + return func(key string, obj *v1.ReplicationController) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.ReplicationController); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_resource_quota_controller.go b/apis/core/v1/zz_generated_resource_quota_controller.go index edcb4418..5b9dfe71 100644 --- a/apis/core/v1/zz_generated_resource_quota_controller.go +++ b/apis/core/v1/zz_generated_resource_quota_controller.go @@ -36,7 +36,7 @@ type ResourceQuotaList struct { Items []v1.ResourceQuota } -type ResourceQuotaHandlerFunc func(key string, obj *v1.ResourceQuota) (*v1.ResourceQuota, error) +type ResourceQuotaHandlerFunc func(key string, obj *v1.ResourceQuota) (runtime.Object, error) type ResourceQuotaLister interface { List(namespace string, selector labels.Selector) (ret []*v1.ResourceQuota, err error) 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 a2bfe7f1..6e6eb269 100644 --- a/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type ResourceQuotaLifecycle interface { - Create(obj *v1.ResourceQuota) (*v1.ResourceQuota, error) - Remove(obj *v1.ResourceQuota) (*v1.ResourceQuota, error) - Updated(obj *v1.ResourceQuota) (*v1.ResourceQuota, error) + Create(obj *v1.ResourceQuota) (runtime.Object, error) + Remove(obj *v1.ResourceQuota) (runtime.Object, error) + Updated(obj *v1.ResourceQuota) (runtime.Object, error) } type resourceQuotaLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *resourceQuotaLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj func NewResourceQuotaLifecycleAdapter(name string, clusterScoped bool, client ResourceQuotaInterface, l ResourceQuotaLifecycle) ResourceQuotaHandlerFunc { adapter := &resourceQuotaLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.ResourceQuota) (*v1.ResourceQuota, error) { + return func(key string, obj *v1.ResourceQuota) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.ResourceQuota); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_secret_controller.go b/apis/core/v1/zz_generated_secret_controller.go index accb45b4..9e175087 100644 --- a/apis/core/v1/zz_generated_secret_controller.go +++ b/apis/core/v1/zz_generated_secret_controller.go @@ -36,7 +36,7 @@ type SecretList struct { Items []v1.Secret } -type SecretHandlerFunc func(key string, obj *v1.Secret) (*v1.Secret, error) +type SecretHandlerFunc func(key string, obj *v1.Secret) (runtime.Object, error) type SecretLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Secret, err error) diff --git a/apis/core/v1/zz_generated_secret_lifecycle_adapter.go b/apis/core/v1/zz_generated_secret_lifecycle_adapter.go index 2eac50b6..20cb6d8f 100644 --- a/apis/core/v1/zz_generated_secret_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_secret_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type SecretLifecycle interface { - Create(obj *v1.Secret) (*v1.Secret, error) - Remove(obj *v1.Secret) (*v1.Secret, error) - Updated(obj *v1.Secret) (*v1.Secret, error) + Create(obj *v1.Secret) (runtime.Object, error) + Remove(obj *v1.Secret) (runtime.Object, error) + Updated(obj *v1.Secret) (runtime.Object, error) } type secretLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *secretLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, er func NewSecretLifecycleAdapter(name string, clusterScoped bool, client SecretInterface, l SecretLifecycle) SecretHandlerFunc { adapter := &secretLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Secret) (*v1.Secret, error) { + return func(key string, obj *v1.Secret) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Secret); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_service_account_controller.go b/apis/core/v1/zz_generated_service_account_controller.go index 92f5fe32..d4d93354 100644 --- a/apis/core/v1/zz_generated_service_account_controller.go +++ b/apis/core/v1/zz_generated_service_account_controller.go @@ -36,7 +36,7 @@ type ServiceAccountList struct { Items []v1.ServiceAccount } -type ServiceAccountHandlerFunc func(key string, obj *v1.ServiceAccount) (*v1.ServiceAccount, error) +type ServiceAccountHandlerFunc func(key string, obj *v1.ServiceAccount) (runtime.Object, error) type ServiceAccountLister interface { List(namespace string, selector labels.Selector) (ret []*v1.ServiceAccount, err error) 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 bd768dfe..20778d96 100644 --- a/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type ServiceAccountLifecycle interface { - Create(obj *v1.ServiceAccount) (*v1.ServiceAccount, error) - Remove(obj *v1.ServiceAccount) (*v1.ServiceAccount, error) - Updated(obj *v1.ServiceAccount) (*v1.ServiceAccount, error) + Create(obj *v1.ServiceAccount) (runtime.Object, error) + Remove(obj *v1.ServiceAccount) (runtime.Object, error) + Updated(obj *v1.ServiceAccount) (runtime.Object, error) } type serviceAccountLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *serviceAccountLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob func NewServiceAccountLifecycleAdapter(name string, clusterScoped bool, client ServiceAccountInterface, l ServiceAccountLifecycle) ServiceAccountHandlerFunc { adapter := &serviceAccountLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.ServiceAccount) (*v1.ServiceAccount, error) { + return func(key string, obj *v1.ServiceAccount) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.ServiceAccount); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/core/v1/zz_generated_service_controller.go b/apis/core/v1/zz_generated_service_controller.go index 1df2342f..f4c1726c 100644 --- a/apis/core/v1/zz_generated_service_controller.go +++ b/apis/core/v1/zz_generated_service_controller.go @@ -36,7 +36,7 @@ type ServiceList struct { Items []v1.Service } -type ServiceHandlerFunc func(key string, obj *v1.Service) (*v1.Service, error) +type ServiceHandlerFunc func(key string, obj *v1.Service) (runtime.Object, error) type ServiceLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Service, err error) diff --git a/apis/core/v1/zz_generated_service_lifecycle_adapter.go b/apis/core/v1/zz_generated_service_lifecycle_adapter.go index 65380e31..dffe4833 100644 --- a/apis/core/v1/zz_generated_service_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_service_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type ServiceLifecycle interface { - Create(obj *v1.Service) (*v1.Service, error) - Remove(obj *v1.Service) (*v1.Service, error) - Updated(obj *v1.Service) (*v1.Service, error) + Create(obj *v1.Service) (runtime.Object, error) + Remove(obj *v1.Service) (runtime.Object, error) + Updated(obj *v1.Service) (runtime.Object, error) } type serviceLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *serviceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewServiceLifecycleAdapter(name string, clusterScoped bool, client ServiceInterface, l ServiceLifecycle) ServiceHandlerFunc { adapter := &serviceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Service) (*v1.Service, error) { + return func(key string, obj *v1.Service) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Service); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/apis/extensions/v1beta1/zz_generated_ingress_controller.go b/apis/extensions/v1beta1/zz_generated_ingress_controller.go index 3e307ddf..2dabb2d1 100644 --- a/apis/extensions/v1beta1/zz_generated_ingress_controller.go +++ b/apis/extensions/v1beta1/zz_generated_ingress_controller.go @@ -36,7 +36,7 @@ type IngressList struct { Items []v1beta1.Ingress } -type IngressHandlerFunc func(key string, obj *v1beta1.Ingress) (*v1beta1.Ingress, error) +type IngressHandlerFunc func(key string, obj *v1beta1.Ingress) (runtime.Object, error) type IngressLister interface { List(namespace string, selector labels.Selector) (ret []*v1beta1.Ingress, err error) diff --git a/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go b/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go index acabe71e..3a72c1a0 100644 --- a/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go +++ b/apis/extensions/v1beta1/zz_generated_ingress_lifecycle_adapter.go @@ -7,9 +7,9 @@ import ( ) type IngressLifecycle interface { - Create(obj *v1beta1.Ingress) (*v1beta1.Ingress, error) - Remove(obj *v1beta1.Ingress) (*v1beta1.Ingress, error) - Updated(obj *v1beta1.Ingress) (*v1beta1.Ingress, error) + Create(obj *v1beta1.Ingress) (runtime.Object, error) + Remove(obj *v1beta1.Ingress) (runtime.Object, error) + Updated(obj *v1beta1.Ingress) (runtime.Object, error) } type ingressLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *ingressLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewIngressLifecycleAdapter(name string, clusterScoped bool, client IngressInterface, l IngressLifecycle) IngressHandlerFunc { adapter := &ingressLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1beta1.Ingress) (*v1beta1.Ingress, error) { + return func(key string, obj *v1beta1.Ingress) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1beta1.Ingress); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 a440ac24..080ecfb3 100644 --- a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go +++ b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go @@ -35,7 +35,7 @@ type PodSecurityPolicyList struct { Items []v1beta1.PodSecurityPolicy } -type PodSecurityPolicyHandlerFunc func(key string, obj *v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) +type PodSecurityPolicyHandlerFunc func(key string, obj *v1beta1.PodSecurityPolicy) (runtime.Object, error) type PodSecurityPolicyLister interface { List(namespace string, selector labels.Selector) (ret []*v1beta1.PodSecurityPolicy, err error) 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 84ea3e6a..503bda8c 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 @@ -7,9 +7,9 @@ import ( ) type PodSecurityPolicyLifecycle interface { - Create(obj *v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) - Remove(obj *v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) - Updated(obj *v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) + Create(obj *v1beta1.PodSecurityPolicy) (runtime.Object, error) + Remove(obj *v1beta1.PodSecurityPolicy) (runtime.Object, error) + Updated(obj *v1beta1.PodSecurityPolicy) (runtime.Object, error) } type podSecurityPolicyLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *podSecurityPolicyLifecycleAdapter) Updated(obj runtime.Object) (runtime func NewPodSecurityPolicyLifecycleAdapter(name string, clusterScoped bool, client PodSecurityPolicyInterface, l PodSecurityPolicyLifecycle) PodSecurityPolicyHandlerFunc { adapter := &podSecurityPolicyLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1beta1.PodSecurityPolicy) (*v1beta1.PodSecurityPolicy, error) { + return func(key string, obj *v1beta1.PodSecurityPolicy) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1beta1.PodSecurityPolicy); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 26697608..79b549d0 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 @@ -34,7 +34,7 @@ type AuthConfigList struct { Items []AuthConfig } -type AuthConfigHandlerFunc func(key string, obj *AuthConfig) (*AuthConfig, error) +type AuthConfigHandlerFunc func(key string, obj *AuthConfig) (runtime.Object, error) type AuthConfigLister interface { List(namespace string, selector labels.Selector) (ret []*AuthConfig, err error) 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 d9222500..67f8b702 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 @@ -6,9 +6,9 @@ import ( ) type AuthConfigLifecycle interface { - Create(obj *AuthConfig) (*AuthConfig, error) - Remove(obj *AuthConfig) (*AuthConfig, error) - Updated(obj *AuthConfig) (*AuthConfig, error) + Create(obj *AuthConfig) (runtime.Object, error) + Remove(obj *AuthConfig) (runtime.Object, error) + Updated(obj *AuthConfig) (runtime.Object, error) } type authConfigLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *authConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object func NewAuthConfigLifecycleAdapter(name string, clusterScoped bool, client AuthConfigInterface, l AuthConfigLifecycle) AuthConfigHandlerFunc { adapter := &authConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *AuthConfig) (*AuthConfig, error) { + return func(key string, obj *AuthConfig) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*AuthConfig); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 2f04ceb2..3684a9d4 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go @@ -34,7 +34,7 @@ type CatalogList struct { Items []Catalog } -type CatalogHandlerFunc func(key string, obj *Catalog) (*Catalog, error) +type CatalogHandlerFunc func(key string, obj *Catalog) (runtime.Object, error) type CatalogLister interface { List(namespace string, selector labels.Selector) (ret []*Catalog, err error) 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 336aba97..68b99dea 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 @@ -6,9 +6,9 @@ import ( ) type CatalogLifecycle interface { - Create(obj *Catalog) (*Catalog, error) - Remove(obj *Catalog) (*Catalog, error) - Updated(obj *Catalog) (*Catalog, error) + Create(obj *Catalog) (runtime.Object, error) + Remove(obj *Catalog) (runtime.Object, error) + Updated(obj *Catalog) (runtime.Object, error) } type catalogLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *catalogLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewCatalogLifecycleAdapter(name string, clusterScoped bool, client CatalogInterface, l CatalogLifecycle) CatalogHandlerFunc { adapter := &catalogLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Catalog) (*Catalog, error) { + return func(key string, obj *Catalog) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Catalog); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 552ade53..e2fdbd55 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 @@ -35,7 +35,7 @@ type ClusterAlertList struct { Items []ClusterAlert } -type ClusterAlertHandlerFunc func(key string, obj *ClusterAlert) (*ClusterAlert, error) +type ClusterAlertHandlerFunc func(key string, obj *ClusterAlert) (runtime.Object, error) type ClusterAlertLister interface { List(namespace string, selector labels.Selector) (ret []*ClusterAlert, err 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 98a9810c..b786b527 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 @@ -6,9 +6,9 @@ import ( ) type ClusterAlertLifecycle interface { - Create(obj *ClusterAlert) (*ClusterAlert, error) - Remove(obj *ClusterAlert) (*ClusterAlert, error) - Updated(obj *ClusterAlert) (*ClusterAlert, error) + Create(obj *ClusterAlert) (runtime.Object, error) + Remove(obj *ClusterAlert) (runtime.Object, error) + Updated(obj *ClusterAlert) (runtime.Object, error) } type clusterAlertLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *clusterAlertLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje func NewClusterAlertLifecycleAdapter(name string, clusterScoped bool, client ClusterAlertInterface, l ClusterAlertLifecycle) ClusterAlertHandlerFunc { adapter := &clusterAlertLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ClusterAlert) (*ClusterAlert, error) { + return func(key string, obj *ClusterAlert) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ClusterAlert); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 59bb8db4..2cc199f7 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 @@ -35,7 +35,7 @@ type ClusterCatalogList struct { Items []ClusterCatalog } -type ClusterCatalogHandlerFunc func(key string, obj *ClusterCatalog) (*ClusterCatalog, error) +type ClusterCatalogHandlerFunc func(key string, obj *ClusterCatalog) (runtime.Object, error) type ClusterCatalogLister interface { List(namespace string, selector labels.Selector) (ret []*ClusterCatalog, err error) 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 3c25ac69..a3389496 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 @@ -6,9 +6,9 @@ import ( ) type ClusterCatalogLifecycle interface { - Create(obj *ClusterCatalog) (*ClusterCatalog, error) - Remove(obj *ClusterCatalog) (*ClusterCatalog, error) - Updated(obj *ClusterCatalog) (*ClusterCatalog, error) + Create(obj *ClusterCatalog) (runtime.Object, error) + Remove(obj *ClusterCatalog) (runtime.Object, error) + Updated(obj *ClusterCatalog) (runtime.Object, error) } type clusterCatalogLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *clusterCatalogLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob func NewClusterCatalogLifecycleAdapter(name string, clusterScoped bool, client ClusterCatalogInterface, l ClusterCatalogLifecycle) ClusterCatalogHandlerFunc { adapter := &clusterCatalogLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ClusterCatalog) (*ClusterCatalog, error) { + return func(key string, obj *ClusterCatalog) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ClusterCatalog); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 e01a67a9..9ba8ca3f 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -34,7 +34,7 @@ type ClusterList struct { Items []Cluster } -type ClusterHandlerFunc func(key string, obj *Cluster) (*Cluster, error) +type ClusterHandlerFunc func(key string, obj *Cluster) (runtime.Object, error) type ClusterLister interface { List(namespace string, selector labels.Selector) (ret []*Cluster, err error) 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 2406e8e2..38cf5d05 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 @@ -6,9 +6,9 @@ import ( ) type ClusterLifecycle interface { - Create(obj *Cluster) (*Cluster, error) - Remove(obj *Cluster) (*Cluster, error) - Updated(obj *Cluster) (*Cluster, error) + Create(obj *Cluster) (runtime.Object, error) + Remove(obj *Cluster) (runtime.Object, error) + Updated(obj *Cluster) (runtime.Object, error) } type clusterLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *clusterLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewClusterLifecycleAdapter(name string, clusterScoped bool, client ClusterInterface, l ClusterLifecycle) ClusterHandlerFunc { adapter := &clusterLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Cluster) (*Cluster, error) { + return func(key string, obj *Cluster) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Cluster); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 95fac18d..f9c98299 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 @@ -35,7 +35,7 @@ type ClusterLoggingList struct { Items []ClusterLogging } -type ClusterLoggingHandlerFunc func(key string, obj *ClusterLogging) (*ClusterLogging, error) +type ClusterLoggingHandlerFunc func(key string, obj *ClusterLogging) (runtime.Object, error) type ClusterLoggingLister interface { List(namespace string, selector labels.Selector) (ret []*ClusterLogging, err error) 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 2d9cdf29..658cd73c 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 @@ -6,9 +6,9 @@ import ( ) type ClusterLoggingLifecycle interface { - Create(obj *ClusterLogging) (*ClusterLogging, error) - Remove(obj *ClusterLogging) (*ClusterLogging, error) - Updated(obj *ClusterLogging) (*ClusterLogging, error) + Create(obj *ClusterLogging) (runtime.Object, error) + Remove(obj *ClusterLogging) (runtime.Object, error) + Updated(obj *ClusterLogging) (runtime.Object, error) } type clusterLoggingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *clusterLoggingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob func NewClusterLoggingLifecycleAdapter(name string, clusterScoped bool, client ClusterLoggingInterface, l ClusterLoggingLifecycle) ClusterLoggingHandlerFunc { adapter := &clusterLoggingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ClusterLogging) (*ClusterLogging, error) { + return func(key string, obj *ClusterLogging) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ClusterLogging); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 13fa7deb..007381b4 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 @@ -35,7 +35,7 @@ type ClusterRegistrationTokenList struct { Items []ClusterRegistrationToken } -type ClusterRegistrationTokenHandlerFunc func(key string, obj *ClusterRegistrationToken) (*ClusterRegistrationToken, error) +type ClusterRegistrationTokenHandlerFunc func(key string, obj *ClusterRegistrationToken) (runtime.Object, error) type ClusterRegistrationTokenLister interface { List(namespace string, selector labels.Selector) (ret []*ClusterRegistrationToken, err error) 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 93cd4de3..149bc294 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 @@ -6,9 +6,9 @@ import ( ) type ClusterRegistrationTokenLifecycle interface { - Create(obj *ClusterRegistrationToken) (*ClusterRegistrationToken, error) - Remove(obj *ClusterRegistrationToken) (*ClusterRegistrationToken, error) - Updated(obj *ClusterRegistrationToken) (*ClusterRegistrationToken, error) + Create(obj *ClusterRegistrationToken) (runtime.Object, error) + Remove(obj *ClusterRegistrationToken) (runtime.Object, error) + Updated(obj *ClusterRegistrationToken) (runtime.Object, error) } type clusterRegistrationTokenLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *clusterRegistrationTokenLifecycleAdapter) Updated(obj runtime.Object) ( func NewClusterRegistrationTokenLifecycleAdapter(name string, clusterScoped bool, client ClusterRegistrationTokenInterface, l ClusterRegistrationTokenLifecycle) ClusterRegistrationTokenHandlerFunc { adapter := &clusterRegistrationTokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ClusterRegistrationToken) (*ClusterRegistrationToken, error) { + return func(key string, obj *ClusterRegistrationToken) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ClusterRegistrationToken); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 b4087c79..3ab385b5 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 @@ -35,7 +35,7 @@ type ClusterRoleTemplateBindingList struct { Items []ClusterRoleTemplateBinding } -type ClusterRoleTemplateBindingHandlerFunc func(key string, obj *ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) +type ClusterRoleTemplateBindingHandlerFunc func(key string, obj *ClusterRoleTemplateBinding) (runtime.Object, error) type ClusterRoleTemplateBindingLister interface { List(namespace string, selector labels.Selector) (ret []*ClusterRoleTemplateBinding, err error) 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 66e351e0..bd9e27c4 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 @@ -6,9 +6,9 @@ import ( ) type ClusterRoleTemplateBindingLifecycle interface { - Create(obj *ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) - Remove(obj *ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) - Updated(obj *ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) + Create(obj *ClusterRoleTemplateBinding) (runtime.Object, error) + Remove(obj *ClusterRoleTemplateBinding) (runtime.Object, error) + Updated(obj *ClusterRoleTemplateBinding) (runtime.Object, error) } type clusterRoleTemplateBindingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *clusterRoleTemplateBindingLifecycleAdapter) Updated(obj runtime.Object) func NewClusterRoleTemplateBindingLifecycleAdapter(name string, clusterScoped bool, client ClusterRoleTemplateBindingInterface, l ClusterRoleTemplateBindingLifecycle) ClusterRoleTemplateBindingHandlerFunc { adapter := &clusterRoleTemplateBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ClusterRoleTemplateBinding) (*ClusterRoleTemplateBinding, error) { + return func(key string, obj *ClusterRoleTemplateBinding) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ClusterRoleTemplateBinding); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 f301386e..08c036a4 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 @@ -34,7 +34,7 @@ type ComposeConfigList struct { Items []ComposeConfig } -type ComposeConfigHandlerFunc func(key string, obj *ComposeConfig) (*ComposeConfig, error) +type ComposeConfigHandlerFunc func(key string, obj *ComposeConfig) (runtime.Object, error) type ComposeConfigLister interface { List(namespace string, selector labels.Selector) (ret []*ComposeConfig, err error) 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 8588db33..47e9ed1f 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 @@ -6,9 +6,9 @@ import ( ) type ComposeConfigLifecycle interface { - Create(obj *ComposeConfig) (*ComposeConfig, error) - Remove(obj *ComposeConfig) (*ComposeConfig, error) - Updated(obj *ComposeConfig) (*ComposeConfig, error) + Create(obj *ComposeConfig) (runtime.Object, error) + Remove(obj *ComposeConfig) (runtime.Object, error) + Updated(obj *ComposeConfig) (runtime.Object, error) } type composeConfigLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *composeConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj func NewComposeConfigLifecycleAdapter(name string, clusterScoped bool, client ComposeConfigInterface, l ComposeConfigLifecycle) ComposeConfigHandlerFunc { adapter := &composeConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ComposeConfig) (*ComposeConfig, error) { + return func(key string, obj *ComposeConfig) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ComposeConfig); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 2332b877..78ca0817 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 @@ -34,7 +34,7 @@ type DynamicSchemaList struct { Items []DynamicSchema } -type DynamicSchemaHandlerFunc func(key string, obj *DynamicSchema) (*DynamicSchema, error) +type DynamicSchemaHandlerFunc func(key string, obj *DynamicSchema) (runtime.Object, error) type DynamicSchemaLister interface { List(namespace string, selector labels.Selector) (ret []*DynamicSchema, err error) 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 6382f9ee..3ecb89bd 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 @@ -6,9 +6,9 @@ import ( ) type DynamicSchemaLifecycle interface { - Create(obj *DynamicSchema) (*DynamicSchema, error) - Remove(obj *DynamicSchema) (*DynamicSchema, error) - Updated(obj *DynamicSchema) (*DynamicSchema, error) + Create(obj *DynamicSchema) (runtime.Object, error) + Remove(obj *DynamicSchema) (runtime.Object, error) + Updated(obj *DynamicSchema) (runtime.Object, error) } type dynamicSchemaLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *dynamicSchemaLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj func NewDynamicSchemaLifecycleAdapter(name string, clusterScoped bool, client DynamicSchemaInterface, l DynamicSchemaLifecycle) DynamicSchemaHandlerFunc { adapter := &dynamicSchemaLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *DynamicSchema) (*DynamicSchema, error) { + return func(key string, obj *DynamicSchema) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*DynamicSchema); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 edfed0b4..97e28cec 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 @@ -34,7 +34,7 @@ type GlobalRoleBindingList struct { Items []GlobalRoleBinding } -type GlobalRoleBindingHandlerFunc func(key string, obj *GlobalRoleBinding) (*GlobalRoleBinding, error) +type GlobalRoleBindingHandlerFunc func(key string, obj *GlobalRoleBinding) (runtime.Object, error) type GlobalRoleBindingLister interface { List(namespace string, selector labels.Selector) (ret []*GlobalRoleBinding, err error) 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 db0b11eb..252513d3 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 @@ -6,9 +6,9 @@ import ( ) type GlobalRoleBindingLifecycle interface { - Create(obj *GlobalRoleBinding) (*GlobalRoleBinding, error) - Remove(obj *GlobalRoleBinding) (*GlobalRoleBinding, error) - Updated(obj *GlobalRoleBinding) (*GlobalRoleBinding, error) + Create(obj *GlobalRoleBinding) (runtime.Object, error) + Remove(obj *GlobalRoleBinding) (runtime.Object, error) + Updated(obj *GlobalRoleBinding) (runtime.Object, error) } type globalRoleBindingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *globalRoleBindingLifecycleAdapter) Updated(obj runtime.Object) (runtime func NewGlobalRoleBindingLifecycleAdapter(name string, clusterScoped bool, client GlobalRoleBindingInterface, l GlobalRoleBindingLifecycle) GlobalRoleBindingHandlerFunc { adapter := &globalRoleBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *GlobalRoleBinding) (*GlobalRoleBinding, error) { + return func(key string, obj *GlobalRoleBinding) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*GlobalRoleBinding); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 0f474768..ec537dfb 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 @@ -34,7 +34,7 @@ type GlobalRoleList struct { Items []GlobalRole } -type GlobalRoleHandlerFunc func(key string, obj *GlobalRole) (*GlobalRole, error) +type GlobalRoleHandlerFunc func(key string, obj *GlobalRole) (runtime.Object, error) type GlobalRoleLister interface { List(namespace string, selector labels.Selector) (ret []*GlobalRole, err error) 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 6e29b18a..e57c0ac0 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 @@ -6,9 +6,9 @@ import ( ) type GlobalRoleLifecycle interface { - Create(obj *GlobalRole) (*GlobalRole, error) - Remove(obj *GlobalRole) (*GlobalRole, error) - Updated(obj *GlobalRole) (*GlobalRole, error) + Create(obj *GlobalRole) (runtime.Object, error) + Remove(obj *GlobalRole) (runtime.Object, error) + Updated(obj *GlobalRole) (runtime.Object, error) } type globalRoleLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *globalRoleLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object func NewGlobalRoleLifecycleAdapter(name string, clusterScoped bool, client GlobalRoleInterface, l GlobalRoleLifecycle) GlobalRoleHandlerFunc { adapter := &globalRoleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *GlobalRole) (*GlobalRole, error) { + return func(key string, obj *GlobalRole) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*GlobalRole); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 7c59e4fa..4e725aeb 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_group_controller.go @@ -34,7 +34,7 @@ type GroupList struct { Items []Group } -type GroupHandlerFunc func(key string, obj *Group) (*Group, error) +type GroupHandlerFunc func(key string, obj *Group) (runtime.Object, error) type GroupLister interface { List(namespace string, selector labels.Selector) (ret []*Group, err error) 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 cd929d0f..a73e9923 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 @@ -6,9 +6,9 @@ import ( ) type GroupLifecycle interface { - Create(obj *Group) (*Group, error) - Remove(obj *Group) (*Group, error) - Updated(obj *Group) (*Group, error) + Create(obj *Group) (runtime.Object, error) + Remove(obj *Group) (runtime.Object, error) + Updated(obj *Group) (runtime.Object, error) } type groupLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *groupLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, err func NewGroupLifecycleAdapter(name string, clusterScoped bool, client GroupInterface, l GroupLifecycle) GroupHandlerFunc { adapter := &groupLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Group) (*Group, error) { + return func(key string, obj *Group) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Group); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 4d80bcac..efad6c11 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 @@ -34,7 +34,7 @@ type GroupMemberList struct { Items []GroupMember } -type GroupMemberHandlerFunc func(key string, obj *GroupMember) (*GroupMember, error) +type GroupMemberHandlerFunc func(key string, obj *GroupMember) (runtime.Object, error) type GroupMemberLister interface { List(namespace string, selector labels.Selector) (ret []*GroupMember, err error) 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 dc31cf66..4da248ac 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 @@ -6,9 +6,9 @@ import ( ) type GroupMemberLifecycle interface { - Create(obj *GroupMember) (*GroupMember, error) - Remove(obj *GroupMember) (*GroupMember, error) - Updated(obj *GroupMember) (*GroupMember, error) + Create(obj *GroupMember) (runtime.Object, error) + Remove(obj *GroupMember) (runtime.Object, error) + Updated(obj *GroupMember) (runtime.Object, error) } type groupMemberLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *groupMemberLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec func NewGroupMemberLifecycleAdapter(name string, clusterScoped bool, client GroupMemberInterface, l GroupMemberLifecycle) GroupMemberHandlerFunc { adapter := &groupMemberLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *GroupMember) (*GroupMember, error) { + return func(key string, obj *GroupMember) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*GroupMember); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 73993582..398a19a6 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 @@ -34,7 +34,7 @@ type LdapConfigList struct { Items []LdapConfig } -type LdapConfigHandlerFunc func(key string, obj *LdapConfig) (*LdapConfig, error) +type LdapConfigHandlerFunc func(key string, obj *LdapConfig) (runtime.Object, error) type LdapConfigLister interface { List(namespace string, selector labels.Selector) (ret []*LdapConfig, err error) 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 380e67c8..4dd1a4cb 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 @@ -6,9 +6,9 @@ import ( ) type LdapConfigLifecycle interface { - Create(obj *LdapConfig) (*LdapConfig, error) - Remove(obj *LdapConfig) (*LdapConfig, error) - Updated(obj *LdapConfig) (*LdapConfig, error) + Create(obj *LdapConfig) (runtime.Object, error) + Remove(obj *LdapConfig) (runtime.Object, error) + Updated(obj *LdapConfig) (runtime.Object, error) } type ldapConfigLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *ldapConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object func NewLdapConfigLifecycleAdapter(name string, clusterScoped bool, client LdapConfigInterface, l LdapConfigLifecycle) LdapConfigHandlerFunc { adapter := &ldapConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *LdapConfig) (*LdapConfig, error) { + return func(key string, obj *LdapConfig) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*LdapConfig); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 82ff5030..ab4e6d7d 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 @@ -34,7 +34,7 @@ type ListenConfigList struct { Items []ListenConfig } -type ListenConfigHandlerFunc func(key string, obj *ListenConfig) (*ListenConfig, error) +type ListenConfigHandlerFunc func(key string, obj *ListenConfig) (runtime.Object, error) type ListenConfigLister interface { List(namespace string, selector labels.Selector) (ret []*ListenConfig, err error) 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 d17f7d84..7fc67aa0 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 @@ -6,9 +6,9 @@ import ( ) type ListenConfigLifecycle interface { - Create(obj *ListenConfig) (*ListenConfig, error) - Remove(obj *ListenConfig) (*ListenConfig, error) - Updated(obj *ListenConfig) (*ListenConfig, error) + Create(obj *ListenConfig) (runtime.Object, error) + Remove(obj *ListenConfig) (runtime.Object, error) + Updated(obj *ListenConfig) (runtime.Object, error) } type listenConfigLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *listenConfigLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje func NewListenConfigLifecycleAdapter(name string, clusterScoped bool, client ListenConfigInterface, l ListenConfigLifecycle) ListenConfigHandlerFunc { adapter := &listenConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ListenConfig) (*ListenConfig, error) { + return func(key string, obj *ListenConfig) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ListenConfig); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 8bdb2501..6654497a 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_node_controller.go @@ -35,7 +35,7 @@ type NodeList struct { Items []Node } -type NodeHandlerFunc func(key string, obj *Node) (*Node, error) +type NodeHandlerFunc func(key string, obj *Node) (runtime.Object, error) type NodeLister interface { List(namespace string, selector labels.Selector) (ret []*Node, err error) 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 d197602f..73525d29 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 @@ -34,7 +34,7 @@ type NodeDriverList struct { Items []NodeDriver } -type NodeDriverHandlerFunc func(key string, obj *NodeDriver) (*NodeDriver, error) +type NodeDriverHandlerFunc func(key string, obj *NodeDriver) (runtime.Object, error) type NodeDriverLister interface { List(namespace string, selector labels.Selector) (ret []*NodeDriver, err error) 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 460f89d0..c99c4448 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 @@ -6,9 +6,9 @@ import ( ) type NodeDriverLifecycle interface { - Create(obj *NodeDriver) (*NodeDriver, error) - Remove(obj *NodeDriver) (*NodeDriver, error) - Updated(obj *NodeDriver) (*NodeDriver, error) + Create(obj *NodeDriver) (runtime.Object, error) + Remove(obj *NodeDriver) (runtime.Object, error) + Updated(obj *NodeDriver) (runtime.Object, error) } type nodeDriverLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *nodeDriverLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object func NewNodeDriverLifecycleAdapter(name string, clusterScoped bool, client NodeDriverInterface, l NodeDriverLifecycle) NodeDriverHandlerFunc { adapter := &nodeDriverLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NodeDriver) (*NodeDriver, error) { + return func(key string, obj *NodeDriver) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NodeDriver); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 4872b5b7..248c0e7c 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 @@ -6,9 +6,9 @@ import ( ) type NodeLifecycle interface { - Create(obj *Node) (*Node, error) - Remove(obj *Node) (*Node, error) - Updated(obj *Node) (*Node, error) + Create(obj *Node) (runtime.Object, error) + Remove(obj *Node) (runtime.Object, error) + Updated(obj *Node) (runtime.Object, error) } type nodeLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *nodeLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro func NewNodeLifecycleAdapter(name string, clusterScoped bool, client NodeInterface, l NodeLifecycle) NodeHandlerFunc { adapter := &nodeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Node) (*Node, error) { + return func(key string, obj *Node) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Node); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 dcbfad2e..4f487c39 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 @@ -35,7 +35,7 @@ type NodePoolList struct { Items []NodePool } -type NodePoolHandlerFunc func(key string, obj *NodePool) (*NodePool, error) +type NodePoolHandlerFunc func(key string, obj *NodePool) (runtime.Object, error) type NodePoolLister interface { List(namespace string, selector labels.Selector) (ret []*NodePool, err error) 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 4e13a330..21284283 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 @@ -6,9 +6,9 @@ import ( ) type NodePoolLifecycle interface { - Create(obj *NodePool) (*NodePool, error) - Remove(obj *NodePool) (*NodePool, error) - Updated(obj *NodePool) (*NodePool, error) + Create(obj *NodePool) (runtime.Object, error) + Remove(obj *NodePool) (runtime.Object, error) + Updated(obj *NodePool) (runtime.Object, error) } type nodePoolLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *nodePoolLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewNodePoolLifecycleAdapter(name string, clusterScoped bool, client NodePoolInterface, l NodePoolLifecycle) NodePoolHandlerFunc { adapter := &nodePoolLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NodePool) (*NodePool, error) { + return func(key string, obj *NodePool) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NodePool); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 c6e3fa4d..83b4bd93 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 @@ -35,7 +35,7 @@ type NodeTemplateList struct { Items []NodeTemplate } -type NodeTemplateHandlerFunc func(key string, obj *NodeTemplate) (*NodeTemplate, error) +type NodeTemplateHandlerFunc func(key string, obj *NodeTemplate) (runtime.Object, error) type NodeTemplateLister interface { List(namespace string, selector labels.Selector) (ret []*NodeTemplate, err error) 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 c4f9f9ad..8c0ca551 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 @@ -6,9 +6,9 @@ import ( ) type NodeTemplateLifecycle interface { - Create(obj *NodeTemplate) (*NodeTemplate, error) - Remove(obj *NodeTemplate) (*NodeTemplate, error) - Updated(obj *NodeTemplate) (*NodeTemplate, error) + Create(obj *NodeTemplate) (runtime.Object, error) + Remove(obj *NodeTemplate) (runtime.Object, error) + Updated(obj *NodeTemplate) (runtime.Object, error) } type nodeTemplateLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *nodeTemplateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje func NewNodeTemplateLifecycleAdapter(name string, clusterScoped bool, client NodeTemplateInterface, l NodeTemplateLifecycle) NodeTemplateHandlerFunc { adapter := &nodeTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NodeTemplate) (*NodeTemplate, error) { + return func(key string, obj *NodeTemplate) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NodeTemplate); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 76c725ad..0dd439c7 100644 --- a/apis/management.cattle.io/v3/zz_generated_notifier_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_notifier_controller.go @@ -35,7 +35,7 @@ type NotifierList struct { Items []Notifier } -type NotifierHandlerFunc func(key string, obj *Notifier) (*Notifier, error) +type NotifierHandlerFunc func(key string, obj *Notifier) (runtime.Object, error) type NotifierLister interface { List(namespace string, selector labels.Selector) (ret []*Notifier, err error) 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 a4d87d96..33c2b953 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 @@ -6,9 +6,9 @@ import ( ) type NotifierLifecycle interface { - Create(obj *Notifier) (*Notifier, error) - Remove(obj *Notifier) (*Notifier, error) - Updated(obj *Notifier) (*Notifier, error) + Create(obj *Notifier) (runtime.Object, error) + Remove(obj *Notifier) (runtime.Object, error) + Updated(obj *Notifier) (runtime.Object, error) } type notifierLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *notifierLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewNotifierLifecycleAdapter(name string, clusterScoped bool, client NotifierInterface, l NotifierLifecycle) NotifierHandlerFunc { adapter := ¬ifierLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Notifier) (*Notifier, error) { + return func(key string, obj *Notifier) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Notifier); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 b717c44a..6084487d 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 @@ -34,7 +34,7 @@ type PodSecurityPolicyTemplateList struct { Items []PodSecurityPolicyTemplate } -type PodSecurityPolicyTemplateHandlerFunc func(key string, obj *PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) +type PodSecurityPolicyTemplateHandlerFunc func(key string, obj *PodSecurityPolicyTemplate) (runtime.Object, error) type PodSecurityPolicyTemplateLister interface { List(namespace string, selector labels.Selector) (ret []*PodSecurityPolicyTemplate, err error) 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 ca5d7333..58278550 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 @@ -6,9 +6,9 @@ import ( ) type PodSecurityPolicyTemplateLifecycle interface { - Create(obj *PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) - Remove(obj *PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) - Updated(obj *PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) + Create(obj *PodSecurityPolicyTemplate) (runtime.Object, error) + Remove(obj *PodSecurityPolicyTemplate) (runtime.Object, error) + Updated(obj *PodSecurityPolicyTemplate) (runtime.Object, error) } type podSecurityPolicyTemplateLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *podSecurityPolicyTemplateLifecycleAdapter) Updated(obj runtime.Object) func NewPodSecurityPolicyTemplateLifecycleAdapter(name string, clusterScoped bool, client PodSecurityPolicyTemplateInterface, l PodSecurityPolicyTemplateLifecycle) PodSecurityPolicyTemplateHandlerFunc { adapter := &podSecurityPolicyTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *PodSecurityPolicyTemplate) (*PodSecurityPolicyTemplate, error) { + return func(key string, obj *PodSecurityPolicyTemplate) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*PodSecurityPolicyTemplate); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 89b41095..e6a70f71 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 @@ -35,7 +35,7 @@ type PodSecurityPolicyTemplateProjectBindingList struct { Items []PodSecurityPolicyTemplateProjectBinding } -type PodSecurityPolicyTemplateProjectBindingHandlerFunc func(key string, obj *PodSecurityPolicyTemplateProjectBinding) (*PodSecurityPolicyTemplateProjectBinding, error) +type PodSecurityPolicyTemplateProjectBindingHandlerFunc func(key string, obj *PodSecurityPolicyTemplateProjectBinding) (runtime.Object, error) type PodSecurityPolicyTemplateProjectBindingLister interface { List(namespace string, selector labels.Selector) (ret []*PodSecurityPolicyTemplateProjectBinding, err error) 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 627ab67e..dfc32185 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 @@ -6,9 +6,9 @@ import ( ) type PodSecurityPolicyTemplateProjectBindingLifecycle interface { - Create(obj *PodSecurityPolicyTemplateProjectBinding) (*PodSecurityPolicyTemplateProjectBinding, error) - Remove(obj *PodSecurityPolicyTemplateProjectBinding) (*PodSecurityPolicyTemplateProjectBinding, error) - Updated(obj *PodSecurityPolicyTemplateProjectBinding) (*PodSecurityPolicyTemplateProjectBinding, error) + Create(obj *PodSecurityPolicyTemplateProjectBinding) (runtime.Object, error) + Remove(obj *PodSecurityPolicyTemplateProjectBinding) (runtime.Object, error) + Updated(obj *PodSecurityPolicyTemplateProjectBinding) (runtime.Object, error) } type podSecurityPolicyTemplateProjectBindingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *podSecurityPolicyTemplateProjectBindingLifecycleAdapter) Updated(obj ru func NewPodSecurityPolicyTemplateProjectBindingLifecycleAdapter(name string, clusterScoped bool, client PodSecurityPolicyTemplateProjectBindingInterface, l PodSecurityPolicyTemplateProjectBindingLifecycle) PodSecurityPolicyTemplateProjectBindingHandlerFunc { adapter := &podSecurityPolicyTemplateProjectBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *PodSecurityPolicyTemplateProjectBinding) (*PodSecurityPolicyTemplateProjectBinding, error) { + return func(key string, obj *PodSecurityPolicyTemplateProjectBinding) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*PodSecurityPolicyTemplateProjectBinding); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 aac16786..341b0ba4 100644 --- a/apis/management.cattle.io/v3/zz_generated_preference_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_preference_controller.go @@ -35,7 +35,7 @@ type PreferenceList struct { Items []Preference } -type PreferenceHandlerFunc func(key string, obj *Preference) (*Preference, error) +type PreferenceHandlerFunc func(key string, obj *Preference) (runtime.Object, error) type PreferenceLister interface { List(namespace string, selector labels.Selector) (ret []*Preference, err error) 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 9cd6fd17..f4ac9609 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 @@ -6,9 +6,9 @@ import ( ) type PreferenceLifecycle interface { - Create(obj *Preference) (*Preference, error) - Remove(obj *Preference) (*Preference, error) - Updated(obj *Preference) (*Preference, error) + Create(obj *Preference) (runtime.Object, error) + Remove(obj *Preference) (runtime.Object, error) + Updated(obj *Preference) (runtime.Object, error) } type preferenceLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *preferenceLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object func NewPreferenceLifecycleAdapter(name string, clusterScoped bool, client PreferenceInterface, l PreferenceLifecycle) PreferenceHandlerFunc { adapter := &preferenceLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Preference) (*Preference, error) { + return func(key string, obj *Preference) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Preference); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 6b121c2a..855ac47c 100644 --- a/apis/management.cattle.io/v3/zz_generated_principal_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_principal_controller.go @@ -34,7 +34,7 @@ type PrincipalList struct { Items []Principal } -type PrincipalHandlerFunc func(key string, obj *Principal) (*Principal, error) +type PrincipalHandlerFunc func(key string, obj *Principal) (runtime.Object, error) type PrincipalLister interface { List(namespace string, selector labels.Selector) (ret []*Principal, err error) 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 bd930ec0..3a0363e9 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 @@ -6,9 +6,9 @@ import ( ) type PrincipalLifecycle interface { - Create(obj *Principal) (*Principal, error) - Remove(obj *Principal) (*Principal, error) - Updated(obj *Principal) (*Principal, error) + Create(obj *Principal) (runtime.Object, error) + Remove(obj *Principal) (runtime.Object, error) + Updated(obj *Principal) (runtime.Object, error) } type principalLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *principalLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewPrincipalLifecycleAdapter(name string, clusterScoped bool, client PrincipalInterface, l PrincipalLifecycle) PrincipalHandlerFunc { adapter := &principalLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Principal) (*Principal, error) { + return func(key string, obj *Principal) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Principal); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 c1132510..ab20ce03 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 @@ -35,7 +35,7 @@ type ProjectAlertList struct { Items []ProjectAlert } -type ProjectAlertHandlerFunc func(key string, obj *ProjectAlert) (*ProjectAlert, error) +type ProjectAlertHandlerFunc func(key string, obj *ProjectAlert) (runtime.Object, error) type ProjectAlertLister interface { List(namespace string, selector labels.Selector) (ret []*ProjectAlert, err 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 5f8a388b..6c446a7f 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 @@ -6,9 +6,9 @@ import ( ) type ProjectAlertLifecycle interface { - Create(obj *ProjectAlert) (*ProjectAlert, error) - Remove(obj *ProjectAlert) (*ProjectAlert, error) - Updated(obj *ProjectAlert) (*ProjectAlert, error) + Create(obj *ProjectAlert) (runtime.Object, error) + Remove(obj *ProjectAlert) (runtime.Object, error) + Updated(obj *ProjectAlert) (runtime.Object, error) } type projectAlertLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *projectAlertLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje func NewProjectAlertLifecycleAdapter(name string, clusterScoped bool, client ProjectAlertInterface, l ProjectAlertLifecycle) ProjectAlertHandlerFunc { adapter := &projectAlertLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ProjectAlert) (*ProjectAlert, error) { + return func(key string, obj *ProjectAlert) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ProjectAlert); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 0f648ee3..ffc503a5 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 @@ -35,7 +35,7 @@ type ProjectCatalogList struct { Items []ProjectCatalog } -type ProjectCatalogHandlerFunc func(key string, obj *ProjectCatalog) (*ProjectCatalog, error) +type ProjectCatalogHandlerFunc func(key string, obj *ProjectCatalog) (runtime.Object, error) type ProjectCatalogLister interface { List(namespace string, selector labels.Selector) (ret []*ProjectCatalog, err error) 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 7bf5a9f7..81239f1f 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 @@ -6,9 +6,9 @@ import ( ) type ProjectCatalogLifecycle interface { - Create(obj *ProjectCatalog) (*ProjectCatalog, error) - Remove(obj *ProjectCatalog) (*ProjectCatalog, error) - Updated(obj *ProjectCatalog) (*ProjectCatalog, error) + Create(obj *ProjectCatalog) (runtime.Object, error) + Remove(obj *ProjectCatalog) (runtime.Object, error) + Updated(obj *ProjectCatalog) (runtime.Object, error) } type projectCatalogLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *projectCatalogLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob func NewProjectCatalogLifecycleAdapter(name string, clusterScoped bool, client ProjectCatalogInterface, l ProjectCatalogLifecycle) ProjectCatalogHandlerFunc { adapter := &projectCatalogLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ProjectCatalog) (*ProjectCatalog, error) { + return func(key string, obj *ProjectCatalog) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ProjectCatalog); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 de62ba55..3f23a341 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -35,7 +35,7 @@ type ProjectList struct { Items []Project } -type ProjectHandlerFunc func(key string, obj *Project) (*Project, error) +type ProjectHandlerFunc func(key string, obj *Project) (runtime.Object, error) type ProjectLister interface { List(namespace string, selector labels.Selector) (ret []*Project, err error) 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 4b3a480c..5e47f827 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 @@ -6,9 +6,9 @@ import ( ) type ProjectLifecycle interface { - Create(obj *Project) (*Project, error) - Remove(obj *Project) (*Project, error) - Updated(obj *Project) (*Project, error) + Create(obj *Project) (runtime.Object, error) + Remove(obj *Project) (runtime.Object, error) + Updated(obj *Project) (runtime.Object, error) } type projectLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *projectLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewProjectLifecycleAdapter(name string, clusterScoped bool, client ProjectInterface, l ProjectLifecycle) ProjectHandlerFunc { adapter := &projectLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Project) (*Project, error) { + return func(key string, obj *Project) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Project); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 b273ac63..68de5264 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 @@ -35,7 +35,7 @@ type ProjectLoggingList struct { Items []ProjectLogging } -type ProjectLoggingHandlerFunc func(key string, obj *ProjectLogging) (*ProjectLogging, error) +type ProjectLoggingHandlerFunc func(key string, obj *ProjectLogging) (runtime.Object, error) type ProjectLoggingLister interface { List(namespace string, selector labels.Selector) (ret []*ProjectLogging, err error) 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 f99121ec..2e227c20 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 @@ -6,9 +6,9 @@ import ( ) type ProjectLoggingLifecycle interface { - Create(obj *ProjectLogging) (*ProjectLogging, error) - Remove(obj *ProjectLogging) (*ProjectLogging, error) - Updated(obj *ProjectLogging) (*ProjectLogging, error) + Create(obj *ProjectLogging) (runtime.Object, error) + Remove(obj *ProjectLogging) (runtime.Object, error) + Updated(obj *ProjectLogging) (runtime.Object, error) } type projectLoggingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *projectLoggingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob func NewProjectLoggingLifecycleAdapter(name string, clusterScoped bool, client ProjectLoggingInterface, l ProjectLoggingLifecycle) ProjectLoggingHandlerFunc { adapter := &projectLoggingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ProjectLogging) (*ProjectLogging, error) { + return func(key string, obj *ProjectLogging) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ProjectLogging); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 11fedc8b..a59a9e26 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 @@ -35,7 +35,7 @@ type ProjectNetworkPolicyList struct { Items []ProjectNetworkPolicy } -type ProjectNetworkPolicyHandlerFunc func(key string, obj *ProjectNetworkPolicy) (*ProjectNetworkPolicy, error) +type ProjectNetworkPolicyHandlerFunc func(key string, obj *ProjectNetworkPolicy) (runtime.Object, error) type ProjectNetworkPolicyLister interface { List(namespace string, selector labels.Selector) (ret []*ProjectNetworkPolicy, err error) 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 ecfa78bf..b5298ae8 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 @@ -6,9 +6,9 @@ import ( ) type ProjectNetworkPolicyLifecycle interface { - Create(obj *ProjectNetworkPolicy) (*ProjectNetworkPolicy, error) - Remove(obj *ProjectNetworkPolicy) (*ProjectNetworkPolicy, error) - Updated(obj *ProjectNetworkPolicy) (*ProjectNetworkPolicy, error) + Create(obj *ProjectNetworkPolicy) (runtime.Object, error) + Remove(obj *ProjectNetworkPolicy) (runtime.Object, error) + Updated(obj *ProjectNetworkPolicy) (runtime.Object, error) } type projectNetworkPolicyLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *projectNetworkPolicyLifecycleAdapter) Updated(obj runtime.Object) (runt func NewProjectNetworkPolicyLifecycleAdapter(name string, clusterScoped bool, client ProjectNetworkPolicyInterface, l ProjectNetworkPolicyLifecycle) ProjectNetworkPolicyHandlerFunc { adapter := &projectNetworkPolicyLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ProjectNetworkPolicy) (*ProjectNetworkPolicy, error) { + return func(key string, obj *ProjectNetworkPolicy) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ProjectNetworkPolicy); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 b30aacbd..5cccf0f2 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 @@ -35,7 +35,7 @@ type ProjectRoleTemplateBindingList struct { Items []ProjectRoleTemplateBinding } -type ProjectRoleTemplateBindingHandlerFunc func(key string, obj *ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) +type ProjectRoleTemplateBindingHandlerFunc func(key string, obj *ProjectRoleTemplateBinding) (runtime.Object, error) type ProjectRoleTemplateBindingLister interface { List(namespace string, selector labels.Selector) (ret []*ProjectRoleTemplateBinding, err error) 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 be227eaa..b05de01a 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 @@ -6,9 +6,9 @@ import ( ) type ProjectRoleTemplateBindingLifecycle interface { - Create(obj *ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) - Remove(obj *ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) - Updated(obj *ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) + Create(obj *ProjectRoleTemplateBinding) (runtime.Object, error) + Remove(obj *ProjectRoleTemplateBinding) (runtime.Object, error) + Updated(obj *ProjectRoleTemplateBinding) (runtime.Object, error) } type projectRoleTemplateBindingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *projectRoleTemplateBindingLifecycleAdapter) Updated(obj runtime.Object) func NewProjectRoleTemplateBindingLifecycleAdapter(name string, clusterScoped bool, client ProjectRoleTemplateBindingInterface, l ProjectRoleTemplateBindingLifecycle) ProjectRoleTemplateBindingHandlerFunc { adapter := &projectRoleTemplateBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ProjectRoleTemplateBinding) (*ProjectRoleTemplateBinding, error) { + return func(key string, obj *ProjectRoleTemplateBinding) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ProjectRoleTemplateBinding); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 47f79272..13d7caec 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 @@ -34,7 +34,7 @@ type RoleTemplateList struct { Items []RoleTemplate } -type RoleTemplateHandlerFunc func(key string, obj *RoleTemplate) (*RoleTemplate, error) +type RoleTemplateHandlerFunc func(key string, obj *RoleTemplate) (runtime.Object, error) type RoleTemplateLister interface { List(namespace string, selector labels.Selector) (ret []*RoleTemplate, err error) 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 37c545f8..5c96df0d 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 @@ -6,9 +6,9 @@ import ( ) type RoleTemplateLifecycle interface { - Create(obj *RoleTemplate) (*RoleTemplate, error) - Remove(obj *RoleTemplate) (*RoleTemplate, error) - Updated(obj *RoleTemplate) (*RoleTemplate, error) + Create(obj *RoleTemplate) (runtime.Object, error) + Remove(obj *RoleTemplate) (runtime.Object, error) + Updated(obj *RoleTemplate) (runtime.Object, error) } type roleTemplateLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *roleTemplateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje func NewRoleTemplateLifecycleAdapter(name string, clusterScoped bool, client RoleTemplateInterface, l RoleTemplateLifecycle) RoleTemplateHandlerFunc { adapter := &roleTemplateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *RoleTemplate) (*RoleTemplate, error) { + return func(key string, obj *RoleTemplate) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*RoleTemplate); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 e0133dae..e6845e33 100644 --- a/apis/management.cattle.io/v3/zz_generated_setting_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_setting_controller.go @@ -34,7 +34,7 @@ type SettingList struct { Items []Setting } -type SettingHandlerFunc func(key string, obj *Setting) (*Setting, error) +type SettingHandlerFunc func(key string, obj *Setting) (runtime.Object, error) type SettingLister interface { List(namespace string, selector labels.Selector) (ret []*Setting, err error) 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 e4ebaacb..62426698 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 @@ -6,9 +6,9 @@ import ( ) type SettingLifecycle interface { - Create(obj *Setting) (*Setting, error) - Remove(obj *Setting) (*Setting, error) - Updated(obj *Setting) (*Setting, error) + Create(obj *Setting) (runtime.Object, error) + Remove(obj *Setting) (runtime.Object, error) + Updated(obj *Setting) (runtime.Object, error) } type settingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *settingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewSettingLifecycleAdapter(name string, clusterScoped bool, client SettingInterface, l SettingLifecycle) SettingHandlerFunc { adapter := &settingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Setting) (*Setting, error) { + return func(key string, obj *Setting) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Setting); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 a8a863ca..205d81b2 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 @@ -34,7 +34,7 @@ type TemplateContentList struct { Items []TemplateContent } -type TemplateContentHandlerFunc func(key string, obj *TemplateContent) (*TemplateContent, error) +type TemplateContentHandlerFunc func(key string, obj *TemplateContent) (runtime.Object, error) type TemplateContentLister interface { List(namespace string, selector labels.Selector) (ret []*TemplateContent, err error) 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 2dcdacb8..7eac4a2e 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 @@ -6,9 +6,9 @@ import ( ) type TemplateContentLifecycle interface { - Create(obj *TemplateContent) (*TemplateContent, error) - Remove(obj *TemplateContent) (*TemplateContent, error) - Updated(obj *TemplateContent) (*TemplateContent, error) + Create(obj *TemplateContent) (runtime.Object, error) + Remove(obj *TemplateContent) (runtime.Object, error) + Updated(obj *TemplateContent) (runtime.Object, error) } type templateContentLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *templateContentLifecycleAdapter) Updated(obj runtime.Object) (runtime.O func NewTemplateContentLifecycleAdapter(name string, clusterScoped bool, client TemplateContentInterface, l TemplateContentLifecycle) TemplateContentHandlerFunc { adapter := &templateContentLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *TemplateContent) (*TemplateContent, error) { + return func(key string, obj *TemplateContent) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*TemplateContent); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 6db8b23c..e62f4e85 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_controller.go @@ -34,7 +34,7 @@ type TemplateList struct { Items []Template } -type TemplateHandlerFunc func(key string, obj *Template) (*Template, error) +type TemplateHandlerFunc func(key string, obj *Template) (runtime.Object, error) type TemplateLister interface { List(namespace string, selector labels.Selector) (ret []*Template, err error) 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 f3c6c878..0e579265 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 @@ -6,9 +6,9 @@ import ( ) type TemplateLifecycle interface { - Create(obj *Template) (*Template, error) - Remove(obj *Template) (*Template, error) - Updated(obj *Template) (*Template, error) + Create(obj *Template) (runtime.Object, error) + Remove(obj *Template) (runtime.Object, error) + Updated(obj *Template) (runtime.Object, error) } type templateLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *templateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewTemplateLifecycleAdapter(name string, clusterScoped bool, client TemplateInterface, l TemplateLifecycle) TemplateHandlerFunc { adapter := &templateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Template) (*Template, error) { + return func(key string, obj *Template) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Template); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 bc3e01fa..ffc3c876 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 @@ -34,7 +34,7 @@ type TemplateVersionList struct { Items []TemplateVersion } -type TemplateVersionHandlerFunc func(key string, obj *TemplateVersion) (*TemplateVersion, error) +type TemplateVersionHandlerFunc func(key string, obj *TemplateVersion) (runtime.Object, error) type TemplateVersionLister interface { List(namespace string, selector labels.Selector) (ret []*TemplateVersion, err error) 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 30989d84..36113ac7 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 @@ -6,9 +6,9 @@ import ( ) type TemplateVersionLifecycle interface { - Create(obj *TemplateVersion) (*TemplateVersion, error) - Remove(obj *TemplateVersion) (*TemplateVersion, error) - Updated(obj *TemplateVersion) (*TemplateVersion, error) + Create(obj *TemplateVersion) (runtime.Object, error) + Remove(obj *TemplateVersion) (runtime.Object, error) + Updated(obj *TemplateVersion) (runtime.Object, error) } type templateVersionLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *templateVersionLifecycleAdapter) Updated(obj runtime.Object) (runtime.O func NewTemplateVersionLifecycleAdapter(name string, clusterScoped bool, client TemplateVersionInterface, l TemplateVersionLifecycle) TemplateVersionHandlerFunc { adapter := &templateVersionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *TemplateVersion) (*TemplateVersion, error) { + return func(key string, obj *TemplateVersion) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*TemplateVersion); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 a2f4d580..433bb156 100644 --- a/apis/management.cattle.io/v3/zz_generated_token_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_token_controller.go @@ -34,7 +34,7 @@ type TokenList struct { Items []Token } -type TokenHandlerFunc func(key string, obj *Token) (*Token, error) +type TokenHandlerFunc func(key string, obj *Token) (runtime.Object, error) type TokenLister interface { List(namespace string, selector labels.Selector) (ret []*Token, err error) 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 72fe9575..356f7fb2 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 @@ -6,9 +6,9 @@ import ( ) type TokenLifecycle interface { - Create(obj *Token) (*Token, error) - Remove(obj *Token) (*Token, error) - Updated(obj *Token) (*Token, error) + Create(obj *Token) (runtime.Object, error) + Remove(obj *Token) (runtime.Object, error) + Updated(obj *Token) (runtime.Object, error) } type tokenLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *tokenLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, err func NewTokenLifecycleAdapter(name string, clusterScoped bool, client TokenInterface, l TokenLifecycle) TokenHandlerFunc { adapter := &tokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Token) (*Token, error) { + return func(key string, obj *Token) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Token); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 914f77ce..6b3c3e57 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 @@ -34,7 +34,7 @@ type UserAttributeList struct { Items []UserAttribute } -type UserAttributeHandlerFunc func(key string, obj *UserAttribute) (*UserAttribute, error) +type UserAttributeHandlerFunc func(key string, obj *UserAttribute) (runtime.Object, error) type UserAttributeLister interface { List(namespace string, selector labels.Selector) (ret []*UserAttribute, err error) 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 c14b395b..a323f71f 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 @@ -6,9 +6,9 @@ import ( ) type UserAttributeLifecycle interface { - Create(obj *UserAttribute) (*UserAttribute, error) - Remove(obj *UserAttribute) (*UserAttribute, error) - Updated(obj *UserAttribute) (*UserAttribute, error) + Create(obj *UserAttribute) (runtime.Object, error) + Remove(obj *UserAttribute) (runtime.Object, error) + Updated(obj *UserAttribute) (runtime.Object, error) } type userAttributeLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *userAttributeLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj func NewUserAttributeLifecycleAdapter(name string, clusterScoped bool, client UserAttributeInterface, l UserAttributeLifecycle) UserAttributeHandlerFunc { adapter := &userAttributeLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *UserAttribute) (*UserAttribute, error) { + return func(key string, obj *UserAttribute) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*UserAttribute); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 67963a3d..32b404c0 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_user_controller.go @@ -34,7 +34,7 @@ type UserList struct { Items []User } -type UserHandlerFunc func(key string, obj *User) (*User, error) +type UserHandlerFunc func(key string, obj *User) (runtime.Object, error) type UserLister interface { List(namespace string, selector labels.Selector) (ret []*User, err error) 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 75f036a4..e18e2f9d 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 @@ -6,9 +6,9 @@ import ( ) type UserLifecycle interface { - Create(obj *User) (*User, error) - Remove(obj *User) (*User, error) - Updated(obj *User) (*User, error) + Create(obj *User) (runtime.Object, error) + Remove(obj *User) (runtime.Object, error) + Updated(obj *User) (runtime.Object, error) } type userLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *userLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro func NewUserLifecycleAdapter(name string, clusterScoped bool, client UserInterface, l UserLifecycle) UserHandlerFunc { adapter := &userLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *User) (*User, error) { + return func(key string, obj *User) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*User); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 d4c58fba..5fd146b2 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 @@ -34,7 +34,7 @@ type AuthProviderList struct { Items []AuthProvider } -type AuthProviderHandlerFunc func(key string, obj *AuthProvider) (*AuthProvider, error) +type AuthProviderHandlerFunc func(key string, obj *AuthProvider) (runtime.Object, error) type AuthProviderLister interface { List(namespace string, selector labels.Selector) (ret []*AuthProvider, err error) 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 3e1fbf60..25285d81 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 @@ -6,9 +6,9 @@ import ( ) type AuthProviderLifecycle interface { - Create(obj *AuthProvider) (*AuthProvider, error) - Remove(obj *AuthProvider) (*AuthProvider, error) - Updated(obj *AuthProvider) (*AuthProvider, error) + Create(obj *AuthProvider) (runtime.Object, error) + Remove(obj *AuthProvider) (runtime.Object, error) + Updated(obj *AuthProvider) (runtime.Object, error) } type authProviderLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *authProviderLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obje func NewAuthProviderLifecycleAdapter(name string, clusterScoped bool, client AuthProviderInterface, l AuthProviderLifecycle) AuthProviderHandlerFunc { adapter := &authProviderLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *AuthProvider) (*AuthProvider, error) { + return func(key string, obj *AuthProvider) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*AuthProvider); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 821f799c..75129345 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 @@ -36,7 +36,7 @@ type NetworkPolicyList struct { Items []v1.NetworkPolicy } -type NetworkPolicyHandlerFunc func(key string, obj *v1.NetworkPolicy) (*v1.NetworkPolicy, error) +type NetworkPolicyHandlerFunc func(key string, obj *v1.NetworkPolicy) (runtime.Object, error) type NetworkPolicyLister interface { List(namespace string, selector labels.Selector) (ret []*v1.NetworkPolicy, err error) 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 66de4ce5..dbb9e9ce 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 @@ -7,9 +7,9 @@ import ( ) type NetworkPolicyLifecycle interface { - Create(obj *v1.NetworkPolicy) (*v1.NetworkPolicy, error) - Remove(obj *v1.NetworkPolicy) (*v1.NetworkPolicy, error) - Updated(obj *v1.NetworkPolicy) (*v1.NetworkPolicy, error) + Create(obj *v1.NetworkPolicy) (runtime.Object, error) + Remove(obj *v1.NetworkPolicy) (runtime.Object, error) + Updated(obj *v1.NetworkPolicy) (runtime.Object, error) } type networkPolicyLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *networkPolicyLifecycleAdapter) Updated(obj runtime.Object) (runtime.Obj func NewNetworkPolicyLifecycleAdapter(name string, clusterScoped bool, client NetworkPolicyInterface, l NetworkPolicyLifecycle) NetworkPolicyHandlerFunc { adapter := &networkPolicyLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.NetworkPolicy) (*v1.NetworkPolicy, error) { + return func(key string, obj *v1.NetworkPolicy) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.NetworkPolicy); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 f5d21de2..2bed92e4 100644 --- a/apis/project.cattle.io/v3/zz_generated_app_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_app_controller.go @@ -35,7 +35,7 @@ type AppList struct { Items []App } -type AppHandlerFunc func(key string, obj *App) (*App, error) +type AppHandlerFunc func(key string, obj *App) (runtime.Object, error) type AppLister interface { List(namespace string, selector labels.Selector) (ret []*App, err error) 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 ba1cd49d..d1c7b3f2 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 @@ -6,9 +6,9 @@ import ( ) type AppLifecycle interface { - Create(obj *App) (*App, error) - Remove(obj *App) (*App, error) - Updated(obj *App) (*App, error) + Create(obj *App) (runtime.Object, error) + Remove(obj *App) (runtime.Object, error) + Updated(obj *App) (runtime.Object, error) } type appLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *appLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, error func NewAppLifecycleAdapter(name string, clusterScoped bool, client AppInterface, l AppLifecycle) AppHandlerFunc { adapter := &appLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *App) (*App, error) { + return func(key string, obj *App) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*App); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 52a32408..6502ba9e 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 @@ -35,7 +35,7 @@ type AppRevisionList struct { Items []AppRevision } -type AppRevisionHandlerFunc func(key string, obj *AppRevision) (*AppRevision, error) +type AppRevisionHandlerFunc func(key string, obj *AppRevision) (runtime.Object, error) type AppRevisionLister interface { List(namespace string, selector labels.Selector) (ret []*AppRevision, err error) 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 70d11f67..682317d1 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 @@ -6,9 +6,9 @@ import ( ) type AppRevisionLifecycle interface { - Create(obj *AppRevision) (*AppRevision, error) - Remove(obj *AppRevision) (*AppRevision, error) - Updated(obj *AppRevision) (*AppRevision, error) + Create(obj *AppRevision) (runtime.Object, error) + Remove(obj *AppRevision) (runtime.Object, error) + Updated(obj *AppRevision) (runtime.Object, error) } type appRevisionLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *appRevisionLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec func NewAppRevisionLifecycleAdapter(name string, clusterScoped bool, client AppRevisionInterface, l AppRevisionLifecycle) AppRevisionHandlerFunc { adapter := &appRevisionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *AppRevision) (*AppRevision, error) { + return func(key string, obj *AppRevision) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*AppRevision); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 41b5d132..5f6b8fbc 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 @@ -35,7 +35,7 @@ type BasicAuthList struct { Items []BasicAuth } -type BasicAuthHandlerFunc func(key string, obj *BasicAuth) (*BasicAuth, error) +type BasicAuthHandlerFunc func(key string, obj *BasicAuth) (runtime.Object, error) type BasicAuthLister interface { List(namespace string, selector labels.Selector) (ret []*BasicAuth, err error) 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 8acc5c7e..a49449f5 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 @@ -6,9 +6,9 @@ import ( ) type BasicAuthLifecycle interface { - Create(obj *BasicAuth) (*BasicAuth, error) - Remove(obj *BasicAuth) (*BasicAuth, error) - Updated(obj *BasicAuth) (*BasicAuth, error) + Create(obj *BasicAuth) (runtime.Object, error) + Remove(obj *BasicAuth) (runtime.Object, error) + Updated(obj *BasicAuth) (runtime.Object, error) } type basicAuthLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *basicAuthLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewBasicAuthLifecycleAdapter(name string, clusterScoped bool, client BasicAuthInterface, l BasicAuthLifecycle) BasicAuthHandlerFunc { adapter := &basicAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *BasicAuth) (*BasicAuth, error) { + return func(key string, obj *BasicAuth) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*BasicAuth); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 18845aa9..937a59be 100644 --- a/apis/project.cattle.io/v3/zz_generated_certificate_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_certificate_controller.go @@ -35,7 +35,7 @@ type CertificateList struct { Items []Certificate } -type CertificateHandlerFunc func(key string, obj *Certificate) (*Certificate, error) +type CertificateHandlerFunc func(key string, obj *Certificate) (runtime.Object, error) type CertificateLister interface { List(namespace string, selector labels.Selector) (ret []*Certificate, err error) 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 d21ed287..60708544 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 @@ -6,9 +6,9 @@ import ( ) type CertificateLifecycle interface { - Create(obj *Certificate) (*Certificate, error) - Remove(obj *Certificate) (*Certificate, error) - Updated(obj *Certificate) (*Certificate, error) + Create(obj *Certificate) (runtime.Object, error) + Remove(obj *Certificate) (runtime.Object, error) + Updated(obj *Certificate) (runtime.Object, error) } type certificateLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *certificateLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec func NewCertificateLifecycleAdapter(name string, clusterScoped bool, client CertificateInterface, l CertificateLifecycle) CertificateHandlerFunc { adapter := &certificateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Certificate) (*Certificate, error) { + return func(key string, obj *Certificate) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Certificate); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 6406d1d0..7b6d8796 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 @@ -35,7 +35,7 @@ type DockerCredentialList struct { Items []DockerCredential } -type DockerCredentialHandlerFunc func(key string, obj *DockerCredential) (*DockerCredential, error) +type DockerCredentialHandlerFunc func(key string, obj *DockerCredential) (runtime.Object, error) type DockerCredentialLister interface { List(namespace string, selector labels.Selector) (ret []*DockerCredential, err error) 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 e1ceddc2..333a7d63 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 @@ -6,9 +6,9 @@ import ( ) type DockerCredentialLifecycle interface { - Create(obj *DockerCredential) (*DockerCredential, error) - Remove(obj *DockerCredential) (*DockerCredential, error) - Updated(obj *DockerCredential) (*DockerCredential, error) + Create(obj *DockerCredential) (runtime.Object, error) + Remove(obj *DockerCredential) (runtime.Object, error) + Updated(obj *DockerCredential) (runtime.Object, error) } type dockerCredentialLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *dockerCredentialLifecycleAdapter) Updated(obj runtime.Object) (runtime. func NewDockerCredentialLifecycleAdapter(name string, clusterScoped bool, client DockerCredentialInterface, l DockerCredentialLifecycle) DockerCredentialHandlerFunc { adapter := &dockerCredentialLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *DockerCredential) (*DockerCredential, error) { + return func(key string, obj *DockerCredential) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*DockerCredential); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 4a61e778..6a6ec4a1 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 @@ -35,7 +35,7 @@ type NamespacedBasicAuthList struct { Items []NamespacedBasicAuth } -type NamespacedBasicAuthHandlerFunc func(key string, obj *NamespacedBasicAuth) (*NamespacedBasicAuth, error) +type NamespacedBasicAuthHandlerFunc func(key string, obj *NamespacedBasicAuth) (runtime.Object, error) type NamespacedBasicAuthLister interface { List(namespace string, selector labels.Selector) (ret []*NamespacedBasicAuth, err error) 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 461675d7..3518f99a 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 @@ -6,9 +6,9 @@ import ( ) type NamespacedBasicAuthLifecycle interface { - Create(obj *NamespacedBasicAuth) (*NamespacedBasicAuth, error) - Remove(obj *NamespacedBasicAuth) (*NamespacedBasicAuth, error) - Updated(obj *NamespacedBasicAuth) (*NamespacedBasicAuth, error) + Create(obj *NamespacedBasicAuth) (runtime.Object, error) + Remove(obj *NamespacedBasicAuth) (runtime.Object, error) + Updated(obj *NamespacedBasicAuth) (runtime.Object, error) } type namespacedBasicAuthLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *namespacedBasicAuthLifecycleAdapter) Updated(obj runtime.Object) (runti func NewNamespacedBasicAuthLifecycleAdapter(name string, clusterScoped bool, client NamespacedBasicAuthInterface, l NamespacedBasicAuthLifecycle) NamespacedBasicAuthHandlerFunc { adapter := &namespacedBasicAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NamespacedBasicAuth) (*NamespacedBasicAuth, error) { + return func(key string, obj *NamespacedBasicAuth) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NamespacedBasicAuth); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 0882f35f..0465890a 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 @@ -35,7 +35,7 @@ type NamespacedCertificateList struct { Items []NamespacedCertificate } -type NamespacedCertificateHandlerFunc func(key string, obj *NamespacedCertificate) (*NamespacedCertificate, error) +type NamespacedCertificateHandlerFunc func(key string, obj *NamespacedCertificate) (runtime.Object, error) type NamespacedCertificateLister interface { List(namespace string, selector labels.Selector) (ret []*NamespacedCertificate, err error) 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 c4a4d33e..65d3a326 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 @@ -6,9 +6,9 @@ import ( ) type NamespacedCertificateLifecycle interface { - Create(obj *NamespacedCertificate) (*NamespacedCertificate, error) - Remove(obj *NamespacedCertificate) (*NamespacedCertificate, error) - Updated(obj *NamespacedCertificate) (*NamespacedCertificate, error) + Create(obj *NamespacedCertificate) (runtime.Object, error) + Remove(obj *NamespacedCertificate) (runtime.Object, error) + Updated(obj *NamespacedCertificate) (runtime.Object, error) } type namespacedCertificateLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *namespacedCertificateLifecycleAdapter) Updated(obj runtime.Object) (run func NewNamespacedCertificateLifecycleAdapter(name string, clusterScoped bool, client NamespacedCertificateInterface, l NamespacedCertificateLifecycle) NamespacedCertificateHandlerFunc { adapter := &namespacedCertificateLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NamespacedCertificate) (*NamespacedCertificate, error) { + return func(key string, obj *NamespacedCertificate) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NamespacedCertificate); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 d7454e9f..22780824 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 @@ -35,7 +35,7 @@ type NamespacedDockerCredentialList struct { Items []NamespacedDockerCredential } -type NamespacedDockerCredentialHandlerFunc func(key string, obj *NamespacedDockerCredential) (*NamespacedDockerCredential, error) +type NamespacedDockerCredentialHandlerFunc func(key string, obj *NamespacedDockerCredential) (runtime.Object, error) type NamespacedDockerCredentialLister interface { List(namespace string, selector labels.Selector) (ret []*NamespacedDockerCredential, err error) 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 33d70b37..d17a6c77 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 @@ -6,9 +6,9 @@ import ( ) type NamespacedDockerCredentialLifecycle interface { - Create(obj *NamespacedDockerCredential) (*NamespacedDockerCredential, error) - Remove(obj *NamespacedDockerCredential) (*NamespacedDockerCredential, error) - Updated(obj *NamespacedDockerCredential) (*NamespacedDockerCredential, error) + Create(obj *NamespacedDockerCredential) (runtime.Object, error) + Remove(obj *NamespacedDockerCredential) (runtime.Object, error) + Updated(obj *NamespacedDockerCredential) (runtime.Object, error) } type namespacedDockerCredentialLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *namespacedDockerCredentialLifecycleAdapter) Updated(obj runtime.Object) func NewNamespacedDockerCredentialLifecycleAdapter(name string, clusterScoped bool, client NamespacedDockerCredentialInterface, l NamespacedDockerCredentialLifecycle) NamespacedDockerCredentialHandlerFunc { adapter := &namespacedDockerCredentialLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NamespacedDockerCredential) (*NamespacedDockerCredential, error) { + return func(key string, obj *NamespacedDockerCredential) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NamespacedDockerCredential); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 8d95a6f2..14d67c0e 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 @@ -35,7 +35,7 @@ type NamespacedServiceAccountTokenList struct { Items []NamespacedServiceAccountToken } -type NamespacedServiceAccountTokenHandlerFunc func(key string, obj *NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) +type NamespacedServiceAccountTokenHandlerFunc func(key string, obj *NamespacedServiceAccountToken) (runtime.Object, error) type NamespacedServiceAccountTokenLister interface { List(namespace string, selector labels.Selector) (ret []*NamespacedServiceAccountToken, err error) 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 8868cbb8..05e0dd91 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 @@ -6,9 +6,9 @@ import ( ) type NamespacedServiceAccountTokenLifecycle interface { - Create(obj *NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) - Remove(obj *NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) - Updated(obj *NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) + Create(obj *NamespacedServiceAccountToken) (runtime.Object, error) + Remove(obj *NamespacedServiceAccountToken) (runtime.Object, error) + Updated(obj *NamespacedServiceAccountToken) (runtime.Object, error) } type namespacedServiceAccountTokenLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *namespacedServiceAccountTokenLifecycleAdapter) Updated(obj runtime.Obje func NewNamespacedServiceAccountTokenLifecycleAdapter(name string, clusterScoped bool, client NamespacedServiceAccountTokenInterface, l NamespacedServiceAccountTokenLifecycle) NamespacedServiceAccountTokenHandlerFunc { adapter := &namespacedServiceAccountTokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NamespacedServiceAccountToken) (*NamespacedServiceAccountToken, error) { + return func(key string, obj *NamespacedServiceAccountToken) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NamespacedServiceAccountToken); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 2c0f16d7..55019f47 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 @@ -35,7 +35,7 @@ type NamespacedSSHAuthList struct { Items []NamespacedSSHAuth } -type NamespacedSSHAuthHandlerFunc func(key string, obj *NamespacedSSHAuth) (*NamespacedSSHAuth, error) +type NamespacedSSHAuthHandlerFunc func(key string, obj *NamespacedSSHAuth) (runtime.Object, error) type NamespacedSSHAuthLister interface { List(namespace string, selector labels.Selector) (ret []*NamespacedSSHAuth, err error) 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 c3039778..3b04c7b0 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 @@ -6,9 +6,9 @@ import ( ) type NamespacedSSHAuthLifecycle interface { - Create(obj *NamespacedSSHAuth) (*NamespacedSSHAuth, error) - Remove(obj *NamespacedSSHAuth) (*NamespacedSSHAuth, error) - Updated(obj *NamespacedSSHAuth) (*NamespacedSSHAuth, error) + Create(obj *NamespacedSSHAuth) (runtime.Object, error) + Remove(obj *NamespacedSSHAuth) (runtime.Object, error) + Updated(obj *NamespacedSSHAuth) (runtime.Object, error) } type namespacedSshAuthLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *namespacedSshAuthLifecycleAdapter) Updated(obj runtime.Object) (runtime func NewNamespacedSSHAuthLifecycleAdapter(name string, clusterScoped bool, client NamespacedSSHAuthInterface, l NamespacedSSHAuthLifecycle) NamespacedSSHAuthHandlerFunc { adapter := &namespacedSshAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *NamespacedSSHAuth) (*NamespacedSSHAuth, error) { + return func(key string, obj *NamespacedSSHAuth) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*NamespacedSSHAuth); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 b3905120..b925fdd4 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go @@ -35,7 +35,7 @@ type PipelineList struct { Items []Pipeline } -type PipelineHandlerFunc func(key string, obj *Pipeline) (*Pipeline, error) +type PipelineHandlerFunc func(key string, obj *Pipeline) (runtime.Object, error) type PipelineLister interface { List(namespace string, selector labels.Selector) (ret []*Pipeline, err error) 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 3e82b1dd..a51874f4 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 @@ -35,7 +35,7 @@ type PipelineExecutionList struct { Items []PipelineExecution } -type PipelineExecutionHandlerFunc func(key string, obj *PipelineExecution) (*PipelineExecution, error) +type PipelineExecutionHandlerFunc func(key string, obj *PipelineExecution) (runtime.Object, error) type PipelineExecutionLister interface { List(namespace string, selector labels.Selector) (ret []*PipelineExecution, err error) 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 bc9817f7..0b2d683a 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 @@ -6,9 +6,9 @@ import ( ) type PipelineExecutionLifecycle interface { - Create(obj *PipelineExecution) (*PipelineExecution, error) - Remove(obj *PipelineExecution) (*PipelineExecution, error) - Updated(obj *PipelineExecution) (*PipelineExecution, error) + Create(obj *PipelineExecution) (runtime.Object, error) + Remove(obj *PipelineExecution) (runtime.Object, error) + Updated(obj *PipelineExecution) (runtime.Object, error) } type pipelineExecutionLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *pipelineExecutionLifecycleAdapter) Updated(obj runtime.Object) (runtime func NewPipelineExecutionLifecycleAdapter(name string, clusterScoped bool, client PipelineExecutionInterface, l PipelineExecutionLifecycle) PipelineExecutionHandlerFunc { adapter := &pipelineExecutionLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *PipelineExecution) (*PipelineExecution, error) { + return func(key string, obj *PipelineExecution) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*PipelineExecution); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 9ab89de7..4f971fa1 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 @@ -6,9 +6,9 @@ import ( ) type PipelineLifecycle interface { - Create(obj *Pipeline) (*Pipeline, error) - Remove(obj *Pipeline) (*Pipeline, error) - Updated(obj *Pipeline) (*Pipeline, error) + Create(obj *Pipeline) (runtime.Object, error) + Remove(obj *Pipeline) (runtime.Object, error) + Updated(obj *Pipeline) (runtime.Object, error) } type pipelineLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *pipelineLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewPipelineLifecycleAdapter(name string, clusterScoped bool, client PipelineInterface, l PipelineLifecycle) PipelineHandlerFunc { adapter := &pipelineLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Pipeline) (*Pipeline, error) { + return func(key string, obj *Pipeline) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Pipeline); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 e1fa7147..48a6174a 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 @@ -35,7 +35,7 @@ type PipelineSettingList struct { Items []PipelineSetting } -type PipelineSettingHandlerFunc func(key string, obj *PipelineSetting) (*PipelineSetting, error) +type PipelineSettingHandlerFunc func(key string, obj *PipelineSetting) (runtime.Object, error) type PipelineSettingLister interface { List(namespace string, selector labels.Selector) (ret []*PipelineSetting, err error) 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 04a42772..915bf438 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 @@ -6,9 +6,9 @@ import ( ) type PipelineSettingLifecycle interface { - Create(obj *PipelineSetting) (*PipelineSetting, error) - Remove(obj *PipelineSetting) (*PipelineSetting, error) - Updated(obj *PipelineSetting) (*PipelineSetting, error) + Create(obj *PipelineSetting) (runtime.Object, error) + Remove(obj *PipelineSetting) (runtime.Object, error) + Updated(obj *PipelineSetting) (runtime.Object, error) } type pipelineSettingLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *pipelineSettingLifecycleAdapter) Updated(obj runtime.Object) (runtime.O func NewPipelineSettingLifecycleAdapter(name string, clusterScoped bool, client PipelineSettingInterface, l PipelineSettingLifecycle) PipelineSettingHandlerFunc { adapter := &pipelineSettingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *PipelineSetting) (*PipelineSetting, error) { + return func(key string, obj *PipelineSetting) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*PipelineSetting); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 286b9c08..7fc40695 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 @@ -35,7 +35,7 @@ type ServiceAccountTokenList struct { Items []ServiceAccountToken } -type ServiceAccountTokenHandlerFunc func(key string, obj *ServiceAccountToken) (*ServiceAccountToken, error) +type ServiceAccountTokenHandlerFunc func(key string, obj *ServiceAccountToken) (runtime.Object, error) type ServiceAccountTokenLister interface { List(namespace string, selector labels.Selector) (ret []*ServiceAccountToken, err error) 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 5b84e5f8..370c5c2d 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 @@ -6,9 +6,9 @@ import ( ) type ServiceAccountTokenLifecycle interface { - Create(obj *ServiceAccountToken) (*ServiceAccountToken, error) - Remove(obj *ServiceAccountToken) (*ServiceAccountToken, error) - Updated(obj *ServiceAccountToken) (*ServiceAccountToken, error) + Create(obj *ServiceAccountToken) (runtime.Object, error) + Remove(obj *ServiceAccountToken) (runtime.Object, error) + Updated(obj *ServiceAccountToken) (runtime.Object, error) } type serviceAccountTokenLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *serviceAccountTokenLifecycleAdapter) Updated(obj runtime.Object) (runti func NewServiceAccountTokenLifecycleAdapter(name string, clusterScoped bool, client ServiceAccountTokenInterface, l ServiceAccountTokenLifecycle) ServiceAccountTokenHandlerFunc { adapter := &serviceAccountTokenLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *ServiceAccountToken) (*ServiceAccountToken, error) { + return func(key string, obj *ServiceAccountToken) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*ServiceAccountToken); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 b97faf3c..8b3c68a4 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 @@ -35,7 +35,7 @@ type SourceCodeCredentialList struct { Items []SourceCodeCredential } -type SourceCodeCredentialHandlerFunc func(key string, obj *SourceCodeCredential) (*SourceCodeCredential, error) +type SourceCodeCredentialHandlerFunc func(key string, obj *SourceCodeCredential) (runtime.Object, error) type SourceCodeCredentialLister interface { List(namespace string, selector labels.Selector) (ret []*SourceCodeCredential, err error) 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 d02ae1cc..d9f76499 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 @@ -6,9 +6,9 @@ import ( ) type SourceCodeCredentialLifecycle interface { - Create(obj *SourceCodeCredential) (*SourceCodeCredential, error) - Remove(obj *SourceCodeCredential) (*SourceCodeCredential, error) - Updated(obj *SourceCodeCredential) (*SourceCodeCredential, error) + Create(obj *SourceCodeCredential) (runtime.Object, error) + Remove(obj *SourceCodeCredential) (runtime.Object, error) + Updated(obj *SourceCodeCredential) (runtime.Object, error) } type sourceCodeCredentialLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *sourceCodeCredentialLifecycleAdapter) Updated(obj runtime.Object) (runt func NewSourceCodeCredentialLifecycleAdapter(name string, clusterScoped bool, client SourceCodeCredentialInterface, l SourceCodeCredentialLifecycle) SourceCodeCredentialHandlerFunc { adapter := &sourceCodeCredentialLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *SourceCodeCredential) (*SourceCodeCredential, error) { + return func(key string, obj *SourceCodeCredential) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*SourceCodeCredential); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 65d98990..155feb92 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 @@ -35,7 +35,7 @@ type SourceCodeProviderConfigList struct { Items []SourceCodeProviderConfig } -type SourceCodeProviderConfigHandlerFunc func(key string, obj *SourceCodeProviderConfig) (*SourceCodeProviderConfig, error) +type SourceCodeProviderConfigHandlerFunc func(key string, obj *SourceCodeProviderConfig) (runtime.Object, error) type SourceCodeProviderConfigLister interface { List(namespace string, selector labels.Selector) (ret []*SourceCodeProviderConfig, err error) 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 7c35b22d..e9097cae 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 @@ -6,9 +6,9 @@ import ( ) type SourceCodeProviderConfigLifecycle interface { - Create(obj *SourceCodeProviderConfig) (*SourceCodeProviderConfig, error) - Remove(obj *SourceCodeProviderConfig) (*SourceCodeProviderConfig, error) - Updated(obj *SourceCodeProviderConfig) (*SourceCodeProviderConfig, error) + Create(obj *SourceCodeProviderConfig) (runtime.Object, error) + Remove(obj *SourceCodeProviderConfig) (runtime.Object, error) + Updated(obj *SourceCodeProviderConfig) (runtime.Object, error) } type sourceCodeProviderConfigLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *sourceCodeProviderConfigLifecycleAdapter) Updated(obj runtime.Object) ( func NewSourceCodeProviderConfigLifecycleAdapter(name string, clusterScoped bool, client SourceCodeProviderConfigInterface, l SourceCodeProviderConfigLifecycle) SourceCodeProviderConfigHandlerFunc { adapter := &sourceCodeProviderConfigLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *SourceCodeProviderConfig) (*SourceCodeProviderConfig, error) { + return func(key string, obj *SourceCodeProviderConfig) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*SourceCodeProviderConfig); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 c8864ac0..a077b306 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 @@ -34,7 +34,7 @@ type SourceCodeProviderList struct { Items []SourceCodeProvider } -type SourceCodeProviderHandlerFunc func(key string, obj *SourceCodeProvider) (*SourceCodeProvider, error) +type SourceCodeProviderHandlerFunc func(key string, obj *SourceCodeProvider) (runtime.Object, error) type SourceCodeProviderLister interface { List(namespace string, selector labels.Selector) (ret []*SourceCodeProvider, err error) 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 4bd51fd9..e84d5de3 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 @@ -6,9 +6,9 @@ import ( ) type SourceCodeProviderLifecycle interface { - Create(obj *SourceCodeProvider) (*SourceCodeProvider, error) - Remove(obj *SourceCodeProvider) (*SourceCodeProvider, error) - Updated(obj *SourceCodeProvider) (*SourceCodeProvider, error) + Create(obj *SourceCodeProvider) (runtime.Object, error) + Remove(obj *SourceCodeProvider) (runtime.Object, error) + Updated(obj *SourceCodeProvider) (runtime.Object, error) } type sourceCodeProviderLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *sourceCodeProviderLifecycleAdapter) Updated(obj runtime.Object) (runtim func NewSourceCodeProviderLifecycleAdapter(name string, clusterScoped bool, client SourceCodeProviderInterface, l SourceCodeProviderLifecycle) SourceCodeProviderHandlerFunc { adapter := &sourceCodeProviderLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *SourceCodeProvider) (*SourceCodeProvider, error) { + return func(key string, obj *SourceCodeProvider) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*SourceCodeProvider); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 7b764f53..0f717b29 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 @@ -35,7 +35,7 @@ type SourceCodeRepositoryList struct { Items []SourceCodeRepository } -type SourceCodeRepositoryHandlerFunc func(key string, obj *SourceCodeRepository) (*SourceCodeRepository, error) +type SourceCodeRepositoryHandlerFunc func(key string, obj *SourceCodeRepository) (runtime.Object, error) type SourceCodeRepositoryLister interface { List(namespace string, selector labels.Selector) (ret []*SourceCodeRepository, err error) 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 bf2b01c4..c7c4c1c8 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 @@ -6,9 +6,9 @@ import ( ) type SourceCodeRepositoryLifecycle interface { - Create(obj *SourceCodeRepository) (*SourceCodeRepository, error) - Remove(obj *SourceCodeRepository) (*SourceCodeRepository, error) - Updated(obj *SourceCodeRepository) (*SourceCodeRepository, error) + Create(obj *SourceCodeRepository) (runtime.Object, error) + Remove(obj *SourceCodeRepository) (runtime.Object, error) + Updated(obj *SourceCodeRepository) (runtime.Object, error) } type sourceCodeRepositoryLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *sourceCodeRepositoryLifecycleAdapter) Updated(obj runtime.Object) (runt func NewSourceCodeRepositoryLifecycleAdapter(name string, clusterScoped bool, client SourceCodeRepositoryInterface, l SourceCodeRepositoryLifecycle) SourceCodeRepositoryHandlerFunc { adapter := &sourceCodeRepositoryLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *SourceCodeRepository) (*SourceCodeRepository, error) { + return func(key string, obj *SourceCodeRepository) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*SourceCodeRepository); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 a8bd5845..ec45d3f7 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 @@ -35,7 +35,7 @@ type SSHAuthList struct { Items []SSHAuth } -type SSHAuthHandlerFunc func(key string, obj *SSHAuth) (*SSHAuth, error) +type SSHAuthHandlerFunc func(key string, obj *SSHAuth) (runtime.Object, error) type SSHAuthLister interface { List(namespace string, selector labels.Selector) (ret []*SSHAuth, err error) 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 15797189..c428c4c6 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 @@ -6,9 +6,9 @@ import ( ) type SSHAuthLifecycle interface { - Create(obj *SSHAuth) (*SSHAuth, error) - Remove(obj *SSHAuth) (*SSHAuth, error) - Updated(obj *SSHAuth) (*SSHAuth, error) + Create(obj *SSHAuth) (runtime.Object, error) + Remove(obj *SSHAuth) (runtime.Object, error) + Updated(obj *SSHAuth) (runtime.Object, error) } type sshAuthLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *sshAuthLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, e func NewSSHAuthLifecycleAdapter(name string, clusterScoped bool, client SSHAuthInterface, l SSHAuthLifecycle) SSHAuthHandlerFunc { adapter := &sshAuthLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *SSHAuth) (*SSHAuth, error) { + return func(key string, obj *SSHAuth) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*SSHAuth); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 81549589..b2499c87 100644 --- a/apis/project.cattle.io/v3/zz_generated_workload_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_workload_controller.go @@ -35,7 +35,7 @@ type WorkloadList struct { Items []Workload } -type WorkloadHandlerFunc func(key string, obj *Workload) (*Workload, error) +type WorkloadHandlerFunc func(key string, obj *Workload) (runtime.Object, error) type WorkloadLister interface { List(namespace string, selector labels.Selector) (ret []*Workload, err error) 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 bf54206f..f13e26dc 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 @@ -6,9 +6,9 @@ import ( ) type WorkloadLifecycle interface { - Create(obj *Workload) (*Workload, error) - Remove(obj *Workload) (*Workload, error) - Updated(obj *Workload) (*Workload, error) + Create(obj *Workload) (runtime.Object, error) + Remove(obj *Workload) (runtime.Object, error) + Updated(obj *Workload) (runtime.Object, error) } type workloadLifecycleAdapter struct { @@ -42,9 +42,9 @@ func (w *workloadLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, func NewWorkloadLifecycleAdapter(name string, clusterScoped bool, client WorkloadInterface, l WorkloadLifecycle) WorkloadHandlerFunc { adapter := &workloadLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *Workload) (*Workload, error) { + return func(key string, obj *Workload) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*Workload); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 1ce57fc4..c6f7121d 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 @@ -35,7 +35,7 @@ type ClusterRoleBindingList struct { Items []v1.ClusterRoleBinding } -type ClusterRoleBindingHandlerFunc func(key string, obj *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) +type ClusterRoleBindingHandlerFunc func(key string, obj *v1.ClusterRoleBinding) (runtime.Object, error) type ClusterRoleBindingLister interface { List(namespace string, selector labels.Selector) (ret []*v1.ClusterRoleBinding, err error) 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 0e9e84dc..c4a45244 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 @@ -7,9 +7,9 @@ import ( ) type ClusterRoleBindingLifecycle interface { - Create(obj *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) - Remove(obj *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) - Updated(obj *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) + Create(obj *v1.ClusterRoleBinding) (runtime.Object, error) + Remove(obj *v1.ClusterRoleBinding) (runtime.Object, error) + Updated(obj *v1.ClusterRoleBinding) (runtime.Object, error) } type clusterRoleBindingLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *clusterRoleBindingLifecycleAdapter) Updated(obj runtime.Object) (runtim func NewClusterRoleBindingLifecycleAdapter(name string, clusterScoped bool, client ClusterRoleBindingInterface, l ClusterRoleBindingLifecycle) ClusterRoleBindingHandlerFunc { adapter := &clusterRoleBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.ClusterRoleBinding) (*v1.ClusterRoleBinding, error) { + return func(key string, obj *v1.ClusterRoleBinding) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.ClusterRoleBinding); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 61ca4fd9..1906c1ed 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 @@ -35,7 +35,7 @@ type ClusterRoleList struct { Items []v1.ClusterRole } -type ClusterRoleHandlerFunc func(key string, obj *v1.ClusterRole) (*v1.ClusterRole, error) +type ClusterRoleHandlerFunc func(key string, obj *v1.ClusterRole) (runtime.Object, error) type ClusterRoleLister interface { List(namespace string, selector labels.Selector) (ret []*v1.ClusterRole, err error) 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 87055d66..b35f4799 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 @@ -7,9 +7,9 @@ import ( ) type ClusterRoleLifecycle interface { - Create(obj *v1.ClusterRole) (*v1.ClusterRole, error) - Remove(obj *v1.ClusterRole) (*v1.ClusterRole, error) - Updated(obj *v1.ClusterRole) (*v1.ClusterRole, error) + Create(obj *v1.ClusterRole) (runtime.Object, error) + Remove(obj *v1.ClusterRole) (runtime.Object, error) + Updated(obj *v1.ClusterRole) (runtime.Object, error) } type clusterRoleLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *clusterRoleLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec func NewClusterRoleLifecycleAdapter(name string, clusterScoped bool, client ClusterRoleInterface, l ClusterRoleLifecycle) ClusterRoleHandlerFunc { adapter := &clusterRoleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.ClusterRole) (*v1.ClusterRole, error) { + return func(key string, obj *v1.ClusterRole) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.ClusterRole); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 c99a7cf6..98ba7404 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 @@ -36,7 +36,7 @@ type RoleBindingList struct { Items []v1.RoleBinding } -type RoleBindingHandlerFunc func(key string, obj *v1.RoleBinding) (*v1.RoleBinding, error) +type RoleBindingHandlerFunc func(key string, obj *v1.RoleBinding) (runtime.Object, error) type RoleBindingLister interface { List(namespace string, selector labels.Selector) (ret []*v1.RoleBinding, err error) 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 05915533..b876ee10 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 @@ -7,9 +7,9 @@ import ( ) type RoleBindingLifecycle interface { - Create(obj *v1.RoleBinding) (*v1.RoleBinding, error) - Remove(obj *v1.RoleBinding) (*v1.RoleBinding, error) - Updated(obj *v1.RoleBinding) (*v1.RoleBinding, error) + Create(obj *v1.RoleBinding) (runtime.Object, error) + Remove(obj *v1.RoleBinding) (runtime.Object, error) + Updated(obj *v1.RoleBinding) (runtime.Object, error) } type roleBindingLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *roleBindingLifecycleAdapter) Updated(obj runtime.Object) (runtime.Objec func NewRoleBindingLifecycleAdapter(name string, clusterScoped bool, client RoleBindingInterface, l RoleBindingLifecycle) RoleBindingHandlerFunc { adapter := &roleBindingLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.RoleBinding) (*v1.RoleBinding, error) { + return func(key string, obj *v1.RoleBinding) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.RoleBinding); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err 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 1a5315a4..a555b6bc 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 @@ -36,7 +36,7 @@ type RoleList struct { Items []v1.Role } -type RoleHandlerFunc func(key string, obj *v1.Role) (*v1.Role, error) +type RoleHandlerFunc func(key string, obj *v1.Role) (runtime.Object, error) type RoleLister interface { List(namespace string, selector labels.Selector) (ret []*v1.Role, err error) 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 15b264d9..f321c19b 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 @@ -7,9 +7,9 @@ import ( ) type RoleLifecycle interface { - Create(obj *v1.Role) (*v1.Role, error) - Remove(obj *v1.Role) (*v1.Role, error) - Updated(obj *v1.Role) (*v1.Role, error) + Create(obj *v1.Role) (runtime.Object, error) + Remove(obj *v1.Role) (runtime.Object, error) + Updated(obj *v1.Role) (runtime.Object, error) } type roleLifecycleAdapter struct { @@ -43,9 +43,9 @@ func (w *roleLifecycleAdapter) Updated(obj runtime.Object) (runtime.Object, erro func NewRoleLifecycleAdapter(name string, clusterScoped bool, client RoleInterface, l RoleLifecycle) RoleHandlerFunc { adapter := &roleLifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *v1.Role) (*v1.Role, error) { + return func(key string, obj *v1.Role) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*v1.Role); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/vendor.conf b/vendor.conf index 12a15108..5fcf457d 100644 --- a/vendor.conf +++ b/vendor.conf @@ -2,4 +2,4 @@ github.com/rancher/types github.com/pkg/errors v0.8.0 -github.com/rancher/norman 92a6f9ebeeff00dc5b5c981aaaf71a30bd3f2ea7 transitive=true +github.com/rancher/norman 5bafd7b137333cb19834c530bd85e6ce05afc63c transitive=true diff --git a/vendor/github.com/rancher/norman/README.md b/vendor/github.com/rancher/norman/README.md index 2b6e8733..3ab28f91 100644 --- a/vendor/github.com/rancher/norman/README.md +++ b/vendor/github.com/rancher/norman/README.md @@ -1,66 +1,11 @@ Norman ======== -An API framework for Building [Rancher Style APIs](https://github.com/rancher/api-spec/) backed by K8s CustomResources. - -## Building - -`make` +An API framework for Building [Rancher Style APIs](https://github.com/rancher/api-spec/) backed by K8s CustomResources and their controllers. ## Example -Refer to `examples/` - -```go -package main - -import ( - "context" - "fmt" - "net/http" - "os" - - "github.com/rancher/norman/generator" - "github.com/rancher/norman/server" - "github.com/rancher/norman/types" -) - -type Foo struct { - types.Resource - Name string `json:"name"` - Foo string `json:"foo"` - SubThing Baz `json:"subThing"` -} - -type Baz struct { - Name string `json:"name"` -} - -var ( - version = types.APIVersion{ - Version: "v1", - Group: "io.cattle.core.example", - Path: "/example/v1", - } - - Schemas = types.NewSchemas() -) - -func main() { - if _, err := Schemas.Import(&version, Foo{}); err != nil { - panic(err) - } - - server, err := server.NewAPIServer(context.Background(), os.Getenv("KUBECONFIG"), Schemas) - if err != nil { - panic(err) - } - - fmt.Println("Listening on 0.0.0.0:1234") - http.ListenAndServe("0.0.0.0:1234", server) -} -``` - +Refer to https://github.com/rancher/go-skel for skeleton norman controller projects ## License Copyright (c) 2014-2017 [Rancher Labs, Inc.](http://rancher.com) diff --git a/vendor/github.com/rancher/norman/generator/controller_template.go b/vendor/github.com/rancher/norman/generator/controller_template.go index 26d52f49..c913dfec 100644 --- a/vendor/github.com/rancher/norman/generator/controller_template.go +++ b/vendor/github.com/rancher/norman/generator/controller_template.go @@ -41,7 +41,7 @@ type {{.schema.CodeName}}List struct { Items []{{.prefix}}{{.schema.CodeName}} } -type {{.schema.CodeName}}HandlerFunc func(key string, obj *{{.prefix}}{{.schema.CodeName}}) (*{{.prefix}}{{.schema.CodeName}}, error) +type {{.schema.CodeName}}HandlerFunc func(key string, obj *{{.prefix}}{{.schema.CodeName}}) (runtime.Object, error) type {{.schema.CodeName}}Lister interface { List(namespace string, selector labels.Selector) (ret []*{{.prefix}}{{.schema.CodeName}}, err error) diff --git a/vendor/github.com/rancher/norman/generator/default.go b/vendor/github.com/rancher/norman/generator/default.go new file mode 100644 index 00000000..6da459a2 --- /dev/null +++ b/vendor/github.com/rancher/norman/generator/default.go @@ -0,0 +1,66 @@ +package generator + +import ( + "fmt" + "path" + "strings" + + "github.com/rancher/norman/types" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +var ( + baseCattle = "client" + baseK8s = "apis" +) + +func DefaultGenerate(schemas *types.Schemas, pkgPath string, publicAPI bool, foreignTypes map[string]bool) error { + version := getVersion(schemas) + group := strings.Split(version.Group, ".")[0] + + cattleOutputPackage := path.Join(pkgPath, baseCattle, group, version.Version) + if !publicAPI { + cattleOutputPackage = "" + } + k8sOutputPackage := path.Join(pkgPath, baseK8s, version.Group, version.Version) + + if err := Generate(schemas, foreignTypes, cattleOutputPackage, k8sOutputPackage); err != nil { + return err + } + + return nil +} + +func ControllersForForeignTypes(baseOutputPackage string, gv schema.GroupVersion, nsObjs []interface{}, objs []interface{}) error { + version := gv.Version + group := gv.Group + groupPath := group + + if groupPath == "" { + groupPath = "core" + } + + k8sOutputPackage := path.Join(baseOutputPackage, baseK8s, groupPath, version) + + return GenerateControllerForTypes(&types.APIVersion{ + Version: version, + Group: group, + Path: fmt.Sprintf("/k8s/%s-%s", groupPath, version), + }, k8sOutputPackage, nsObjs, objs) +} + +func getVersion(schemas *types.Schemas) *types.APIVersion { + var version types.APIVersion + for _, schema := range schemas.Schemas() { + if version.Group == "" { + version = schema.Version + continue + } + if version.Group != schema.Version.Group || + version.Version != schema.Version.Version { + panic("schema set contains two APIVersions") + } + } + + return &version +} diff --git a/vendor/github.com/rancher/norman/generator/generator.go b/vendor/github.com/rancher/norman/generator/generator.go index 9e510f71..8d5c3f1c 100644 --- a/vendor/github.com/rancher/norman/generator/generator.go +++ b/vendor/github.com/rancher/norman/generator/generator.go @@ -361,27 +361,33 @@ func GenerateControllerForTypes(version *types.APIVersion, k8sOutputPackage stri return gofmt(baseDir, k8sOutputPackage) } -func Generate(schemas *types.Schemas, backendTypes map[string]bool, cattleOutputPackage, k8sOutputPackage string) error { +func Generate(schemas *types.Schemas, foreignTypes map[string]bool, cattleOutputPackage, k8sOutputPackage string) error { baseDir := args.DefaultSourceTree() cattleDir := path.Join(baseDir, cattleOutputPackage) k8sDir := path.Join(baseDir, k8sOutputPackage) + if cattleOutputPackage == "" { + cattleDir = "" + } + if err := prepareDirs(cattleDir, k8sDir); err != nil { return err } - controllers := []*types.Schema{} + var controllers []*types.Schema - cattleClientTypes := []*types.Schema{} + var cattleClientTypes []*types.Schema for _, schema := range schemas.Schemas() { if blackListTypes[schema.ID] { continue } - _, backendType := backendTypes[schema.ID] + _, backendType := foreignTypes[schema.ID] - if err := generateType(cattleDir, schema, schemas); err != nil { - return err + if cattleDir != "" { + if err := generateType(cattleDir, schema, schemas); err != nil { + return err + } } if backendType || @@ -402,8 +408,10 @@ func Generate(schemas *types.Schemas, backendTypes map[string]bool, cattleOutput } } - if err := generateClient(cattleDir, cattleClientTypes); err != nil { - return err + if cattleDir != "" { + if err := generateClient(cattleDir, cattleClientTypes); err != nil { + return err + } } if len(controllers) > 0 { @@ -424,11 +432,19 @@ func Generate(schemas *types.Schemas, backendTypes map[string]bool, cattleOutput return err } - return gofmt(baseDir, cattleOutputPackage) + if cattleOutputPackage != "" { + return gofmt(baseDir, cattleOutputPackage) + } + + return nil } func prepareDirs(dirs ...string) error { for _, dir := range dirs { + if dir == "" { + continue + } + if err := os.MkdirAll(dir, 0755); err != nil { return err } diff --git a/vendor/github.com/rancher/norman/generator/lifecycle_template.go b/vendor/github.com/rancher/norman/generator/lifecycle_template.go index a9f14abd..5594e446 100644 --- a/vendor/github.com/rancher/norman/generator/lifecycle_template.go +++ b/vendor/github.com/rancher/norman/generator/lifecycle_template.go @@ -10,9 +10,9 @@ import ( ) type {{.schema.CodeName}}Lifecycle interface { - Create(obj *{{.prefix}}{{.schema.CodeName}}) (*{{.prefix}}{{.schema.CodeName}}, error) - Remove(obj *{{.prefix}}{{.schema.CodeName}}) (*{{.prefix}}{{.schema.CodeName}}, error) - Updated(obj *{{.prefix}}{{.schema.CodeName}}) (*{{.prefix}}{{.schema.CodeName}}, error) + Create(obj *{{.prefix}}{{.schema.CodeName}}) (runtime.Object, error) + Remove(obj *{{.prefix}}{{.schema.CodeName}}) (runtime.Object, error) + Updated(obj *{{.prefix}}{{.schema.CodeName}}) (runtime.Object, error) } type {{.schema.ID}}LifecycleAdapter struct { @@ -46,9 +46,9 @@ func (w *{{.schema.ID}}LifecycleAdapter) Updated(obj runtime.Object) (runtime.Ob func New{{.schema.CodeName}}LifecycleAdapter(name string, clusterScoped bool, client {{.schema.CodeName}}Interface, l {{.schema.CodeName}}Lifecycle) {{.schema.CodeName}}HandlerFunc { adapter := &{{.schema.ID}}LifecycleAdapter{lifecycle: l} syncFn := lifecycle.NewObjectLifecycleAdapter(name, clusterScoped, adapter, client.ObjectClient()) - return func(key string, obj *{{.prefix}}{{.schema.CodeName}}) (*{{.prefix}}{{.schema.CodeName}}, error) { + return func(key string, obj *{{.prefix}}{{.schema.CodeName}}) (runtime.Object, error) { newObj, err := syncFn(key, obj) - if o, ok := newObj.(*{{.prefix}}{{.schema.CodeName}}); ok { + if o, ok := newObj.(runtime.Object); ok { return o, err } return nil, err diff --git a/vendor/github.com/rancher/norman/vendor.conf b/vendor/github.com/rancher/norman/vendor.conf index bb7d6b63..afb270b4 100644 --- a/vendor/github.com/rancher/norman/vendor.conf +++ b/vendor/github.com/rancher/norman/vendor.conf @@ -1,8 +1,8 @@ # package github.com/rancher/norman -k8s.io/kubernetes v1.12.1-lite7 https://github.com/ibuildthecloud/k3s.git transitive=true,staging=true -github.com/maruel/panicparse c0182c169410cfa80c7e8f046dad208eaef91338 -bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git -golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5 -github.com/gorilla/mux v1.6.1 +k8s.io/kubernetes v1.12.2-lite1 https://github.com/ibuildthecloud/k3s.git transitive=true,staging=true +github.com/maruel/panicparse c0182c169410cfa80c7e8f046dad208eaef91338 +bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git +golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5 +github.com/gorilla/mux v1.6.1 diff --git a/vendor/k8s.io/api/core/v1/types.go b/vendor/k8s.io/api/core/v1/types.go index f3f35d0e..02028919 100644 --- a/vendor/k8s.io/api/core/v1/types.go +++ b/vendor/k8s.io/api/core/v1/types.go @@ -5208,7 +5208,7 @@ type SecurityContext struct { // readonly paths and masked paths. // This requires the ProcMountType feature flag to be enabled. // +optional - ProcMount *ProcMountType `json:"procMount,omitEmpty" protobuf:"bytes,9,opt,name=procMount"` + ProcMount *ProcMountType `json:"procMount,omitempty" protobuf:"bytes,9,opt,name=procMount"` } type ProcMountType string diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/BUILD b/vendor/k8s.io/apimachinery/pkg/util/net/BUILD index 00fba56b..d38670a8 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/net/BUILD +++ b/vendor/k8s.io/apimachinery/pkg/util/net/BUILD @@ -16,7 +16,12 @@ go_test( "util_test.go", ], embed = [":go_default_library"], - deps = ["//vendor/github.com/spf13/pflag:go_default_library"], + deps = [ + "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/github.com/stretchr/testify/require:go_default_library", + ], ) go_library( diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/http.go b/vendor/k8s.io/apimachinery/pkg/util/net/http.go index 8abbdea8..7c2a5e62 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/net/http.go +++ b/vendor/k8s.io/apimachinery/pkg/util/net/http.go @@ -321,9 +321,10 @@ type Dialer interface { // ConnectWithRedirects uses dialer to send req, following up to 10 redirects (relative to // originalLocation). It returns the opened net.Conn and the raw response bytes. -func ConnectWithRedirects(originalMethod string, originalLocation *url.URL, header http.Header, originalBody io.Reader, dialer Dialer) (net.Conn, []byte, error) { +// If requireSameHostRedirects is true, only redirects to the same host are permitted. +func ConnectWithRedirects(originalMethod string, originalLocation *url.URL, header http.Header, originalBody io.Reader, dialer Dialer, requireSameHostRedirects bool) (net.Conn, []byte, error) { const ( - maxRedirects = 10 + maxRedirects = 9 // Fail on the 10th redirect maxResponseSize = 16384 // play it safe to allow the potential for lots of / large headers ) @@ -387,10 +388,6 @@ redirectLoop: resp.Body.Close() // not used - // Reset the connection. - intermediateConn.Close() - intermediateConn = nil - // Prepare to follow the redirect. redirectStr := resp.Header.Get("Location") if redirectStr == "" { @@ -404,6 +401,15 @@ redirectLoop: if err != nil { return nil, nil, fmt.Errorf("malformed Location header: %v", err) } + + // Only follow redirects to the same host. Otherwise, propagate the redirect response back. + if requireSameHostRedirects && location.Hostname() != originalLocation.Hostname() { + break redirectLoop + } + + // Reset the connection. + intermediateConn.Close() + intermediateConn = nil } connToReturn := intermediateConn diff --git a/vendor/k8s.io/client-go/pkg/version/base.go b/vendor/k8s.io/client-go/pkg/version/base.go index c9dae68b..2e358d2f 100644 --- a/vendor/k8s.io/client-go/pkg/version/base.go +++ b/vendor/k8s.io/client-go/pkg/version/base.go @@ -3,8 +3,8 @@ package version var ( gitMajor = "1" gitMinor = "12" - gitVersion = "v1.12.1-lite7" - gitCommit = "b5d55f02488df0daa1399df41777aeeeaa36eabb" + gitVersion = "v1.12.2-lite1" + gitCommit = "44905551dd08ce1e656c9e07c4a5d90627f01774" gitTreeState = "clean" - buildDate = "2018-10-24T23:26+00:00Z" + buildDate = "2018-10-30T18:28+00:00Z" )