From e6cf6cb0f772123fd85b71c32e13b5b2e1a88f41 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 17 Dec 2018 16:08:12 -0700 Subject: [PATCH 1/2] Update vendor --- vendor.conf | 2 +- .../norman/controller/generic_controller.go | 2 +- .../norman/generator/controller_template.go | 17 ++++++++++++-- .../norman/generator/k8s_client_template.go | 2 ++ .../rancher/norman/lifecycle/object.go | 20 ++++++++--------- .../norman/objectclient/object_client.go | 6 ++--- .../rancher/norman/types/reflection.go | 22 ++++++++++++++++++- .../rancher/norman/types/schemas.go | 12 +++++----- 8 files changed, 60 insertions(+), 23 deletions(-) diff --git a/vendor.conf b/vendor.conf index aa19b3da..cfa30a50 100644 --- a/vendor.conf +++ b/vendor.conf @@ -2,5 +2,5 @@ github.com/rancher/types github.com/pkg/errors v0.8.0 -github.com/rancher/norman 1d24e0fc0b0a92dfc48012e82219e0d584cb8b0b transitive=true +github.com/rancher/norman 457c15b94acae52afb5290aa315452c7621d452a transitive=true github.com/coreos/prometheus-operator v0.25.0 diff --git a/vendor/github.com/rancher/norman/controller/generic_controller.go b/vendor/github.com/rancher/norman/controller/generic_controller.go index b4100397..c5213175 100644 --- a/vendor/github.com/rancher/norman/controller/generic_controller.go +++ b/vendor/github.com/rancher/norman/controller/generic_controller.go @@ -200,7 +200,7 @@ func (g *genericController) Start(ctx context.Context, threadiness int) error { if g.running { for _, h := range g.handlers { - if h.generation < g.generation { + if h.generation != g.generation { continue } for _, key := range g.informer.GetStore().ListKeys() { diff --git a/vendor/github.com/rancher/norman/generator/controller_template.go b/vendor/github.com/rancher/norman/generator/controller_template.go index b9da6b27..081d9557 100644 --- a/vendor/github.com/rancher/norman/generator/controller_template.go +++ b/vendor/github.com/rancher/norman/generator/controller_template.go @@ -13,6 +13,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -35,6 +36,13 @@ var ( } ) +func New{{.schema.CodeName}}(namespace, name string, obj {{.prefix}}{{.schema.CodeName}}) *{{.prefix}}{{.schema.CodeName}} { + obj.APIVersion, obj.Kind = {{.schema.CodeName}}GroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type {{.schema.CodeName}}List struct { metav1.TypeMeta %BACK%json:",inline"%BACK% metav1.ListMeta %BACK%json:"metadata,omitempty"%BACK% @@ -231,8 +239,8 @@ func (s *{{.schema.ID}}Client) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *{{.schema.ID}}Client) Patch(o *{{.prefix}}{{.schema.CodeName}}, data []byte, subresources ...string) (*{{.prefix}}{{.schema.CodeName}}, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *{{.schema.ID}}Client) Patch(o *{{.prefix}}{{.schema.CodeName}}, patchType types.PatchType, data []byte, subresources ...string) (*{{.prefix}}{{.schema.CodeName}}, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*{{.prefix}}{{.schema.CodeName}}), err } @@ -284,6 +292,7 @@ type {{.schema.CodeName}}Client interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() {{.schema.CodeName}}Interface } @@ -304,6 +313,10 @@ func (n *{{.schema.ID}}Client2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *{{.schema.ID}}Client2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *{{.schema.ID}}Client2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/vendor/github.com/rancher/norman/generator/k8s_client_template.go b/vendor/github.com/rancher/norman/generator/k8s_client_template.go index ee1b06f0..9cd78b36 100644 --- a/vendor/github.com/rancher/norman/generator/k8s_client_template.go +++ b/vendor/github.com/rancher/norman/generator/k8s_client_template.go @@ -26,6 +26,7 @@ type Interface interface { } type Clients struct { + Interface Interface {{range .schemas}} {{.CodeName}} {{.CodeName}}Client{{end}} } @@ -69,6 +70,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, {{range .schemas}} {{.CodeName}}: &{{.ID}}Client2{ iface: iface.{{.CodeNamePlural}}(""), diff --git a/vendor/github.com/rancher/norman/lifecycle/object.go b/vendor/github.com/rancher/norman/lifecycle/object.go index 03c99ba9..25b12cb2 100644 --- a/vendor/github.com/rancher/norman/lifecycle/object.go +++ b/vendor/github.com/rancher/norman/lifecycle/object.go @@ -178,23 +178,23 @@ func (o *objectLifecycleAdapter) record(obj runtime.Object, f func(runtime.Objec origObj := obj obj = origObj.DeepCopyObject() - if newObj, err := f(obj); err != nil { + if newObj, err := checkNil(obj, f); err != nil { newObj, _ = o.update(metadata.GetName(), origObj, newObj) return newObj, err } else if newObj != nil { - newMetadata, err := meta.Accessor(newObj) - if err != nil { - // don't return error, no original error - return newObj, nil - } - if newMetadata.GetResourceVersion() == metadata.GetResourceVersion() { - return o.update(metadata.GetName(), origObj, newObj) - } - return newObj, nil + return o.update(metadata.GetName(), origObj, newObj) } return obj, nil } +func checkNil(obj runtime.Object, f func(runtime.Object) (runtime.Object, error)) (runtime.Object, error) { + obj, err := f(obj) + if obj == nil || reflect.ValueOf(obj).IsNil() { + return nil, err + } + return obj, err +} + func (o *objectLifecycleAdapter) create(obj runtime.Object) (runtime.Object, bool, error) { metadata, err := meta.Accessor(obj) if err != nil { diff --git a/vendor/github.com/rancher/norman/objectclient/object_client.go b/vendor/github.com/rancher/norman/objectclient/object_client.go index d75896a2..01d1b930 100644 --- a/vendor/github.com/rancher/norman/objectclient/object_client.go +++ b/vendor/github.com/rancher/norman/objectclient/object_client.go @@ -48,7 +48,7 @@ type GenericClient interface { List(opts metav1.ListOptions) (runtime.Object, error) Watch(opts metav1.ListOptions) (watch.Interface, error) DeleteCollection(deleteOptions *metav1.DeleteOptions, listOptions metav1.ListOptions) error - Patch(name string, o runtime.Object, data []byte, subresources ...string) (runtime.Object, error) + Patch(name string, o runtime.Object, patchType types.PatchType, data []byte, subresources ...string) (runtime.Object, error) ObjectFactory() ObjectFactory } @@ -284,7 +284,7 @@ func (p *ObjectClient) DeleteCollection(deleteOptions *metav1.DeleteOptions, lis Error() } -func (p *ObjectClient) Patch(name string, o runtime.Object, data []byte, subresources ...string) (runtime.Object, error) { +func (p *ObjectClient) Patch(name string, o runtime.Object, patchType types.PatchType, data []byte, subresources ...string) (runtime.Object, error) { ns := p.ns if obj, ok := o.(metav1.Object); ok && obj.GetNamespace() != "" { ns = obj.GetNamespace() @@ -293,7 +293,7 @@ func (p *ObjectClient) Patch(name string, o runtime.Object, data []byte, subreso if len(name) == 0 { return result, errors.New("object missing name") } - err := p.restClient.Patch(types.StrategicMergePatchType). + err := p.restClient.Patch(patchType). Prefix(p.getAPIPrefix(), p.gvk.Group, p.gvk.Version). NamespaceIfScoped(ns, p.resource.Namespaced). Resource(p.resource.Name). diff --git a/vendor/github.com/rancher/norman/types/reflection.go b/vendor/github.com/rancher/norman/types/reflection.go index a64d14a4..33295c32 100644 --- a/vendor/github.com/rancher/norman/types/reflection.go +++ b/vendor/github.com/rancher/norman/types/reflection.go @@ -83,6 +83,9 @@ func (s *Schemas) newSchemaFromType(version *APIVersion, t reflect.Type, typeNam CollectionActions: map[string]Action{}, } + s.processingTypes[t] = schema + defer delete(s.processingTypes, t) + if err := s.readFields(schema, t); err != nil { return nil, err } @@ -148,6 +151,11 @@ func (s *Schemas) importType(version *APIVersion, t reflect.Type, overrides ...r return existing, nil } + if s, ok := s.processingTypes[t]; ok { + logrus.Debugf("Returning half built schema %s for %v", typeName, t) + return s, nil + } + logrus.Debugf("Inspecting schema %s for %v", typeName, t) schema, err := s.newSchemaFromType(version, t, typeName) @@ -289,7 +297,9 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error { fieldType.Kind() == reflect.Uint32 || fieldType.Kind() == reflect.Int32 || fieldType.Kind() == reflect.Uint64 || - fieldType.Kind() == reflect.Int64 { + fieldType.Kind() == reflect.Int64 || + fieldType.Kind() == reflect.Float32 || + fieldType.Kind() == reflect.Float64 { schemaField.Nullable = false schemaField.Default = 0 } @@ -314,6 +324,12 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error { return err } schemaField.Default = n + case "float": + n, err := convert.ToFloat(schemaField.Default) + if err != nil { + return err + } + schemaField.Default = n case "boolean": schemaField.Default = convert.ToBool(schemaField.Default) } @@ -446,6 +462,10 @@ func (s *Schemas) determineSchemaType(version *APIVersion, t reflect.Type) (stri fallthrough case reflect.Int64: return "int", nil + case reflect.Float32: + fallthrough + case reflect.Float64: + return "float", nil case reflect.Interface: return "json", nil case reflect.Map: diff --git a/vendor/github.com/rancher/norman/types/schemas.go b/vendor/github.com/rancher/norman/types/schemas.go index 5d2d7d67..0e72a178 100644 --- a/vendor/github.com/rancher/norman/types/schemas.go +++ b/vendor/github.com/rancher/norman/types/schemas.go @@ -29,6 +29,7 @@ type BackReference struct { type Schemas struct { sync.Mutex + processingTypes map[reflect.Type]*Schema typeNames map[reflect.Type]string schemasByPath map[string]map[string]*Schema mappers map[string]map[string][]Mapper @@ -44,11 +45,12 @@ type Schemas struct { func NewSchemas() *Schemas { return &Schemas{ - typeNames: map[reflect.Type]string{}, - schemasByPath: map[string]map[string]*Schema{}, - mappers: map[string]map[string][]Mapper{}, - references: map[string][]BackReference{}, - embedded: map[string]*Schema{}, + processingTypes: map[reflect.Type]*Schema{}, + typeNames: map[reflect.Type]string{}, + schemasByPath: map[string]map[string]*Schema{}, + mappers: map[string]map[string][]Mapper{}, + references: map[string][]BackReference{}, + embedded: map[string]*Schema{}, } } From 2092df3a6f5508e201de899f7999c3131dcd2f79 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 17 Dec 2018 16:09:36 -0700 Subject: [PATCH 2/2] Update generate code --- .../zz_generated_daemon_set_controller.go | 17 +++++++++++++++-- .../zz_generated_deployment_controller.go | 17 +++++++++++++++-- apis/apps/v1beta2/zz_generated_k8s_client.go | 3 +++ .../zz_generated_replica_set_controller.go | 17 +++++++++++++++-- .../zz_generated_stateful_set_controller.go | 17 +++++++++++++++-- apis/batch/v1/zz_generated_job_controller.go | 17 +++++++++++++++-- apis/batch/v1/zz_generated_k8s_client.go | 3 +++ .../v1beta1/zz_generated_cron_job_controller.go | 17 +++++++++++++++-- apis/batch/v1beta1/zz_generated_k8s_client.go | 3 +++ .../zz_generated_component_status_controller.go | 17 +++++++++++++++-- .../v1/zz_generated_config_map_controller.go | 17 +++++++++++++++-- .../v1/zz_generated_endpoints_controller.go | 17 +++++++++++++++-- apis/core/v1/zz_generated_event_controller.go | 17 +++++++++++++++-- apis/core/v1/zz_generated_k8s_client.go | 3 +++ .../v1/zz_generated_namespace_controller.go | 17 +++++++++++++++-- apis/core/v1/zz_generated_node_controller.go | 17 +++++++++++++++-- ...erated_persistent_volume_claim_controller.go | 17 +++++++++++++++-- apis/core/v1/zz_generated_pod_controller.go | 17 +++++++++++++++-- ...nerated_replication_controller_controller.go | 17 +++++++++++++++-- .../zz_generated_resource_quota_controller.go | 17 +++++++++++++++-- apis/core/v1/zz_generated_secret_controller.go | 17 +++++++++++++++-- .../zz_generated_service_account_controller.go | 17 +++++++++++++++-- apis/core/v1/zz_generated_service_controller.go | 17 +++++++++++++++-- .../v1beta1/zz_generated_ingress_controller.go | 17 +++++++++++++++-- .../v1beta1/zz_generated_k8s_client.go | 3 +++ ..._generated_pod_security_policy_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_auth_config_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_catalog_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_cluster_alert_controller.go | 17 +++++++++++++++-- ..._generated_cluster_alert_group_controller.go | 17 +++++++++++++++-- ...z_generated_cluster_alert_rule_controller.go | 17 +++++++++++++++-- .../zz_generated_cluster_catalog_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_cluster_controller.go | 17 +++++++++++++++-- .../zz_generated_cluster_logging_controller.go | 17 +++++++++++++++-- ...enerated_cluster_monitor_graph_controller.go | 17 +++++++++++++++-- ...ted_cluster_registration_token_controller.go | 17 +++++++++++++++-- ..._cluster_role_template_binding_controller.go | 17 +++++++++++++++-- .../zz_generated_compose_config_controller.go | 17 +++++++++++++++-- .../zz_generated_dynamic_schema_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_global_dns_controller.go | 17 +++++++++++++++-- ..._generated_global_dns_provider_controller.go | 17 +++++++++++++++-- ..._generated_global_role_binding_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_global_role_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_group_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_group_member_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_k8s_client.go | 3 +++ .../zz_generated_kontainer_driver_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_ldap_config_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_listen_config_controller.go | 17 +++++++++++++++-- .../zz_generated_monitor_metric_controller.go | 17 +++++++++++++++-- ...zz_generated_multi_cluster_app_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_node_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_node_driver_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_node_pool_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_node_template_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_notifier_controller.go | 17 +++++++++++++++-- ...d_pod_security_policy_template_controller.go | 17 +++++++++++++++-- ...olicy_template_project_binding_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_preference_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_principal_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_project_alert_controller.go | 17 +++++++++++++++-- ..._generated_project_alert_group_controller.go | 17 +++++++++++++++-- ...z_generated_project_alert_rule_controller.go | 17 +++++++++++++++-- .../zz_generated_project_catalog_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_project_controller.go | 17 +++++++++++++++-- .../zz_generated_project_logging_controller.go | 17 +++++++++++++++-- ...enerated_project_monitor_graph_controller.go | 17 +++++++++++++++-- ...nerated_project_network_policy_controller.go | 17 +++++++++++++++-- ..._project_role_template_binding_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_role_template_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_setting_controller.go | 17 +++++++++++++++-- .../zz_generated_template_content_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_template_controller.go | 17 +++++++++++++++-- .../zz_generated_template_version_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_token_controller.go | 17 +++++++++++++++-- .../zz_generated_user_attribute_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_user_controller.go | 17 +++++++++++++++-- .../zz_generated_auth_provider_controller.go | 17 +++++++++++++++-- .../v3public/zz_generated_k8s_client.go | 3 +++ .../v1/zz_generated_alertmanager_controller.go | 17 +++++++++++++++-- .../v1/zz_generated_k8s_client.go | 3 +++ .../v1/zz_generated_prometheus_controller.go | 17 +++++++++++++++-- .../zz_generated_prometheus_rule_controller.go | 17 +++++++++++++++-- .../zz_generated_service_monitor_controller.go | 17 +++++++++++++++-- .../v1/zz_generated_k8s_client.go | 3 +++ .../zz_generated_network_policy_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_app_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_app_revision_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_basic_auth_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_certificate_controller.go | 17 +++++++++++++++-- ...zz_generated_docker_credential_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_k8s_client.go | 3 +++ ...enerated_namespaced_basic_auth_controller.go | 17 +++++++++++++++-- ...nerated_namespaced_certificate_controller.go | 17 +++++++++++++++-- ...d_namespaced_docker_credential_controller.go | 17 +++++++++++++++-- ...mespaced_service_account_token_controller.go | 17 +++++++++++++++-- ..._generated_namespaced_ssh_auth_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_pipeline_controller.go | 17 +++++++++++++++-- ...z_generated_pipeline_execution_controller.go | 17 +++++++++++++++-- .../zz_generated_pipeline_setting_controller.go | 17 +++++++++++++++-- ...enerated_service_account_token_controller.go | 17 +++++++++++++++-- ...nerated_source_code_credential_controller.go | 17 +++++++++++++++-- ...ed_source_code_provider_config_controller.go | 17 +++++++++++++++-- ...generated_source_code_provider_controller.go | 17 +++++++++++++++-- ...nerated_source_code_repository_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_ssh_auth_controller.go | 17 +++++++++++++++-- .../v3/zz_generated_workload_controller.go | 17 +++++++++++++++-- ...generated_cluster_role_binding_controller.go | 17 +++++++++++++++-- .../v1/zz_generated_cluster_role_controller.go | 17 +++++++++++++++-- .../v1/zz_generated_k8s_client.go | 3 +++ .../v1/zz_generated_role_binding_controller.go | 17 +++++++++++++++-- .../v1/zz_generated_role_controller.go | 17 +++++++++++++++-- .../management/v3/zz_generated_metric_rule.go | 14 +++++++------- 113 files changed, 1555 insertions(+), 209 deletions(-) diff --git a/apis/apps/v1beta2/zz_generated_daemon_set_controller.go b/apis/apps/v1beta2/zz_generated_daemon_set_controller.go index 9fc6c67e..3e5a2502 100644 --- a/apis/apps/v1beta2/zz_generated_daemon_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_daemon_set_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewDaemonSet(namespace, name string, obj v1beta2.DaemonSet) *v1beta2.DaemonSet { + obj.APIVersion, obj.Kind = DaemonSetGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type DaemonSetList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *daemonSetClient) Watch(opts metav1.ListOptions) (watch.Interface, error } // Patch applies the patch and returns the patched deployment. -func (s *daemonSetClient) Patch(o *v1beta2.DaemonSet, data []byte, subresources ...string) (*v1beta2.DaemonSet, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *daemonSetClient) Patch(o *v1beta2.DaemonSet, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.DaemonSet, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1beta2.DaemonSet), err } @@ -278,6 +286,7 @@ type DaemonSetClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() DaemonSetInterface } @@ -298,6 +307,10 @@ func (n *daemonSetClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *daemonSetClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *daemonSetClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/apps/v1beta2/zz_generated_deployment_controller.go b/apis/apps/v1beta2/zz_generated_deployment_controller.go index 251d3fff..31728a76 100644 --- a/apis/apps/v1beta2/zz_generated_deployment_controller.go +++ b/apis/apps/v1beta2/zz_generated_deployment_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewDeployment(namespace, name string, obj v1beta2.Deployment) *v1beta2.Deployment { + obj.APIVersion, obj.Kind = DeploymentGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type DeploymentList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *deploymentClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *deploymentClient) Patch(o *v1beta2.Deployment, data []byte, subresources ...string) (*v1beta2.Deployment, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *deploymentClient) Patch(o *v1beta2.Deployment, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.Deployment, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1beta2.Deployment), err } @@ -278,6 +286,7 @@ type DeploymentClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() DeploymentInterface } @@ -298,6 +307,10 @@ func (n *deploymentClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *deploymentClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *deploymentClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/apps/v1beta2/zz_generated_k8s_client.go b/apis/apps/v1beta2/zz_generated_k8s_client.go index ddd5a134..30fe0884 100644 --- a/apis/apps/v1beta2/zz_generated_k8s_client.go +++ b/apis/apps/v1beta2/zz_generated_k8s_client.go @@ -27,6 +27,8 @@ type Interface interface { } type Clients struct { + Interface Interface + Deployment DeploymentClient DaemonSet DaemonSetClient StatefulSet StatefulSetClient @@ -75,6 +77,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, Deployment: &deploymentClient2{ iface: iface.Deployments(""), diff --git a/apis/apps/v1beta2/zz_generated_replica_set_controller.go b/apis/apps/v1beta2/zz_generated_replica_set_controller.go index 345c1553..1aefbe68 100644 --- a/apis/apps/v1beta2/zz_generated_replica_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_replica_set_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewReplicaSet(namespace, name string, obj v1beta2.ReplicaSet) *v1beta2.ReplicaSet { + obj.APIVersion, obj.Kind = ReplicaSetGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ReplicaSetList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *replicaSetClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *replicaSetClient) Patch(o *v1beta2.ReplicaSet, data []byte, subresources ...string) (*v1beta2.ReplicaSet, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *replicaSetClient) Patch(o *v1beta2.ReplicaSet, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.ReplicaSet, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1beta2.ReplicaSet), err } @@ -278,6 +286,7 @@ type ReplicaSetClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ReplicaSetInterface } @@ -298,6 +307,10 @@ func (n *replicaSetClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *replicaSetClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *replicaSetClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/apps/v1beta2/zz_generated_stateful_set_controller.go b/apis/apps/v1beta2/zz_generated_stateful_set_controller.go index e240cc62..db5be7e0 100644 --- a/apis/apps/v1beta2/zz_generated_stateful_set_controller.go +++ b/apis/apps/v1beta2/zz_generated_stateful_set_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewStatefulSet(namespace, name string, obj v1beta2.StatefulSet) *v1beta2.StatefulSet { + obj.APIVersion, obj.Kind = StatefulSetGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type StatefulSetList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *statefulSetClient) Watch(opts metav1.ListOptions) (watch.Interface, err } // Patch applies the patch and returns the patched deployment. -func (s *statefulSetClient) Patch(o *v1beta2.StatefulSet, data []byte, subresources ...string) (*v1beta2.StatefulSet, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *statefulSetClient) Patch(o *v1beta2.StatefulSet, patchType types.PatchType, data []byte, subresources ...string) (*v1beta2.StatefulSet, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1beta2.StatefulSet), err } @@ -278,6 +286,7 @@ type StatefulSetClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() StatefulSetInterface } @@ -298,6 +307,10 @@ func (n *statefulSetClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *statefulSetClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *statefulSetClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/batch/v1/zz_generated_job_controller.go b/apis/batch/v1/zz_generated_job_controller.go index 43a4edf6..a85e65ec 100644 --- a/apis/batch/v1/zz_generated_job_controller.go +++ b/apis/batch/v1/zz_generated_job_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewJob(namespace, name string, obj v1.Job) *v1.Job { + obj.APIVersion, obj.Kind = JobGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type JobList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *jobClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *jobClient) Patch(o *v1.Job, data []byte, subresources ...string) (*v1.Job, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *jobClient) Patch(o *v1.Job, patchType types.PatchType, data []byte, subresources ...string) (*v1.Job, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Job), err } @@ -278,6 +286,7 @@ type JobClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() JobInterface } @@ -298,6 +307,10 @@ func (n *jobClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *jobClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *jobClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/batch/v1/zz_generated_k8s_client.go b/apis/batch/v1/zz_generated_k8s_client.go index 25bd157d..c1ff70a6 100644 --- a/apis/batch/v1/zz_generated_k8s_client.go +++ b/apis/batch/v1/zz_generated_k8s_client.go @@ -24,6 +24,8 @@ type Interface interface { } type Clients struct { + Interface Interface + Job JobClient } @@ -66,6 +68,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, Job: &jobClient2{ iface: iface.Jobs(""), diff --git a/apis/batch/v1beta1/zz_generated_cron_job_controller.go b/apis/batch/v1beta1/zz_generated_cron_job_controller.go index 45ecc146..bd9e7c0c 100644 --- a/apis/batch/v1beta1/zz_generated_cron_job_controller.go +++ b/apis/batch/v1beta1/zz_generated_cron_job_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewCronJob(namespace, name string, obj v1beta1.CronJob) *v1beta1.CronJob { + obj.APIVersion, obj.Kind = CronJobGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type CronJobList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *cronJobClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *cronJobClient) Patch(o *v1beta1.CronJob, data []byte, subresources ...string) (*v1beta1.CronJob, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *cronJobClient) Patch(o *v1beta1.CronJob, patchType types.PatchType, data []byte, subresources ...string) (*v1beta1.CronJob, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1beta1.CronJob), err } @@ -278,6 +286,7 @@ type CronJobClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() CronJobInterface } @@ -298,6 +307,10 @@ func (n *cronJobClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *cronJobClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *cronJobClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/batch/v1beta1/zz_generated_k8s_client.go b/apis/batch/v1beta1/zz_generated_k8s_client.go index 95ea11b2..2723c2d7 100644 --- a/apis/batch/v1beta1/zz_generated_k8s_client.go +++ b/apis/batch/v1beta1/zz_generated_k8s_client.go @@ -24,6 +24,8 @@ type Interface interface { } type Clients struct { + Interface Interface + CronJob CronJobClient } @@ -66,6 +68,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, CronJob: &cronJobClient2{ iface: iface.CronJobs(""), diff --git a/apis/core/v1/zz_generated_component_status_controller.go b/apis/core/v1/zz_generated_component_status_controller.go index 7b760478..04e25c02 100644 --- a/apis/core/v1/zz_generated_component_status_controller.go +++ b/apis/core/v1/zz_generated_component_status_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewComponentStatus(namespace, name string, obj v1.ComponentStatus) *v1.ComponentStatus { + obj.APIVersion, obj.Kind = ComponentStatusGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ComponentStatusList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *componentStatusClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *componentStatusClient) Patch(o *v1.ComponentStatus, data []byte, subresources ...string) (*v1.ComponentStatus, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *componentStatusClient) Patch(o *v1.ComponentStatus, patchType types.PatchType, data []byte, subresources ...string) (*v1.ComponentStatus, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ComponentStatus), err } @@ -277,6 +285,7 @@ type ComponentStatusClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ComponentStatusInterface } @@ -297,6 +306,10 @@ func (n *componentStatusClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *componentStatusClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *componentStatusClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_config_map_controller.go b/apis/core/v1/zz_generated_config_map_controller.go index 71be49dd..0c74f973 100644 --- a/apis/core/v1/zz_generated_config_map_controller.go +++ b/apis/core/v1/zz_generated_config_map_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewConfigMap(namespace, name string, obj v1.ConfigMap) *v1.ConfigMap { + obj.APIVersion, obj.Kind = ConfigMapGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ConfigMapList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *configMapClient) Watch(opts metav1.ListOptions) (watch.Interface, error } // Patch applies the patch and returns the patched deployment. -func (s *configMapClient) Patch(o *v1.ConfigMap, data []byte, subresources ...string) (*v1.ConfigMap, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *configMapClient) Patch(o *v1.ConfigMap, patchType types.PatchType, data []byte, subresources ...string) (*v1.ConfigMap, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ConfigMap), err } @@ -278,6 +286,7 @@ type ConfigMapClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ConfigMapInterface } @@ -298,6 +307,10 @@ func (n *configMapClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *configMapClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *configMapClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_endpoints_controller.go b/apis/core/v1/zz_generated_endpoints_controller.go index 4ceceb35..7d3d0ae0 100644 --- a/apis/core/v1/zz_generated_endpoints_controller.go +++ b/apis/core/v1/zz_generated_endpoints_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewEndpoints(namespace, name string, obj v1.Endpoints) *v1.Endpoints { + obj.APIVersion, obj.Kind = EndpointsGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type EndpointsList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *endpointsClient) Watch(opts metav1.ListOptions) (watch.Interface, error } // Patch applies the patch and returns the patched deployment. -func (s *endpointsClient) Patch(o *v1.Endpoints, data []byte, subresources ...string) (*v1.Endpoints, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *endpointsClient) Patch(o *v1.Endpoints, patchType types.PatchType, data []byte, subresources ...string) (*v1.Endpoints, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Endpoints), err } @@ -278,6 +286,7 @@ type EndpointsClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() EndpointsInterface } @@ -298,6 +307,10 @@ func (n *endpointsClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *endpointsClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *endpointsClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_event_controller.go b/apis/core/v1/zz_generated_event_controller.go index 69b4fd83..d58d0581 100644 --- a/apis/core/v1/zz_generated_event_controller.go +++ b/apis/core/v1/zz_generated_event_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewEvent(namespace, name string, obj v1.Event) *v1.Event { + obj.APIVersion, obj.Kind = EventGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type EventList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *eventClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *eventClient) Patch(o *v1.Event, data []byte, subresources ...string) (*v1.Event, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *eventClient) Patch(o *v1.Event, patchType types.PatchType, data []byte, subresources ...string) (*v1.Event, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Event), err } @@ -277,6 +285,7 @@ type EventClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() EventInterface } @@ -297,6 +306,10 @@ func (n *eventClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *eventClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *eventClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_k8s_client.go b/apis/core/v1/zz_generated_k8s_client.go index 66e4fa43..b0facef2 100644 --- a/apis/core/v1/zz_generated_k8s_client.go +++ b/apis/core/v1/zz_generated_k8s_client.go @@ -36,6 +36,8 @@ type Interface interface { } type Clients struct { + Interface Interface + Node NodeClient ComponentStatus ComponentStatusClient Namespace NamespaceClient @@ -102,6 +104,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, Node: &nodeClient2{ iface: iface.Nodes(""), diff --git a/apis/core/v1/zz_generated_namespace_controller.go b/apis/core/v1/zz_generated_namespace_controller.go index d3fbc712..091c1036 100644 --- a/apis/core/v1/zz_generated_namespace_controller.go +++ b/apis/core/v1/zz_generated_namespace_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNamespace(namespace, name string, obj v1.Namespace) *v1.Namespace { + obj.APIVersion, obj.Kind = NamespaceGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NamespaceList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *namespaceClient) Watch(opts metav1.ListOptions) (watch.Interface, error } // Patch applies the patch and returns the patched deployment. -func (s *namespaceClient) Patch(o *v1.Namespace, data []byte, subresources ...string) (*v1.Namespace, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *namespaceClient) Patch(o *v1.Namespace, patchType types.PatchType, data []byte, subresources ...string) (*v1.Namespace, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Namespace), err } @@ -277,6 +285,7 @@ type NamespaceClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NamespaceInterface } @@ -297,6 +306,10 @@ func (n *namespaceClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *namespaceClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *namespaceClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_node_controller.go b/apis/core/v1/zz_generated_node_controller.go index c3e4022c..55579c69 100644 --- a/apis/core/v1/zz_generated_node_controller.go +++ b/apis/core/v1/zz_generated_node_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNode(namespace, name string, obj v1.Node) *v1.Node { + obj.APIVersion, obj.Kind = NodeGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NodeList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *nodeClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *nodeClient) Patch(o *v1.Node, data []byte, subresources ...string) (*v1.Node, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *nodeClient) Patch(o *v1.Node, patchType types.PatchType, data []byte, subresources ...string) (*v1.Node, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Node), err } @@ -277,6 +285,7 @@ type NodeClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NodeInterface } @@ -297,6 +306,10 @@ func (n *nodeClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *nodeClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *nodeClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 6f3e7fe9..d06c6d0a 100644 --- a/apis/core/v1/zz_generated_persistent_volume_claim_controller.go +++ b/apis/core/v1/zz_generated_persistent_volume_claim_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewPersistentVolumeClaim(namespace, name string, obj v1.PersistentVolumeClaim) *v1.PersistentVolumeClaim { + obj.APIVersion, obj.Kind = PersistentVolumeClaimGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PersistentVolumeClaimList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *persistentVolumeClaimClient) Watch(opts metav1.ListOptions) (watch.Inte } // Patch applies the patch and returns the patched deployment. -func (s *persistentVolumeClaimClient) Patch(o *v1.PersistentVolumeClaim, data []byte, subresources ...string) (*v1.PersistentVolumeClaim, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *persistentVolumeClaimClient) Patch(o *v1.PersistentVolumeClaim, patchType types.PatchType, data []byte, subresources ...string) (*v1.PersistentVolumeClaim, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.PersistentVolumeClaim), err } @@ -278,6 +286,7 @@ type PersistentVolumeClaimClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PersistentVolumeClaimInterface } @@ -298,6 +307,10 @@ func (n *persistentVolumeClaimClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *persistentVolumeClaimClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *persistentVolumeClaimClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_pod_controller.go b/apis/core/v1/zz_generated_pod_controller.go index b6fa083a..c8bb2c19 100644 --- a/apis/core/v1/zz_generated_pod_controller.go +++ b/apis/core/v1/zz_generated_pod_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewPod(namespace, name string, obj v1.Pod) *v1.Pod { + obj.APIVersion, obj.Kind = PodGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PodList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *podClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *podClient) Patch(o *v1.Pod, data []byte, subresources ...string) (*v1.Pod, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *podClient) Patch(o *v1.Pod, patchType types.PatchType, data []byte, subresources ...string) (*v1.Pod, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Pod), err } @@ -278,6 +286,7 @@ type PodClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PodInterface } @@ -298,6 +307,10 @@ func (n *podClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *podClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *podClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_replication_controller_controller.go b/apis/core/v1/zz_generated_replication_controller_controller.go index 1081745c..807cc83a 100644 --- a/apis/core/v1/zz_generated_replication_controller_controller.go +++ b/apis/core/v1/zz_generated_replication_controller_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewReplicationController(namespace, name string, obj v1.ReplicationController) *v1.ReplicationController { + obj.APIVersion, obj.Kind = ReplicationControllerGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ReplicationControllerList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *replicationControllerClient) Watch(opts metav1.ListOptions) (watch.Inte } // Patch applies the patch and returns the patched deployment. -func (s *replicationControllerClient) Patch(o *v1.ReplicationController, data []byte, subresources ...string) (*v1.ReplicationController, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *replicationControllerClient) Patch(o *v1.ReplicationController, patchType types.PatchType, data []byte, subresources ...string) (*v1.ReplicationController, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ReplicationController), err } @@ -278,6 +286,7 @@ type ReplicationControllerClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ReplicationControllerInterface } @@ -298,6 +307,10 @@ func (n *replicationControllerClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *replicationControllerClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *replicationControllerClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_resource_quota_controller.go b/apis/core/v1/zz_generated_resource_quota_controller.go index 2ab241af..8dd1341e 100644 --- a/apis/core/v1/zz_generated_resource_quota_controller.go +++ b/apis/core/v1/zz_generated_resource_quota_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewResourceQuota(namespace, name string, obj v1.ResourceQuota) *v1.ResourceQuota { + obj.APIVersion, obj.Kind = ResourceQuotaGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ResourceQuotaList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *resourceQuotaClient) Watch(opts metav1.ListOptions) (watch.Interface, e } // Patch applies the patch and returns the patched deployment. -func (s *resourceQuotaClient) Patch(o *v1.ResourceQuota, data []byte, subresources ...string) (*v1.ResourceQuota, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *resourceQuotaClient) Patch(o *v1.ResourceQuota, patchType types.PatchType, data []byte, subresources ...string) (*v1.ResourceQuota, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ResourceQuota), err } @@ -278,6 +286,7 @@ type ResourceQuotaClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ResourceQuotaInterface } @@ -298,6 +307,10 @@ func (n *resourceQuotaClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *resourceQuotaClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *resourceQuotaClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_secret_controller.go b/apis/core/v1/zz_generated_secret_controller.go index 6ed18b95..020b0dce 100644 --- a/apis/core/v1/zz_generated_secret_controller.go +++ b/apis/core/v1/zz_generated_secret_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewSecret(namespace, name string, obj v1.Secret) *v1.Secret { + obj.APIVersion, obj.Kind = SecretGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type SecretList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *secretClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *secretClient) Patch(o *v1.Secret, data []byte, subresources ...string) (*v1.Secret, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *secretClient) Patch(o *v1.Secret, patchType types.PatchType, data []byte, subresources ...string) (*v1.Secret, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Secret), err } @@ -278,6 +286,7 @@ type SecretClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() SecretInterface } @@ -298,6 +307,10 @@ func (n *secretClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *secretClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *secretClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_service_account_controller.go b/apis/core/v1/zz_generated_service_account_controller.go index 2dfbcd07..ef1f84e9 100644 --- a/apis/core/v1/zz_generated_service_account_controller.go +++ b/apis/core/v1/zz_generated_service_account_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewServiceAccount(namespace, name string, obj v1.ServiceAccount) *v1.ServiceAccount { + obj.APIVersion, obj.Kind = ServiceAccountGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ServiceAccountList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *serviceAccountClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *serviceAccountClient) Patch(o *v1.ServiceAccount, data []byte, subresources ...string) (*v1.ServiceAccount, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *serviceAccountClient) Patch(o *v1.ServiceAccount, patchType types.PatchType, data []byte, subresources ...string) (*v1.ServiceAccount, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ServiceAccount), err } @@ -278,6 +286,7 @@ type ServiceAccountClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ServiceAccountInterface } @@ -298,6 +307,10 @@ func (n *serviceAccountClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *serviceAccountClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *serviceAccountClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/core/v1/zz_generated_service_controller.go b/apis/core/v1/zz_generated_service_controller.go index cb7279f4..d455c53c 100644 --- a/apis/core/v1/zz_generated_service_controller.go +++ b/apis/core/v1/zz_generated_service_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewService(namespace, name string, obj v1.Service) *v1.Service { + obj.APIVersion, obj.Kind = ServiceGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ServiceList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *serviceClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *serviceClient) Patch(o *v1.Service, data []byte, subresources ...string) (*v1.Service, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *serviceClient) Patch(o *v1.Service, patchType types.PatchType, data []byte, subresources ...string) (*v1.Service, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Service), err } @@ -278,6 +286,7 @@ type ServiceClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ServiceInterface } @@ -298,6 +307,10 @@ func (n *serviceClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *serviceClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *serviceClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/extensions/v1beta1/zz_generated_ingress_controller.go b/apis/extensions/v1beta1/zz_generated_ingress_controller.go index 2a6bb590..b06ae037 100644 --- a/apis/extensions/v1beta1/zz_generated_ingress_controller.go +++ b/apis/extensions/v1beta1/zz_generated_ingress_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewIngress(namespace, name string, obj v1beta1.Ingress) *v1beta1.Ingress { + obj.APIVersion, obj.Kind = IngressGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type IngressList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *ingressClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *ingressClient) Patch(o *v1beta1.Ingress, data []byte, subresources ...string) (*v1beta1.Ingress, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *ingressClient) Patch(o *v1beta1.Ingress, patchType types.PatchType, data []byte, subresources ...string) (*v1beta1.Ingress, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1beta1.Ingress), err } @@ -278,6 +286,7 @@ type IngressClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() IngressInterface } @@ -298,6 +307,10 @@ func (n *ingressClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *ingressClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *ingressClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/extensions/v1beta1/zz_generated_k8s_client.go b/apis/extensions/v1beta1/zz_generated_k8s_client.go index aa837622..0712a537 100644 --- a/apis/extensions/v1beta1/zz_generated_k8s_client.go +++ b/apis/extensions/v1beta1/zz_generated_k8s_client.go @@ -25,6 +25,8 @@ type Interface interface { } type Clients struct { + Interface Interface + PodSecurityPolicy PodSecurityPolicyClient Ingress IngressClient } @@ -69,6 +71,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, PodSecurityPolicy: &podSecurityPolicyClient2{ iface: iface.PodSecurityPolicies(""), 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 24a0b43f..160b0489 100644 --- a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go +++ b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewPodSecurityPolicy(namespace, name string, obj v1beta1.PodSecurityPolicy) *v1beta1.PodSecurityPolicy { + obj.APIVersion, obj.Kind = PodSecurityPolicyGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PodSecurityPolicyList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *podSecurityPolicyClient) Watch(opts metav1.ListOptions) (watch.Interfac } // Patch applies the patch and returns the patched deployment. -func (s *podSecurityPolicyClient) Patch(o *v1beta1.PodSecurityPolicy, data []byte, subresources ...string) (*v1beta1.PodSecurityPolicy, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *podSecurityPolicyClient) Patch(o *v1beta1.PodSecurityPolicy, patchType types.PatchType, data []byte, subresources ...string) (*v1beta1.PodSecurityPolicy, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1beta1.PodSecurityPolicy), err } @@ -277,6 +285,7 @@ type PodSecurityPolicyClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PodSecurityPolicyInterface } @@ -297,6 +306,10 @@ func (n *podSecurityPolicyClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *podSecurityPolicyClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *podSecurityPolicyClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 d776b04c..d27f1bed 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewAuthConfig(namespace, name string, obj AuthConfig) *AuthConfig { + obj.APIVersion, obj.Kind = AuthConfigGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type AuthConfigList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *authConfigClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *authConfigClient) Patch(o *AuthConfig, data []byte, subresources ...string) (*AuthConfig, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *authConfigClient) Patch(o *AuthConfig, patchType types.PatchType, data []byte, subresources ...string) (*AuthConfig, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*AuthConfig), err } @@ -276,6 +284,7 @@ type AuthConfigClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() AuthConfigInterface } @@ -296,6 +305,10 @@ func (n *authConfigClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *authConfigClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *authConfigClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 819fbe4f..a16544eb 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewCatalog(namespace, name string, obj Catalog) *Catalog { + obj.APIVersion, obj.Kind = CatalogGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type CatalogList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *catalogClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *catalogClient) Patch(o *Catalog, data []byte, subresources ...string) (*Catalog, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *catalogClient) Patch(o *Catalog, patchType types.PatchType, data []byte, subresources ...string) (*Catalog, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Catalog), err } @@ -276,6 +284,7 @@ type CatalogClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() CatalogInterface } @@ -296,6 +305,10 @@ func (n *catalogClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *catalogClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *catalogClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 840fa44d..5ac5f067 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterAlert(namespace, name string, obj ClusterAlert) *ClusterAlert { + obj.APIVersion, obj.Kind = ClusterAlertGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterAlertList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterAlertClient) Watch(opts metav1.ListOptions) (watch.Interface, er } // Patch applies the patch and returns the patched deployment. -func (s *clusterAlertClient) Patch(o *ClusterAlert, data []byte, subresources ...string) (*ClusterAlert, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterAlertClient) Patch(o *ClusterAlert, patchType types.PatchType, data []byte, subresources ...string) (*ClusterAlert, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterAlert), err } @@ -277,6 +285,7 @@ type ClusterAlertClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterAlertInterface } @@ -297,6 +306,10 @@ func (n *clusterAlertClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterAlertClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterAlertClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go index 5e75a3ba..7efdd5ef 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_group_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterAlertGroup(namespace, name string, obj ClusterAlertGroup) *ClusterAlertGroup { + obj.APIVersion, obj.Kind = ClusterAlertGroupGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterAlertGroupList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterAlertGroupClient) Watch(opts metav1.ListOptions) (watch.Interfac } // Patch applies the patch and returns the patched deployment. -func (s *clusterAlertGroupClient) Patch(o *ClusterAlertGroup, data []byte, subresources ...string) (*ClusterAlertGroup, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterAlertGroupClient) Patch(o *ClusterAlertGroup, patchType types.PatchType, data []byte, subresources ...string) (*ClusterAlertGroup, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterAlertGroup), err } @@ -277,6 +285,7 @@ type ClusterAlertGroupClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterAlertGroupInterface } @@ -297,6 +306,10 @@ func (n *clusterAlertGroupClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterAlertGroupClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterAlertGroupClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go index bdea3797..f5bd6779 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_alert_rule_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterAlertRule(namespace, name string, obj ClusterAlertRule) *ClusterAlertRule { + obj.APIVersion, obj.Kind = ClusterAlertRuleGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterAlertRuleList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterAlertRuleClient) Watch(opts metav1.ListOptions) (watch.Interface } // Patch applies the patch and returns the patched deployment. -func (s *clusterAlertRuleClient) Patch(o *ClusterAlertRule, data []byte, subresources ...string) (*ClusterAlertRule, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterAlertRuleClient) Patch(o *ClusterAlertRule, patchType types.PatchType, data []byte, subresources ...string) (*ClusterAlertRule, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterAlertRule), err } @@ -277,6 +285,7 @@ type ClusterAlertRuleClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterAlertRuleInterface } @@ -297,6 +306,10 @@ func (n *clusterAlertRuleClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterAlertRuleClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterAlertRuleClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 9f2bc5f2..aa91b49e 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterCatalog(namespace, name string, obj ClusterCatalog) *ClusterCatalog { + obj.APIVersion, obj.Kind = ClusterCatalogGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterCatalogList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterCatalogClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *clusterCatalogClient) Patch(o *ClusterCatalog, data []byte, subresources ...string) (*ClusterCatalog, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterCatalogClient) Patch(o *ClusterCatalog, patchType types.PatchType, data []byte, subresources ...string) (*ClusterCatalog, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterCatalog), err } @@ -277,6 +285,7 @@ type ClusterCatalogClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterCatalogInterface } @@ -297,6 +306,10 @@ func (n *clusterCatalogClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterCatalogClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterCatalogClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 0ca82dec..ae2df231 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewCluster(namespace, name string, obj Cluster) *Cluster { + obj.APIVersion, obj.Kind = ClusterGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *clusterClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *clusterClient) Patch(o *Cluster, data []byte, subresources ...string) (*Cluster, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterClient) Patch(o *Cluster, patchType types.PatchType, data []byte, subresources ...string) (*Cluster, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Cluster), err } @@ -276,6 +284,7 @@ type ClusterClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterInterface } @@ -296,6 +305,10 @@ func (n *clusterClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 f829be9e..bb8bad4b 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterLogging(namespace, name string, obj ClusterLogging) *ClusterLogging { + obj.APIVersion, obj.Kind = ClusterLoggingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterLoggingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterLoggingClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *clusterLoggingClient) Patch(o *ClusterLogging, data []byte, subresources ...string) (*ClusterLogging, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterLoggingClient) Patch(o *ClusterLogging, patchType types.PatchType, data []byte, subresources ...string) (*ClusterLogging, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterLogging), err } @@ -277,6 +285,7 @@ type ClusterLoggingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterLoggingInterface } @@ -297,6 +306,10 @@ func (n *clusterLoggingClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterLoggingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterLoggingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go index 2b129ace..fe315647 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_monitor_graph_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterMonitorGraph(namespace, name string, obj ClusterMonitorGraph) *ClusterMonitorGraph { + obj.APIVersion, obj.Kind = ClusterMonitorGraphGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterMonitorGraphList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterMonitorGraphClient) Watch(opts metav1.ListOptions) (watch.Interf } // Patch applies the patch and returns the patched deployment. -func (s *clusterMonitorGraphClient) Patch(o *ClusterMonitorGraph, data []byte, subresources ...string) (*ClusterMonitorGraph, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterMonitorGraphClient) Patch(o *ClusterMonitorGraph, patchType types.PatchType, data []byte, subresources ...string) (*ClusterMonitorGraph, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterMonitorGraph), err } @@ -277,6 +285,7 @@ type ClusterMonitorGraphClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterMonitorGraphInterface } @@ -297,6 +306,10 @@ func (n *clusterMonitorGraphClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterMonitorGraphClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterMonitorGraphClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 b619c0ba..d604b19b 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterRegistrationToken(namespace, name string, obj ClusterRegistrationToken) *ClusterRegistrationToken { + obj.APIVersion, obj.Kind = ClusterRegistrationTokenGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterRegistrationTokenList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterRegistrationTokenClient) Watch(opts metav1.ListOptions) (watch.I } // Patch applies the patch and returns the patched deployment. -func (s *clusterRegistrationTokenClient) Patch(o *ClusterRegistrationToken, data []byte, subresources ...string) (*ClusterRegistrationToken, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterRegistrationTokenClient) Patch(o *ClusterRegistrationToken, patchType types.PatchType, data []byte, subresources ...string) (*ClusterRegistrationToken, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterRegistrationToken), err } @@ -277,6 +285,7 @@ type ClusterRegistrationTokenClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterRegistrationTokenInterface } @@ -297,6 +306,10 @@ func (n *clusterRegistrationTokenClient2) Generic() controller.GenericController return n.iface.Controller().Generic() } +func (n *clusterRegistrationTokenClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterRegistrationTokenClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 0c0eb49a..572d8893 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterRoleTemplateBinding(namespace, name string, obj ClusterRoleTemplateBinding) *ClusterRoleTemplateBinding { + obj.APIVersion, obj.Kind = ClusterRoleTemplateBindingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterRoleTemplateBindingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterRoleTemplateBindingClient) Watch(opts metav1.ListOptions) (watch } // Patch applies the patch and returns the patched deployment. -func (s *clusterRoleTemplateBindingClient) Patch(o *ClusterRoleTemplateBinding, data []byte, subresources ...string) (*ClusterRoleTemplateBinding, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterRoleTemplateBindingClient) Patch(o *ClusterRoleTemplateBinding, patchType types.PatchType, data []byte, subresources ...string) (*ClusterRoleTemplateBinding, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ClusterRoleTemplateBinding), err } @@ -277,6 +285,7 @@ type ClusterRoleTemplateBindingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterRoleTemplateBindingInterface } @@ -297,6 +306,10 @@ func (n *clusterRoleTemplateBindingClient2) Generic() controller.GenericControll return n.iface.Controller().Generic() } +func (n *clusterRoleTemplateBindingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterRoleTemplateBindingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 b67c3796..96e9fbd4 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewComposeConfig(namespace, name string, obj ComposeConfig) *ComposeConfig { + obj.APIVersion, obj.Kind = ComposeConfigGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ComposeConfigList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *composeConfigClient) Watch(opts metav1.ListOptions) (watch.Interface, e } // Patch applies the patch and returns the patched deployment. -func (s *composeConfigClient) Patch(o *ComposeConfig, data []byte, subresources ...string) (*ComposeConfig, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *composeConfigClient) Patch(o *ComposeConfig, patchType types.PatchType, data []byte, subresources ...string) (*ComposeConfig, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ComposeConfig), err } @@ -276,6 +284,7 @@ type ComposeConfigClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ComposeConfigInterface } @@ -296,6 +305,10 @@ func (n *composeConfigClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *composeConfigClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *composeConfigClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 9dceac6f..2ac34be8 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewDynamicSchema(namespace, name string, obj DynamicSchema) *DynamicSchema { + obj.APIVersion, obj.Kind = DynamicSchemaGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type DynamicSchemaList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *dynamicSchemaClient) Watch(opts metav1.ListOptions) (watch.Interface, e } // Patch applies the patch and returns the patched deployment. -func (s *dynamicSchemaClient) Patch(o *DynamicSchema, data []byte, subresources ...string) (*DynamicSchema, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *dynamicSchemaClient) Patch(o *DynamicSchema, patchType types.PatchType, data []byte, subresources ...string) (*DynamicSchema, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*DynamicSchema), err } @@ -276,6 +284,7 @@ type DynamicSchemaClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() DynamicSchemaInterface } @@ -296,6 +305,10 @@ func (n *dynamicSchemaClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *dynamicSchemaClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *dynamicSchemaClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go b/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go index f6041379..7f1cfc94 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_dns_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewGlobalDNS(namespace, name string, obj GlobalDNS) *GlobalDNS { + obj.APIVersion, obj.Kind = GlobalDNSGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type GlobalDNSList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *globalDnsClient) Watch(opts metav1.ListOptions) (watch.Interface, error } // Patch applies the patch and returns the patched deployment. -func (s *globalDnsClient) Patch(o *GlobalDNS, data []byte, subresources ...string) (*GlobalDNS, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *globalDnsClient) Patch(o *GlobalDNS, patchType types.PatchType, data []byte, subresources ...string) (*GlobalDNS, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*GlobalDNS), err } @@ -277,6 +285,7 @@ type GlobalDNSClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() GlobalDNSInterface } @@ -297,6 +306,10 @@ func (n *globalDnsClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *globalDnsClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *globalDnsClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go b/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go index 5bb7dd29..f131c358 100644 --- a/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewGlobalDNSProvider(namespace, name string, obj GlobalDNSProvider) *GlobalDNSProvider { + obj.APIVersion, obj.Kind = GlobalDNSProviderGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type GlobalDNSProviderList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *globalDnsProviderClient) Watch(opts metav1.ListOptions) (watch.Interfac } // Patch applies the patch and returns the patched deployment. -func (s *globalDnsProviderClient) Patch(o *GlobalDNSProvider, data []byte, subresources ...string) (*GlobalDNSProvider, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *globalDnsProviderClient) Patch(o *GlobalDNSProvider, patchType types.PatchType, data []byte, subresources ...string) (*GlobalDNSProvider, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*GlobalDNSProvider), err } @@ -276,6 +284,7 @@ type GlobalDNSProviderClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() GlobalDNSProviderInterface } @@ -296,6 +305,10 @@ func (n *globalDnsProviderClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *globalDnsProviderClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *globalDnsProviderClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 78c990da..6a156018 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewGlobalRoleBinding(namespace, name string, obj GlobalRoleBinding) *GlobalRoleBinding { + obj.APIVersion, obj.Kind = GlobalRoleBindingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type GlobalRoleBindingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *globalRoleBindingClient) Watch(opts metav1.ListOptions) (watch.Interfac } // Patch applies the patch and returns the patched deployment. -func (s *globalRoleBindingClient) Patch(o *GlobalRoleBinding, data []byte, subresources ...string) (*GlobalRoleBinding, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *globalRoleBindingClient) Patch(o *GlobalRoleBinding, patchType types.PatchType, data []byte, subresources ...string) (*GlobalRoleBinding, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*GlobalRoleBinding), err } @@ -276,6 +284,7 @@ type GlobalRoleBindingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() GlobalRoleBindingInterface } @@ -296,6 +305,10 @@ func (n *globalRoleBindingClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *globalRoleBindingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *globalRoleBindingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 78ddec64..c1bd1833 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewGlobalRole(namespace, name string, obj GlobalRole) *GlobalRole { + obj.APIVersion, obj.Kind = GlobalRoleGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type GlobalRoleList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *globalRoleClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *globalRoleClient) Patch(o *GlobalRole, data []byte, subresources ...string) (*GlobalRole, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *globalRoleClient) Patch(o *GlobalRole, patchType types.PatchType, data []byte, subresources ...string) (*GlobalRole, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*GlobalRole), err } @@ -276,6 +284,7 @@ type GlobalRoleClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() GlobalRoleInterface } @@ -296,6 +305,10 @@ func (n *globalRoleClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *globalRoleClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *globalRoleClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 69cc7b80..c1163ddb 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_group_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewGroup(namespace, name string, obj Group) *Group { + obj.APIVersion, obj.Kind = GroupGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type GroupList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *groupClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *groupClient) Patch(o *Group, data []byte, subresources ...string) (*Group, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *groupClient) Patch(o *Group, patchType types.PatchType, data []byte, subresources ...string) (*Group, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Group), err } @@ -276,6 +284,7 @@ type GroupClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() GroupInterface } @@ -296,6 +305,10 @@ func (n *groupClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *groupClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *groupClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 0700a9a7..d72d0bee 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewGroupMember(namespace, name string, obj GroupMember) *GroupMember { + obj.APIVersion, obj.Kind = GroupMemberGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type GroupMemberList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *groupMemberClient) Watch(opts metav1.ListOptions) (watch.Interface, err } // Patch applies the patch and returns the patched deployment. -func (s *groupMemberClient) Patch(o *GroupMember, data []byte, subresources ...string) (*GroupMember, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *groupMemberClient) Patch(o *GroupMember, patchType types.PatchType, data []byte, subresources ...string) (*GroupMember, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*GroupMember), err } @@ -276,6 +284,7 @@ type GroupMemberClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() GroupMemberInterface } @@ -296,6 +305,10 @@ func (n *groupMemberClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *groupMemberClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *groupMemberClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_k8s_client.go b/apis/management.cattle.io/v3/zz_generated_k8s_client.go index 52925f77..0d22dee4 100644 --- a/apis/management.cattle.io/v3/zz_generated_k8s_client.go +++ b/apis/management.cattle.io/v3/zz_generated_k8s_client.go @@ -73,6 +73,8 @@ type Interface interface { } type Clients struct { + Interface Interface + NodePool NodePoolClient Node NodeClient NodeDriver NodeDriverClient @@ -213,6 +215,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, NodePool: &nodePoolClient2{ iface: iface.NodePools(""), diff --git a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go index 28ffb67e..b23748fa 100644 --- a/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_kontainer_driver_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewKontainerDriver(namespace, name string, obj KontainerDriver) *KontainerDriver { + obj.APIVersion, obj.Kind = KontainerDriverGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type KontainerDriverList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *kontainerDriverClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *kontainerDriverClient) Patch(o *KontainerDriver, data []byte, subresources ...string) (*KontainerDriver, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *kontainerDriverClient) Patch(o *KontainerDriver, patchType types.PatchType, data []byte, subresources ...string) (*KontainerDriver, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*KontainerDriver), err } @@ -276,6 +284,7 @@ type KontainerDriverClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() KontainerDriverInterface } @@ -296,6 +305,10 @@ func (n *kontainerDriverClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *kontainerDriverClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *kontainerDriverClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 76d097ef..17ba4756 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewLdapConfig(namespace, name string, obj LdapConfig) *LdapConfig { + obj.APIVersion, obj.Kind = LdapConfigGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type LdapConfigList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *ldapConfigClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *ldapConfigClient) Patch(o *LdapConfig, data []byte, subresources ...string) (*LdapConfig, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *ldapConfigClient) Patch(o *LdapConfig, patchType types.PatchType, data []byte, subresources ...string) (*LdapConfig, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*LdapConfig), err } @@ -276,6 +284,7 @@ type LdapConfigClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() LdapConfigInterface } @@ -296,6 +305,10 @@ func (n *ldapConfigClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *ldapConfigClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *ldapConfigClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 bef452b7..481a6e4f 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewListenConfig(namespace, name string, obj ListenConfig) *ListenConfig { + obj.APIVersion, obj.Kind = ListenConfigGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ListenConfigList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *listenConfigClient) Watch(opts metav1.ListOptions) (watch.Interface, er } // Patch applies the patch and returns the patched deployment. -func (s *listenConfigClient) Patch(o *ListenConfig, data []byte, subresources ...string) (*ListenConfig, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *listenConfigClient) Patch(o *ListenConfig, patchType types.PatchType, data []byte, subresources ...string) (*ListenConfig, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ListenConfig), err } @@ -276,6 +284,7 @@ type ListenConfigClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ListenConfigInterface } @@ -296,6 +305,10 @@ func (n *listenConfigClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *listenConfigClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *listenConfigClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go b/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go index a8ebfb84..9dd4f317 100644 --- a/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_monitor_metric_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewMonitorMetric(namespace, name string, obj MonitorMetric) *MonitorMetric { + obj.APIVersion, obj.Kind = MonitorMetricGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type MonitorMetricList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *monitorMetricClient) Watch(opts metav1.ListOptions) (watch.Interface, e } // Patch applies the patch and returns the patched deployment. -func (s *monitorMetricClient) Patch(o *MonitorMetric, data []byte, subresources ...string) (*MonitorMetric, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *monitorMetricClient) Patch(o *MonitorMetric, patchType types.PatchType, data []byte, subresources ...string) (*MonitorMetric, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*MonitorMetric), err } @@ -277,6 +285,7 @@ type MonitorMetricClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() MonitorMetricInterface } @@ -297,6 +306,10 @@ func (n *monitorMetricClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *monitorMetricClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *monitorMetricClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go index 0ddb0bb0..1539e430 100644 --- a/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_multi_cluster_app_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewMultiClusterApp(namespace, name string, obj MultiClusterApp) *MultiClusterApp { + obj.APIVersion, obj.Kind = MultiClusterAppGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type MultiClusterAppList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *multiClusterAppClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *multiClusterAppClient) Patch(o *MultiClusterApp, data []byte, subresources ...string) (*MultiClusterApp, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *multiClusterAppClient) Patch(o *MultiClusterApp, patchType types.PatchType, data []byte, subresources ...string) (*MultiClusterApp, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*MultiClusterApp), err } @@ -277,6 +285,7 @@ type MultiClusterAppClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() MultiClusterAppInterface } @@ -297,6 +306,10 @@ func (n *multiClusterAppClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *multiClusterAppClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *multiClusterAppClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 e977c842..894dbbad 100644 --- a/apis/management.cattle.io/v3/zz_generated_node_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_node_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNode(namespace, name string, obj Node) *Node { + obj.APIVersion, obj.Kind = NodeGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NodeList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *nodeClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *nodeClient) Patch(o *Node, data []byte, subresources ...string) (*Node, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *nodeClient) Patch(o *Node, patchType types.PatchType, data []byte, subresources ...string) (*Node, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Node), err } @@ -277,6 +285,7 @@ type NodeClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NodeInterface } @@ -297,6 +306,10 @@ func (n *nodeClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *nodeClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *nodeClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 0684dac3..c0ca1624 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewNodeDriver(namespace, name string, obj NodeDriver) *NodeDriver { + obj.APIVersion, obj.Kind = NodeDriverGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NodeDriverList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *nodeDriverClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *nodeDriverClient) Patch(o *NodeDriver, data []byte, subresources ...string) (*NodeDriver, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *nodeDriverClient) Patch(o *NodeDriver, patchType types.PatchType, data []byte, subresources ...string) (*NodeDriver, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NodeDriver), err } @@ -276,6 +284,7 @@ type NodeDriverClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NodeDriverInterface } @@ -296,6 +305,10 @@ func (n *nodeDriverClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *nodeDriverClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *nodeDriverClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 53872e0a..d1adda35 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNodePool(namespace, name string, obj NodePool) *NodePool { + obj.APIVersion, obj.Kind = NodePoolGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NodePoolList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *nodePoolClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *nodePoolClient) Patch(o *NodePool, data []byte, subresources ...string) (*NodePool, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *nodePoolClient) Patch(o *NodePool, patchType types.PatchType, data []byte, subresources ...string) (*NodePool, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NodePool), err } @@ -277,6 +285,7 @@ type NodePoolClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NodePoolInterface } @@ -297,6 +306,10 @@ func (n *nodePoolClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *nodePoolClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *nodePoolClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 3bcb77e3..3a837854 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNodeTemplate(namespace, name string, obj NodeTemplate) *NodeTemplate { + obj.APIVersion, obj.Kind = NodeTemplateGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NodeTemplateList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *nodeTemplateClient) Watch(opts metav1.ListOptions) (watch.Interface, er } // Patch applies the patch and returns the patched deployment. -func (s *nodeTemplateClient) Patch(o *NodeTemplate, data []byte, subresources ...string) (*NodeTemplate, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *nodeTemplateClient) Patch(o *NodeTemplate, patchType types.PatchType, data []byte, subresources ...string) (*NodeTemplate, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NodeTemplate), err } @@ -277,6 +285,7 @@ type NodeTemplateClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NodeTemplateInterface } @@ -297,6 +306,10 @@ func (n *nodeTemplateClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *nodeTemplateClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *nodeTemplateClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 4f2a5b43..ebfc0a34 100644 --- a/apis/management.cattle.io/v3/zz_generated_notifier_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_notifier_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNotifier(namespace, name string, obj Notifier) *Notifier { + obj.APIVersion, obj.Kind = NotifierGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NotifierList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *notifierClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *notifierClient) Patch(o *Notifier, data []byte, subresources ...string) (*Notifier, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *notifierClient) Patch(o *Notifier, patchType types.PatchType, data []byte, subresources ...string) (*Notifier, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Notifier), err } @@ -277,6 +285,7 @@ type NotifierClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NotifierInterface } @@ -297,6 +306,10 @@ func (n *notifierClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *notifierClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *notifierClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 ede7896d..c2ae64f1 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewPodSecurityPolicyTemplate(namespace, name string, obj PodSecurityPolicyTemplate) *PodSecurityPolicyTemplate { + obj.APIVersion, obj.Kind = PodSecurityPolicyTemplateGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PodSecurityPolicyTemplateList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *podSecurityPolicyTemplateClient) Watch(opts metav1.ListOptions) (watch. } // Patch applies the patch and returns the patched deployment. -func (s *podSecurityPolicyTemplateClient) Patch(o *PodSecurityPolicyTemplate, data []byte, subresources ...string) (*PodSecurityPolicyTemplate, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *podSecurityPolicyTemplateClient) Patch(o *PodSecurityPolicyTemplate, patchType types.PatchType, data []byte, subresources ...string) (*PodSecurityPolicyTemplate, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*PodSecurityPolicyTemplate), err } @@ -276,6 +284,7 @@ type PodSecurityPolicyTemplateClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PodSecurityPolicyTemplateInterface } @@ -296,6 +305,10 @@ func (n *podSecurityPolicyTemplateClient2) Generic() controller.GenericControlle return n.iface.Controller().Generic() } +func (n *podSecurityPolicyTemplateClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *podSecurityPolicyTemplateClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 f275f53d..19617abd 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewPodSecurityPolicyTemplateProjectBinding(namespace, name string, obj PodSecurityPolicyTemplateProjectBinding) *PodSecurityPolicyTemplateProjectBinding { + obj.APIVersion, obj.Kind = PodSecurityPolicyTemplateProjectBindingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PodSecurityPolicyTemplateProjectBindingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *podSecurityPolicyTemplateProjectBindingClient) Watch(opts metav1.ListOp } // Patch applies the patch and returns the patched deployment. -func (s *podSecurityPolicyTemplateProjectBindingClient) Patch(o *PodSecurityPolicyTemplateProjectBinding, data []byte, subresources ...string) (*PodSecurityPolicyTemplateProjectBinding, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *podSecurityPolicyTemplateProjectBindingClient) Patch(o *PodSecurityPolicyTemplateProjectBinding, patchType types.PatchType, data []byte, subresources ...string) (*PodSecurityPolicyTemplateProjectBinding, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*PodSecurityPolicyTemplateProjectBinding), err } @@ -277,6 +285,7 @@ type PodSecurityPolicyTemplateProjectBindingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PodSecurityPolicyTemplateProjectBindingInterface } @@ -297,6 +306,10 @@ func (n *podSecurityPolicyTemplateProjectBindingClient2) Generic() controller.Ge return n.iface.Controller().Generic() } +func (n *podSecurityPolicyTemplateProjectBindingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *podSecurityPolicyTemplateProjectBindingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 a1dae208..4b03dbdf 100644 --- a/apis/management.cattle.io/v3/zz_generated_preference_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_preference_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewPreference(namespace, name string, obj Preference) *Preference { + obj.APIVersion, obj.Kind = PreferenceGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PreferenceList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *preferenceClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *preferenceClient) Patch(o *Preference, data []byte, subresources ...string) (*Preference, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *preferenceClient) Patch(o *Preference, patchType types.PatchType, data []byte, subresources ...string) (*Preference, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Preference), err } @@ -277,6 +285,7 @@ type PreferenceClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PreferenceInterface } @@ -297,6 +306,10 @@ func (n *preferenceClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *preferenceClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *preferenceClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 e561f56b..cbb0e424 100644 --- a/apis/management.cattle.io/v3/zz_generated_principal_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_principal_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewPrincipal(namespace, name string, obj Principal) *Principal { + obj.APIVersion, obj.Kind = PrincipalGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PrincipalList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *principalClient) Watch(opts metav1.ListOptions) (watch.Interface, error } // Patch applies the patch and returns the patched deployment. -func (s *principalClient) Patch(o *Principal, data []byte, subresources ...string) (*Principal, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *principalClient) Patch(o *Principal, patchType types.PatchType, data []byte, subresources ...string) (*Principal, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Principal), err } @@ -276,6 +284,7 @@ type PrincipalClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PrincipalInterface } @@ -296,6 +305,10 @@ func (n *principalClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *principalClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *principalClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 5a03108c..341d5695 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectAlert(namespace, name string, obj ProjectAlert) *ProjectAlert { + obj.APIVersion, obj.Kind = ProjectAlertGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectAlertList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectAlertClient) Watch(opts metav1.ListOptions) (watch.Interface, er } // Patch applies the patch and returns the patched deployment. -func (s *projectAlertClient) Patch(o *ProjectAlert, data []byte, subresources ...string) (*ProjectAlert, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectAlertClient) Patch(o *ProjectAlert, patchType types.PatchType, data []byte, subresources ...string) (*ProjectAlert, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectAlert), err } @@ -277,6 +285,7 @@ type ProjectAlertClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectAlertInterface } @@ -297,6 +306,10 @@ func (n *projectAlertClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectAlertClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectAlertClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go b/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go index 88684948..fd329cef 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_group_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectAlertGroup(namespace, name string, obj ProjectAlertGroup) *ProjectAlertGroup { + obj.APIVersion, obj.Kind = ProjectAlertGroupGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectAlertGroupList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectAlertGroupClient) Watch(opts metav1.ListOptions) (watch.Interfac } // Patch applies the patch and returns the patched deployment. -func (s *projectAlertGroupClient) Patch(o *ProjectAlertGroup, data []byte, subresources ...string) (*ProjectAlertGroup, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectAlertGroupClient) Patch(o *ProjectAlertGroup, patchType types.PatchType, data []byte, subresources ...string) (*ProjectAlertGroup, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectAlertGroup), err } @@ -277,6 +285,7 @@ type ProjectAlertGroupClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectAlertGroupInterface } @@ -297,6 +306,10 @@ func (n *projectAlertGroupClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectAlertGroupClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectAlertGroupClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go b/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go index 5c3e36f8..cc60dd1e 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_alert_rule_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectAlertRule(namespace, name string, obj ProjectAlertRule) *ProjectAlertRule { + obj.APIVersion, obj.Kind = ProjectAlertRuleGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectAlertRuleList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectAlertRuleClient) Watch(opts metav1.ListOptions) (watch.Interface } // Patch applies the patch and returns the patched deployment. -func (s *projectAlertRuleClient) Patch(o *ProjectAlertRule, data []byte, subresources ...string) (*ProjectAlertRule, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectAlertRuleClient) Patch(o *ProjectAlertRule, patchType types.PatchType, data []byte, subresources ...string) (*ProjectAlertRule, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectAlertRule), err } @@ -277,6 +285,7 @@ type ProjectAlertRuleClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectAlertRuleInterface } @@ -297,6 +306,10 @@ func (n *projectAlertRuleClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectAlertRuleClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectAlertRuleClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 a937b2e4..8da60da9 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectCatalog(namespace, name string, obj ProjectCatalog) *ProjectCatalog { + obj.APIVersion, obj.Kind = ProjectCatalogGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectCatalogList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectCatalogClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *projectCatalogClient) Patch(o *ProjectCatalog, data []byte, subresources ...string) (*ProjectCatalog, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectCatalogClient) Patch(o *ProjectCatalog, patchType types.PatchType, data []byte, subresources ...string) (*ProjectCatalog, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectCatalog), err } @@ -277,6 +285,7 @@ type ProjectCatalogClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectCatalogInterface } @@ -297,6 +306,10 @@ func (n *projectCatalogClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectCatalogClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectCatalogClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 dadb28f4..6c674e6b 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProject(namespace, name string, obj Project) *Project { + obj.APIVersion, obj.Kind = ProjectGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *projectClient) Patch(o *Project, data []byte, subresources ...string) (*Project, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectClient) Patch(o *Project, patchType types.PatchType, data []byte, subresources ...string) (*Project, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Project), err } @@ -277,6 +285,7 @@ type ProjectClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectInterface } @@ -297,6 +306,10 @@ func (n *projectClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 7075367b..79e6bd50 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectLogging(namespace, name string, obj ProjectLogging) *ProjectLogging { + obj.APIVersion, obj.Kind = ProjectLoggingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectLoggingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectLoggingClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *projectLoggingClient) Patch(o *ProjectLogging, data []byte, subresources ...string) (*ProjectLogging, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectLoggingClient) Patch(o *ProjectLogging, patchType types.PatchType, data []byte, subresources ...string) (*ProjectLogging, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectLogging), err } @@ -277,6 +285,7 @@ type ProjectLoggingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectLoggingInterface } @@ -297,6 +306,10 @@ func (n *projectLoggingClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectLoggingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectLoggingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go b/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go index 406dc15a..acd61808 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_monitor_graph_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectMonitorGraph(namespace, name string, obj ProjectMonitorGraph) *ProjectMonitorGraph { + obj.APIVersion, obj.Kind = ProjectMonitorGraphGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectMonitorGraphList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectMonitorGraphClient) Watch(opts metav1.ListOptions) (watch.Interf } // Patch applies the patch and returns the patched deployment. -func (s *projectMonitorGraphClient) Patch(o *ProjectMonitorGraph, data []byte, subresources ...string) (*ProjectMonitorGraph, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectMonitorGraphClient) Patch(o *ProjectMonitorGraph, patchType types.PatchType, data []byte, subresources ...string) (*ProjectMonitorGraph, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectMonitorGraph), err } @@ -277,6 +285,7 @@ type ProjectMonitorGraphClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectMonitorGraphInterface } @@ -297,6 +306,10 @@ func (n *projectMonitorGraphClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectMonitorGraphClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectMonitorGraphClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 22fe75b1..12a051f3 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectNetworkPolicy(namespace, name string, obj ProjectNetworkPolicy) *ProjectNetworkPolicy { + obj.APIVersion, obj.Kind = ProjectNetworkPolicyGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectNetworkPolicyList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectNetworkPolicyClient) Watch(opts metav1.ListOptions) (watch.Inter } // Patch applies the patch and returns the patched deployment. -func (s *projectNetworkPolicyClient) Patch(o *ProjectNetworkPolicy, data []byte, subresources ...string) (*ProjectNetworkPolicy, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectNetworkPolicyClient) Patch(o *ProjectNetworkPolicy, patchType types.PatchType, data []byte, subresources ...string) (*ProjectNetworkPolicy, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectNetworkPolicy), err } @@ -277,6 +285,7 @@ type ProjectNetworkPolicyClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectNetworkPolicyInterface } @@ -297,6 +306,10 @@ func (n *projectNetworkPolicyClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *projectNetworkPolicyClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectNetworkPolicyClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 2971e3c4..adfd70f5 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewProjectRoleTemplateBinding(namespace, name string, obj ProjectRoleTemplateBinding) *ProjectRoleTemplateBinding { + obj.APIVersion, obj.Kind = ProjectRoleTemplateBindingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ProjectRoleTemplateBindingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *projectRoleTemplateBindingClient) Watch(opts metav1.ListOptions) (watch } // Patch applies the patch and returns the patched deployment. -func (s *projectRoleTemplateBindingClient) Patch(o *ProjectRoleTemplateBinding, data []byte, subresources ...string) (*ProjectRoleTemplateBinding, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *projectRoleTemplateBindingClient) Patch(o *ProjectRoleTemplateBinding, patchType types.PatchType, data []byte, subresources ...string) (*ProjectRoleTemplateBinding, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ProjectRoleTemplateBinding), err } @@ -277,6 +285,7 @@ type ProjectRoleTemplateBindingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ProjectRoleTemplateBindingInterface } @@ -297,6 +306,10 @@ func (n *projectRoleTemplateBindingClient2) Generic() controller.GenericControll return n.iface.Controller().Generic() } +func (n *projectRoleTemplateBindingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *projectRoleTemplateBindingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 13f62a07..25b348c4 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewRoleTemplate(namespace, name string, obj RoleTemplate) *RoleTemplate { + obj.APIVersion, obj.Kind = RoleTemplateGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type RoleTemplateList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *roleTemplateClient) Watch(opts metav1.ListOptions) (watch.Interface, er } // Patch applies the patch and returns the patched deployment. -func (s *roleTemplateClient) Patch(o *RoleTemplate, data []byte, subresources ...string) (*RoleTemplate, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *roleTemplateClient) Patch(o *RoleTemplate, patchType types.PatchType, data []byte, subresources ...string) (*RoleTemplate, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*RoleTemplate), err } @@ -276,6 +284,7 @@ type RoleTemplateClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() RoleTemplateInterface } @@ -296,6 +305,10 @@ func (n *roleTemplateClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *roleTemplateClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *roleTemplateClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 c834d449..46dc9b6c 100644 --- a/apis/management.cattle.io/v3/zz_generated_setting_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_setting_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewSetting(namespace, name string, obj Setting) *Setting { + obj.APIVersion, obj.Kind = SettingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type SettingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *settingClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *settingClient) Patch(o *Setting, data []byte, subresources ...string) (*Setting, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *settingClient) Patch(o *Setting, patchType types.PatchType, data []byte, subresources ...string) (*Setting, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Setting), err } @@ -276,6 +284,7 @@ type SettingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() SettingInterface } @@ -296,6 +305,10 @@ func (n *settingClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *settingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *settingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 9fd3eadf..7a94dbab 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewTemplateContent(namespace, name string, obj TemplateContent) *TemplateContent { + obj.APIVersion, obj.Kind = TemplateContentGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type TemplateContentList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *templateContentClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *templateContentClient) Patch(o *TemplateContent, data []byte, subresources ...string) (*TemplateContent, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *templateContentClient) Patch(o *TemplateContent, patchType types.PatchType, data []byte, subresources ...string) (*TemplateContent, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*TemplateContent), err } @@ -276,6 +284,7 @@ type TemplateContentClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() TemplateContentInterface } @@ -296,6 +305,10 @@ func (n *templateContentClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *templateContentClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *templateContentClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 bdf7bbf7..5b2b00a1 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewTemplate(namespace, name string, obj Template) *Template { + obj.APIVersion, obj.Kind = TemplateGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type TemplateList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *templateClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *templateClient) Patch(o *Template, data []byte, subresources ...string) (*Template, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *templateClient) Patch(o *Template, patchType types.PatchType, data []byte, subresources ...string) (*Template, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Template), err } @@ -276,6 +284,7 @@ type TemplateClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() TemplateInterface } @@ -296,6 +305,10 @@ func (n *templateClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *templateClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *templateClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 3cfa56c1..30894415 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewTemplateVersion(namespace, name string, obj TemplateVersion) *TemplateVersion { + obj.APIVersion, obj.Kind = TemplateVersionGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type TemplateVersionList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *templateVersionClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *templateVersionClient) Patch(o *TemplateVersion, data []byte, subresources ...string) (*TemplateVersion, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *templateVersionClient) Patch(o *TemplateVersion, patchType types.PatchType, data []byte, subresources ...string) (*TemplateVersion, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*TemplateVersion), err } @@ -276,6 +284,7 @@ type TemplateVersionClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() TemplateVersionInterface } @@ -296,6 +305,10 @@ func (n *templateVersionClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *templateVersionClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *templateVersionClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 7fae9242..3ed52f61 100644 --- a/apis/management.cattle.io/v3/zz_generated_token_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_token_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewToken(namespace, name string, obj Token) *Token { + obj.APIVersion, obj.Kind = TokenGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type TokenList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *tokenClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *tokenClient) Patch(o *Token, data []byte, subresources ...string) (*Token, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *tokenClient) Patch(o *Token, patchType types.PatchType, data []byte, subresources ...string) (*Token, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Token), err } @@ -276,6 +284,7 @@ type TokenClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() TokenInterface } @@ -296,6 +305,10 @@ func (n *tokenClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *tokenClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *tokenClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 2e04cb1b..ceb057df 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewUserAttribute(namespace, name string, obj UserAttribute) *UserAttribute { + obj.APIVersion, obj.Kind = UserAttributeGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type UserAttributeList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *userAttributeClient) Watch(opts metav1.ListOptions) (watch.Interface, e } // Patch applies the patch and returns the patched deployment. -func (s *userAttributeClient) Patch(o *UserAttribute, data []byte, subresources ...string) (*UserAttribute, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *userAttributeClient) Patch(o *UserAttribute, patchType types.PatchType, data []byte, subresources ...string) (*UserAttribute, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*UserAttribute), err } @@ -276,6 +284,7 @@ type UserAttributeClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() UserAttributeInterface } @@ -296,6 +305,10 @@ func (n *userAttributeClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *userAttributeClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *userAttributeClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 a81f30d8..41cf7fae 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_user_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewUser(namespace, name string, obj User) *User { + obj.APIVersion, obj.Kind = UserGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type UserList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *userClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *userClient) Patch(o *User, data []byte, subresources ...string) (*User, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *userClient) Patch(o *User, patchType types.PatchType, data []byte, subresources ...string) (*User, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*User), err } @@ -276,6 +284,7 @@ type UserClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() UserInterface } @@ -296,6 +305,10 @@ func (n *userClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *userClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *userClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 384b7f44..6cc96557 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewAuthProvider(namespace, name string, obj AuthProvider) *AuthProvider { + obj.APIVersion, obj.Kind = AuthProviderGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type AuthProviderList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *authProviderClient) Watch(opts metav1.ListOptions) (watch.Interface, er } // Patch applies the patch and returns the patched deployment. -func (s *authProviderClient) Patch(o *AuthProvider, data []byte, subresources ...string) (*AuthProvider, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *authProviderClient) Patch(o *AuthProvider, patchType types.PatchType, data []byte, subresources ...string) (*AuthProvider, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*AuthProvider), err } @@ -276,6 +284,7 @@ type AuthProviderClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() AuthProviderInterface } @@ -296,6 +305,10 @@ func (n *authProviderClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *authProviderClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *authProviderClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/management.cattle.io/v3public/zz_generated_k8s_client.go b/apis/management.cattle.io/v3public/zz_generated_k8s_client.go index b9bd061c..de196f79 100644 --- a/apis/management.cattle.io/v3public/zz_generated_k8s_client.go +++ b/apis/management.cattle.io/v3public/zz_generated_k8s_client.go @@ -24,6 +24,8 @@ type Interface interface { } type Clients struct { + Interface Interface + AuthProvider AuthProviderClient } @@ -66,6 +68,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, AuthProvider: &authProviderClient2{ iface: iface.AuthProviders(""), diff --git a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go index ec275ae2..95d4cbf5 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewAlertmanager(namespace, name string, obj v1.Alertmanager) *v1.Alertmanager { + obj.APIVersion, obj.Kind = AlertmanagerGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type AlertmanagerList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *alertmanagerClient) Watch(opts metav1.ListOptions) (watch.Interface, er } // Patch applies the patch and returns the patched deployment. -func (s *alertmanagerClient) Patch(o *v1.Alertmanager, data []byte, subresources ...string) (*v1.Alertmanager, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *alertmanagerClient) Patch(o *v1.Alertmanager, patchType types.PatchType, data []byte, subresources ...string) (*v1.Alertmanager, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Alertmanager), err } @@ -278,6 +286,7 @@ type AlertmanagerClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() AlertmanagerInterface } @@ -298,6 +307,10 @@ func (n *alertmanagerClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *alertmanagerClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *alertmanagerClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/monitoring.coreos.com/v1/zz_generated_k8s_client.go b/apis/monitoring.coreos.com/v1/zz_generated_k8s_client.go index fa357c1e..9a6a8849 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_k8s_client.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_k8s_client.go @@ -27,6 +27,8 @@ type Interface interface { } type Clients struct { + Interface Interface + Prometheus PrometheusClient Alertmanager AlertmanagerClient PrometheusRule PrometheusRuleClient @@ -75,6 +77,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, Prometheus: &prometheusClient2{ iface: iface.Prometheuses(""), diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go index 93120dbe..135c6704 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewPrometheus(namespace, name string, obj v1.Prometheus) *v1.Prometheus { + obj.APIVersion, obj.Kind = PrometheusGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PrometheusList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *prometheusClient) Watch(opts metav1.ListOptions) (watch.Interface, erro } // Patch applies the patch and returns the patched deployment. -func (s *prometheusClient) Patch(o *v1.Prometheus, data []byte, subresources ...string) (*v1.Prometheus, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *prometheusClient) Patch(o *v1.Prometheus, patchType types.PatchType, data []byte, subresources ...string) (*v1.Prometheus, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Prometheus), err } @@ -278,6 +286,7 @@ type PrometheusClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PrometheusInterface } @@ -298,6 +307,10 @@ func (n *prometheusClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *prometheusClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *prometheusClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go index 10ddac1e..99396e4a 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewPrometheusRule(namespace, name string, obj v1.PrometheusRule) *v1.PrometheusRule { + obj.APIVersion, obj.Kind = PrometheusRuleGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PrometheusRuleList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *prometheusRuleClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *prometheusRuleClient) Patch(o *v1.PrometheusRule, data []byte, subresources ...string) (*v1.PrometheusRule, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *prometheusRuleClient) Patch(o *v1.PrometheusRule, patchType types.PatchType, data []byte, subresources ...string) (*v1.PrometheusRule, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.PrometheusRule), err } @@ -278,6 +286,7 @@ type PrometheusRuleClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PrometheusRuleInterface } @@ -298,6 +307,10 @@ func (n *prometheusRuleClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *prometheusRuleClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *prometheusRuleClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go index 58dc8997..21907026 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewServiceMonitor(namespace, name string, obj v1.ServiceMonitor) *v1.ServiceMonitor { + obj.APIVersion, obj.Kind = ServiceMonitorGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ServiceMonitorList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *serviceMonitorClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *serviceMonitorClient) Patch(o *v1.ServiceMonitor, data []byte, subresources ...string) (*v1.ServiceMonitor, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *serviceMonitorClient) Patch(o *v1.ServiceMonitor, patchType types.PatchType, data []byte, subresources ...string) (*v1.ServiceMonitor, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ServiceMonitor), err } @@ -278,6 +286,7 @@ type ServiceMonitorClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ServiceMonitorInterface } @@ -298,6 +307,10 @@ func (n *serviceMonitorClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *serviceMonitorClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *serviceMonitorClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/networking.k8s.io/v1/zz_generated_k8s_client.go b/apis/networking.k8s.io/v1/zz_generated_k8s_client.go index 7999c165..33b37729 100644 --- a/apis/networking.k8s.io/v1/zz_generated_k8s_client.go +++ b/apis/networking.k8s.io/v1/zz_generated_k8s_client.go @@ -24,6 +24,8 @@ type Interface interface { } type Clients struct { + Interface Interface + NetworkPolicy NetworkPolicyClient } @@ -66,6 +68,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, NetworkPolicy: &networkPolicyClient2{ iface: iface.NetworkPolicies(""), 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 69a4fec9..67a2be7d 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 @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewNetworkPolicy(namespace, name string, obj v1.NetworkPolicy) *v1.NetworkPolicy { + obj.APIVersion, obj.Kind = NetworkPolicyGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NetworkPolicyList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *networkPolicyClient) Watch(opts metav1.ListOptions) (watch.Interface, e } // Patch applies the patch and returns the patched deployment. -func (s *networkPolicyClient) Patch(o *v1.NetworkPolicy, data []byte, subresources ...string) (*v1.NetworkPolicy, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *networkPolicyClient) Patch(o *v1.NetworkPolicy, patchType types.PatchType, data []byte, subresources ...string) (*v1.NetworkPolicy, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.NetworkPolicy), err } @@ -278,6 +286,7 @@ type NetworkPolicyClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NetworkPolicyInterface } @@ -298,6 +307,10 @@ func (n *networkPolicyClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *networkPolicyClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *networkPolicyClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 6c8d37b2..5b6b98b4 100644 --- a/apis/project.cattle.io/v3/zz_generated_app_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_app_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewApp(namespace, name string, obj App) *App { + obj.APIVersion, obj.Kind = AppGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type AppList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *appClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *appClient) Patch(o *App, data []byte, subresources ...string) (*App, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *appClient) Patch(o *App, patchType types.PatchType, data []byte, subresources ...string) (*App, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*App), err } @@ -277,6 +285,7 @@ type AppClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() AppInterface } @@ -297,6 +306,10 @@ func (n *appClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *appClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *appClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 51f4aeb8..84c1413a 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewAppRevision(namespace, name string, obj AppRevision) *AppRevision { + obj.APIVersion, obj.Kind = AppRevisionGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type AppRevisionList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *appRevisionClient) Watch(opts metav1.ListOptions) (watch.Interface, err } // Patch applies the patch and returns the patched deployment. -func (s *appRevisionClient) Patch(o *AppRevision, data []byte, subresources ...string) (*AppRevision, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *appRevisionClient) Patch(o *AppRevision, patchType types.PatchType, data []byte, subresources ...string) (*AppRevision, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*AppRevision), err } @@ -277,6 +285,7 @@ type AppRevisionClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() AppRevisionInterface } @@ -297,6 +306,10 @@ func (n *appRevisionClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *appRevisionClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *appRevisionClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 81ef5516..c82ff1b6 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewBasicAuth(namespace, name string, obj BasicAuth) *BasicAuth { + obj.APIVersion, obj.Kind = BasicAuthGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type BasicAuthList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *basicAuthClient) Watch(opts metav1.ListOptions) (watch.Interface, error } // Patch applies the patch and returns the patched deployment. -func (s *basicAuthClient) Patch(o *BasicAuth, data []byte, subresources ...string) (*BasicAuth, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *basicAuthClient) Patch(o *BasicAuth, patchType types.PatchType, data []byte, subresources ...string) (*BasicAuth, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*BasicAuth), err } @@ -277,6 +285,7 @@ type BasicAuthClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() BasicAuthInterface } @@ -297,6 +306,10 @@ func (n *basicAuthClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *basicAuthClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *basicAuthClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 857b5d6f..4cecf5e3 100644 --- a/apis/project.cattle.io/v3/zz_generated_certificate_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_certificate_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewCertificate(namespace, name string, obj Certificate) *Certificate { + obj.APIVersion, obj.Kind = CertificateGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type CertificateList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *certificateClient) Watch(opts metav1.ListOptions) (watch.Interface, err } // Patch applies the patch and returns the patched deployment. -func (s *certificateClient) Patch(o *Certificate, data []byte, subresources ...string) (*Certificate, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *certificateClient) Patch(o *Certificate, patchType types.PatchType, data []byte, subresources ...string) (*Certificate, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Certificate), err } @@ -277,6 +285,7 @@ type CertificateClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() CertificateInterface } @@ -297,6 +306,10 @@ func (n *certificateClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *certificateClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *certificateClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 84049823..48bd6d97 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewDockerCredential(namespace, name string, obj DockerCredential) *DockerCredential { + obj.APIVersion, obj.Kind = DockerCredentialGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type DockerCredentialList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *dockerCredentialClient) Watch(opts metav1.ListOptions) (watch.Interface } // Patch applies the patch and returns the patched deployment. -func (s *dockerCredentialClient) Patch(o *DockerCredential, data []byte, subresources ...string) (*DockerCredential, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *dockerCredentialClient) Patch(o *DockerCredential, patchType types.PatchType, data []byte, subresources ...string) (*DockerCredential, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*DockerCredential), err } @@ -277,6 +285,7 @@ type DockerCredentialClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() DockerCredentialInterface } @@ -297,6 +306,10 @@ func (n *dockerCredentialClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *dockerCredentialClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *dockerCredentialClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/project.cattle.io/v3/zz_generated_k8s_client.go b/apis/project.cattle.io/v3/zz_generated_k8s_client.go index 1064a979..6961d220 100644 --- a/apis/project.cattle.io/v3/zz_generated_k8s_client.go +++ b/apis/project.cattle.io/v3/zz_generated_k8s_client.go @@ -43,6 +43,8 @@ type Interface interface { } type Clients struct { + Interface Interface + ServiceAccountToken ServiceAccountTokenClient DockerCredential DockerCredentialClient Certificate CertificateClient @@ -123,6 +125,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, ServiceAccountToken: &serviceAccountTokenClient2{ iface: iface.ServiceAccountTokens(""), 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 597409c6..ad94bc31 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNamespacedBasicAuth(namespace, name string, obj NamespacedBasicAuth) *NamespacedBasicAuth { + obj.APIVersion, obj.Kind = NamespacedBasicAuthGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NamespacedBasicAuthList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *namespacedBasicAuthClient) Watch(opts metav1.ListOptions) (watch.Interf } // Patch applies the patch and returns the patched deployment. -func (s *namespacedBasicAuthClient) Patch(o *NamespacedBasicAuth, data []byte, subresources ...string) (*NamespacedBasicAuth, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *namespacedBasicAuthClient) Patch(o *NamespacedBasicAuth, patchType types.PatchType, data []byte, subresources ...string) (*NamespacedBasicAuth, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NamespacedBasicAuth), err } @@ -277,6 +285,7 @@ type NamespacedBasicAuthClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NamespacedBasicAuthInterface } @@ -297,6 +306,10 @@ func (n *namespacedBasicAuthClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *namespacedBasicAuthClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *namespacedBasicAuthClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 44ba6598..063c4599 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNamespacedCertificate(namespace, name string, obj NamespacedCertificate) *NamespacedCertificate { + obj.APIVersion, obj.Kind = NamespacedCertificateGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NamespacedCertificateList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *namespacedCertificateClient) Watch(opts metav1.ListOptions) (watch.Inte } // Patch applies the patch and returns the patched deployment. -func (s *namespacedCertificateClient) Patch(o *NamespacedCertificate, data []byte, subresources ...string) (*NamespacedCertificate, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *namespacedCertificateClient) Patch(o *NamespacedCertificate, patchType types.PatchType, data []byte, subresources ...string) (*NamespacedCertificate, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NamespacedCertificate), err } @@ -277,6 +285,7 @@ type NamespacedCertificateClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NamespacedCertificateInterface } @@ -297,6 +306,10 @@ func (n *namespacedCertificateClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *namespacedCertificateClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *namespacedCertificateClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 d09263dc..21be57f1 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNamespacedDockerCredential(namespace, name string, obj NamespacedDockerCredential) *NamespacedDockerCredential { + obj.APIVersion, obj.Kind = NamespacedDockerCredentialGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NamespacedDockerCredentialList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *namespacedDockerCredentialClient) Watch(opts metav1.ListOptions) (watch } // Patch applies the patch and returns the patched deployment. -func (s *namespacedDockerCredentialClient) Patch(o *NamespacedDockerCredential, data []byte, subresources ...string) (*NamespacedDockerCredential, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *namespacedDockerCredentialClient) Patch(o *NamespacedDockerCredential, patchType types.PatchType, data []byte, subresources ...string) (*NamespacedDockerCredential, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NamespacedDockerCredential), err } @@ -277,6 +285,7 @@ type NamespacedDockerCredentialClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NamespacedDockerCredentialInterface } @@ -297,6 +306,10 @@ func (n *namespacedDockerCredentialClient2) Generic() controller.GenericControll return n.iface.Controller().Generic() } +func (n *namespacedDockerCredentialClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *namespacedDockerCredentialClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 4070df86..7c8604d2 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNamespacedServiceAccountToken(namespace, name string, obj NamespacedServiceAccountToken) *NamespacedServiceAccountToken { + obj.APIVersion, obj.Kind = NamespacedServiceAccountTokenGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NamespacedServiceAccountTokenList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *namespacedServiceAccountTokenClient) Watch(opts metav1.ListOptions) (wa } // Patch applies the patch and returns the patched deployment. -func (s *namespacedServiceAccountTokenClient) Patch(o *NamespacedServiceAccountToken, data []byte, subresources ...string) (*NamespacedServiceAccountToken, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *namespacedServiceAccountTokenClient) Patch(o *NamespacedServiceAccountToken, patchType types.PatchType, data []byte, subresources ...string) (*NamespacedServiceAccountToken, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NamespacedServiceAccountToken), err } @@ -277,6 +285,7 @@ type NamespacedServiceAccountTokenClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NamespacedServiceAccountTokenInterface } @@ -297,6 +306,10 @@ func (n *namespacedServiceAccountTokenClient2) Generic() controller.GenericContr return n.iface.Controller().Generic() } +func (n *namespacedServiceAccountTokenClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *namespacedServiceAccountTokenClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 e12e78b6..6f2e2bc0 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewNamespacedSSHAuth(namespace, name string, obj NamespacedSSHAuth) *NamespacedSSHAuth { + obj.APIVersion, obj.Kind = NamespacedSSHAuthGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type NamespacedSSHAuthList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *namespacedSshAuthClient) Watch(opts metav1.ListOptions) (watch.Interfac } // Patch applies the patch and returns the patched deployment. -func (s *namespacedSshAuthClient) Patch(o *NamespacedSSHAuth, data []byte, subresources ...string) (*NamespacedSSHAuth, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *namespacedSshAuthClient) Patch(o *NamespacedSSHAuth, patchType types.PatchType, data []byte, subresources ...string) (*NamespacedSSHAuth, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*NamespacedSSHAuth), err } @@ -277,6 +285,7 @@ type NamespacedSSHAuthClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() NamespacedSSHAuthInterface } @@ -297,6 +306,10 @@ func (n *namespacedSshAuthClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *namespacedSshAuthClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *namespacedSshAuthClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 33793a68..51123ec5 100644 --- a/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_pipeline_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewPipeline(namespace, name string, obj Pipeline) *Pipeline { + obj.APIVersion, obj.Kind = PipelineGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PipelineList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *pipelineClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *pipelineClient) Patch(o *Pipeline, data []byte, subresources ...string) (*Pipeline, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *pipelineClient) Patch(o *Pipeline, patchType types.PatchType, data []byte, subresources ...string) (*Pipeline, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Pipeline), err } @@ -277,6 +285,7 @@ type PipelineClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PipelineInterface } @@ -297,6 +306,10 @@ func (n *pipelineClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *pipelineClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *pipelineClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 975cea00..589a97ea 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewPipelineExecution(namespace, name string, obj PipelineExecution) *PipelineExecution { + obj.APIVersion, obj.Kind = PipelineExecutionGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PipelineExecutionList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *pipelineExecutionClient) Watch(opts metav1.ListOptions) (watch.Interfac } // Patch applies the patch and returns the patched deployment. -func (s *pipelineExecutionClient) Patch(o *PipelineExecution, data []byte, subresources ...string) (*PipelineExecution, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *pipelineExecutionClient) Patch(o *PipelineExecution, patchType types.PatchType, data []byte, subresources ...string) (*PipelineExecution, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*PipelineExecution), err } @@ -277,6 +285,7 @@ type PipelineExecutionClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PipelineExecutionInterface } @@ -297,6 +306,10 @@ func (n *pipelineExecutionClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *pipelineExecutionClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *pipelineExecutionClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 8353b30e..ec2a1156 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewPipelineSetting(namespace, name string, obj PipelineSetting) *PipelineSetting { + obj.APIVersion, obj.Kind = PipelineSettingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type PipelineSettingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *pipelineSettingClient) Watch(opts metav1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched deployment. -func (s *pipelineSettingClient) Patch(o *PipelineSetting, data []byte, subresources ...string) (*PipelineSetting, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *pipelineSettingClient) Patch(o *PipelineSetting, patchType types.PatchType, data []byte, subresources ...string) (*PipelineSetting, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*PipelineSetting), err } @@ -277,6 +285,7 @@ type PipelineSettingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() PipelineSettingInterface } @@ -297,6 +306,10 @@ func (n *pipelineSettingClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *pipelineSettingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *pipelineSettingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 0458b4b3..4b759da2 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewServiceAccountToken(namespace, name string, obj ServiceAccountToken) *ServiceAccountToken { + obj.APIVersion, obj.Kind = ServiceAccountTokenGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ServiceAccountTokenList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *serviceAccountTokenClient) Watch(opts metav1.ListOptions) (watch.Interf } // Patch applies the patch and returns the patched deployment. -func (s *serviceAccountTokenClient) Patch(o *ServiceAccountToken, data []byte, subresources ...string) (*ServiceAccountToken, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *serviceAccountTokenClient) Patch(o *ServiceAccountToken, patchType types.PatchType, data []byte, subresources ...string) (*ServiceAccountToken, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*ServiceAccountToken), err } @@ -277,6 +285,7 @@ type ServiceAccountTokenClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ServiceAccountTokenInterface } @@ -297,6 +306,10 @@ func (n *serviceAccountTokenClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *serviceAccountTokenClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *serviceAccountTokenClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 aae7298e..93d365e7 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewSourceCodeCredential(namespace, name string, obj SourceCodeCredential) *SourceCodeCredential { + obj.APIVersion, obj.Kind = SourceCodeCredentialGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type SourceCodeCredentialList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *sourceCodeCredentialClient) Watch(opts metav1.ListOptions) (watch.Inter } // Patch applies the patch and returns the patched deployment. -func (s *sourceCodeCredentialClient) Patch(o *SourceCodeCredential, data []byte, subresources ...string) (*SourceCodeCredential, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *sourceCodeCredentialClient) Patch(o *SourceCodeCredential, patchType types.PatchType, data []byte, subresources ...string) (*SourceCodeCredential, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*SourceCodeCredential), err } @@ -277,6 +285,7 @@ type SourceCodeCredentialClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() SourceCodeCredentialInterface } @@ -297,6 +306,10 @@ func (n *sourceCodeCredentialClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *sourceCodeCredentialClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *sourceCodeCredentialClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 0e01d428..4011aa78 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewSourceCodeProviderConfig(namespace, name string, obj SourceCodeProviderConfig) *SourceCodeProviderConfig { + obj.APIVersion, obj.Kind = SourceCodeProviderConfigGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type SourceCodeProviderConfigList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *sourceCodeProviderConfigClient) Watch(opts metav1.ListOptions) (watch.I } // Patch applies the patch and returns the patched deployment. -func (s *sourceCodeProviderConfigClient) Patch(o *SourceCodeProviderConfig, data []byte, subresources ...string) (*SourceCodeProviderConfig, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *sourceCodeProviderConfigClient) Patch(o *SourceCodeProviderConfig, patchType types.PatchType, data []byte, subresources ...string) (*SourceCodeProviderConfig, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*SourceCodeProviderConfig), err } @@ -277,6 +285,7 @@ type SourceCodeProviderConfigClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() SourceCodeProviderConfigInterface } @@ -297,6 +306,10 @@ func (n *sourceCodeProviderConfigClient2) Generic() controller.GenericController return n.iface.Controller().Generic() } +func (n *sourceCodeProviderConfigClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *sourceCodeProviderConfigClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 64925ecf..af6a517d 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -28,6 +29,13 @@ var ( } ) +func NewSourceCodeProvider(namespace, name string, obj SourceCodeProvider) *SourceCodeProvider { + obj.APIVersion, obj.Kind = SourceCodeProviderGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type SourceCodeProviderList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -223,8 +231,8 @@ func (s *sourceCodeProviderClient) Watch(opts metav1.ListOptions) (watch.Interfa } // Patch applies the patch and returns the patched deployment. -func (s *sourceCodeProviderClient) Patch(o *SourceCodeProvider, data []byte, subresources ...string) (*SourceCodeProvider, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *sourceCodeProviderClient) Patch(o *SourceCodeProvider, patchType types.PatchType, data []byte, subresources ...string) (*SourceCodeProvider, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*SourceCodeProvider), err } @@ -276,6 +284,7 @@ type SourceCodeProviderClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() SourceCodeProviderInterface } @@ -296,6 +305,10 @@ func (n *sourceCodeProviderClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *sourceCodeProviderClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *sourceCodeProviderClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 7a8534b8..d805d49e 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewSourceCodeRepository(namespace, name string, obj SourceCodeRepository) *SourceCodeRepository { + obj.APIVersion, obj.Kind = SourceCodeRepositoryGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type SourceCodeRepositoryList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *sourceCodeRepositoryClient) Watch(opts metav1.ListOptions) (watch.Inter } // Patch applies the patch and returns the patched deployment. -func (s *sourceCodeRepositoryClient) Patch(o *SourceCodeRepository, data []byte, subresources ...string) (*SourceCodeRepository, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *sourceCodeRepositoryClient) Patch(o *SourceCodeRepository, patchType types.PatchType, data []byte, subresources ...string) (*SourceCodeRepository, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*SourceCodeRepository), err } @@ -277,6 +285,7 @@ type SourceCodeRepositoryClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() SourceCodeRepositoryInterface } @@ -297,6 +306,10 @@ func (n *sourceCodeRepositoryClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *sourceCodeRepositoryClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *sourceCodeRepositoryClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 293d62e3..f9b0e9bc 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 @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewSSHAuth(namespace, name string, obj SSHAuth) *SSHAuth { + obj.APIVersion, obj.Kind = SSHAuthGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type SSHAuthList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *sshAuthClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *sshAuthClient) Patch(o *SSHAuth, data []byte, subresources ...string) (*SSHAuth, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *sshAuthClient) Patch(o *SSHAuth, patchType types.PatchType, data []byte, subresources ...string) (*SSHAuth, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*SSHAuth), err } @@ -277,6 +285,7 @@ type SSHAuthClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() SSHAuthInterface } @@ -297,6 +306,10 @@ func (n *sshAuthClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *sshAuthClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *sshAuthClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 e68bfd07..1979e395 100644 --- a/apis/project.cattle.io/v3/zz_generated_workload_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_workload_controller.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewWorkload(namespace, name string, obj Workload) *Workload { + obj.APIVersion, obj.Kind = WorkloadGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type WorkloadList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *workloadClient) Watch(opts metav1.ListOptions) (watch.Interface, error) } // Patch applies the patch and returns the patched deployment. -func (s *workloadClient) Patch(o *Workload, data []byte, subresources ...string) (*Workload, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *workloadClient) Patch(o *Workload, patchType types.PatchType, data []byte, subresources ...string) (*Workload, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*Workload), err } @@ -277,6 +285,7 @@ type WorkloadClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() WorkloadInterface } @@ -297,6 +306,10 @@ func (n *workloadClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *workloadClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *workloadClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 0096fe01..bd9da873 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 @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterRoleBinding(namespace, name string, obj v1.ClusterRoleBinding) *v1.ClusterRoleBinding { + obj.APIVersion, obj.Kind = ClusterRoleBindingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterRoleBindingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterRoleBindingClient) Watch(opts metav1.ListOptions) (watch.Interfa } // Patch applies the patch and returns the patched deployment. -func (s *clusterRoleBindingClient) Patch(o *v1.ClusterRoleBinding, data []byte, subresources ...string) (*v1.ClusterRoleBinding, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterRoleBindingClient) Patch(o *v1.ClusterRoleBinding, patchType types.PatchType, data []byte, subresources ...string) (*v1.ClusterRoleBinding, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ClusterRoleBinding), err } @@ -277,6 +285,7 @@ type ClusterRoleBindingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterRoleBindingInterface } @@ -297,6 +306,10 @@ func (n *clusterRoleBindingClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterRoleBindingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterRoleBindingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 bf063471..7dd3ef61 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 @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -29,6 +30,13 @@ var ( } ) +func NewClusterRole(namespace, name string, obj v1.ClusterRole) *v1.ClusterRole { + obj.APIVersion, obj.Kind = ClusterRoleGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type ClusterRoleList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -224,8 +232,8 @@ func (s *clusterRoleClient) Watch(opts metav1.ListOptions) (watch.Interface, err } // Patch applies the patch and returns the patched deployment. -func (s *clusterRoleClient) Patch(o *v1.ClusterRole, data []byte, subresources ...string) (*v1.ClusterRole, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *clusterRoleClient) Patch(o *v1.ClusterRole, patchType types.PatchType, data []byte, subresources ...string) (*v1.ClusterRole, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.ClusterRole), err } @@ -277,6 +285,7 @@ type ClusterRoleClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() ClusterRoleInterface } @@ -297,6 +306,10 @@ func (n *clusterRoleClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *clusterRoleClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *clusterRoleClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_k8s_client.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_k8s_client.go index 604399e8..3ddd0c29 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_k8s_client.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_k8s_client.go @@ -27,6 +27,8 @@ type Interface interface { } type Clients struct { + Interface Interface + ClusterRoleBinding ClusterRoleBindingClient ClusterRole ClusterRoleClient RoleBinding RoleBindingClient @@ -75,6 +77,7 @@ func NewClients(config rest.Config) (*Clients, error) { func NewClientsFromInterface(iface Interface) *Clients { return &Clients{ + Interface: iface, ClusterRoleBinding: &clusterRoleBindingClient2{ iface: iface.ClusterRoleBindings(""), 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 57abce0e..74374a35 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 @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewRoleBinding(namespace, name string, obj v1.RoleBinding) *v1.RoleBinding { + obj.APIVersion, obj.Kind = RoleBindingGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type RoleBindingList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *roleBindingClient) Watch(opts metav1.ListOptions) (watch.Interface, err } // Patch applies the patch and returns the patched deployment. -func (s *roleBindingClient) Patch(o *v1.RoleBinding, data []byte, subresources ...string) (*v1.RoleBinding, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *roleBindingClient) Patch(o *v1.RoleBinding, patchType types.PatchType, data []byte, subresources ...string) (*v1.RoleBinding, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.RoleBinding), err } @@ -278,6 +286,7 @@ type RoleBindingClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() RoleBindingInterface } @@ -298,6 +307,10 @@ func (n *roleBindingClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *roleBindingClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *roleBindingClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } 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 ed5e546a..22257f10 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 @@ -11,6 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" ) @@ -30,6 +31,13 @@ var ( } ) +func NewRole(namespace, name string, obj v1.Role) *v1.Role { + obj.APIVersion, obj.Kind = RoleGroupVersionKind.ToAPIVersionAndKind() + obj.Name = name + obj.Namespace = namespace + return &obj +} + type RoleList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` @@ -225,8 +233,8 @@ func (s *roleClient) Watch(opts metav1.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched deployment. -func (s *roleClient) Patch(o *v1.Role, data []byte, subresources ...string) (*v1.Role, error) { - obj, err := s.objectClient.Patch(o.Name, o, data, subresources...) +func (s *roleClient) Patch(o *v1.Role, patchType types.PatchType, data []byte, subresources ...string) (*v1.Role, error) { + obj, err := s.objectClient.Patch(o.Name, o, patchType, data, subresources...) return obj.(*v1.Role), err } @@ -278,6 +286,7 @@ type RoleClient interface { Enqueue(namespace, name string) Generic() controller.GenericController + ObjectClient() *objectclient.ObjectClient Interface() RoleInterface } @@ -298,6 +307,10 @@ func (n *roleClient2) Generic() controller.GenericController { return n.iface.Controller().Generic() } +func (n *roleClient2) ObjectClient() *objectclient.ObjectClient { + return n.Interface().ObjectClient() +} + func (n *roleClient2) Enqueue(namespace, name string) { n.iface.Controller().Enqueue(namespace, name) } diff --git a/client/management/v3/zz_generated_metric_rule.go b/client/management/v3/zz_generated_metric_rule.go index d94557fb..928cbc79 100644 --- a/client/management/v3/zz_generated_metric_rule.go +++ b/client/management/v3/zz_generated_metric_rule.go @@ -12,11 +12,11 @@ const ( ) type MetricRule struct { - Comparison string `json:"comparison,omitempty" yaml:"comparison,omitempty"` - Description string `json:"description,omitempty" yaml:"description,omitempty"` - Duration string `json:"duration,omitempty" yaml:"duration,omitempty"` - Expression string `json:"expression,omitempty" yaml:"expression,omitempty"` - LegendFormat string `json:"legendFormat,omitempty" yaml:"legendFormat,omitempty"` - Step int64 `json:"step,omitempty" yaml:"step,omitempty"` - ThresholdValue *float64 `json:"thresholdValue,omitempty" yaml:"thresholdValue,omitempty"` + Comparison string `json:"comparison,omitempty" yaml:"comparison,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + Duration string `json:"duration,omitempty" yaml:"duration,omitempty"` + Expression string `json:"expression,omitempty" yaml:"expression,omitempty"` + LegendFormat string `json:"legendFormat,omitempty" yaml:"legendFormat,omitempty"` + Step int64 `json:"step,omitempty" yaml:"step,omitempty"` + ThresholdValue float64 `json:"thresholdValue,omitempty" yaml:"thresholdValue,omitempty"` }