From 007b83c0821eeb55f61dde2b263ac9d67a310073 Mon Sep 17 00:00:00 2001 From: Craig Jellick Date: Mon, 11 Dec 2017 20:30:50 -0700 Subject: [PATCH] Regenerate for proper keying in Lister --- apis/apps/v1beta2/zz_generated_deployment_controller.go | 8 +++++++- apis/cluster.cattle.io/v3/schema/schema.go | 2 +- apis/core/v1/zz_generated_component_status_controller.go | 8 +++++++- apis/core/v1/zz_generated_event_controller.go | 8 +++++++- apis/core/v1/zz_generated_namespace_controller.go | 8 +++++++- apis/core/v1/zz_generated_node_controller.go | 8 +++++++- apis/core/v1/zz_generated_pod_controller.go | 8 +++++++- .../zz_generated_pod_security_policy_controller.go | 8 +++++++- .../v3/zz_generated_catalog_controller.go | 8 +++++++- .../v3/zz_generated_cluster_controller.go | 8 +++++++- .../v3/zz_generated_cluster_event_controller.go | 8 +++++++- ..._generated_cluster_role_template_binding_controller.go | 8 +++++++- .../v3/zz_generated_dynamic_schema_controller.go | 8 +++++++- .../v3/zz_generated_group_controller.go | 8 +++++++- .../v3/zz_generated_group_member_controller.go | 8 +++++++- .../v3/zz_generated_identity_controller.go | 8 +++++++- .../v3/zz_generated_machine_controller.go | 8 +++++++- .../v3/zz_generated_machine_driver_controller.go | 8 +++++++- .../v3/zz_generated_machine_template_controller.go | 8 +++++++- ...z_generated_pod_security_policy_template_controller.go | 8 +++++++- .../v3/zz_generated_project_controller.go | 8 +++++++- ..._generated_project_role_template_binding_controller.go | 8 +++++++- .../v3/zz_generated_role_template_controller.go | 8 +++++++- .../v3/zz_generated_template_controller.go | 8 +++++++- .../v3/zz_generated_template_version_controller.go | 8 +++++++- .../v3/zz_generated_token_controller.go | 8 +++++++- .../v3/zz_generated_user_controller.go | 8 +++++++- .../v3/zz_generated_workload_controller.go | 8 +++++++- .../v1/zz_generated_cluster_role_binding_controller.go | 8 +++++++- apis/rbac/v1/zz_generated_cluster_role_controller.go | 8 +++++++- apis/rbac/v1/zz_generated_role_binding_controller.go | 8 +++++++- 31 files changed, 211 insertions(+), 31 deletions(-) diff --git a/apis/apps/v1beta2/zz_generated_deployment_controller.go b/apis/apps/v1beta2/zz_generated_deployment_controller.go index c3651829..ead9d793 100644 --- a/apis/apps/v1beta2/zz_generated_deployment_controller.go +++ b/apis/apps/v1beta2/zz_generated_deployment_controller.go @@ -75,7 +75,13 @@ func (l *deploymentLister) List(namespace string, selector labels.Selector) (ret } func (l *deploymentLister) Get(namespace, name string) (*v1beta2.Deployment, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/cluster.cattle.io/v3/schema/schema.go b/apis/cluster.cattle.io/v3/schema/schema.go index 8ffba07e..24376fad 100644 --- a/apis/cluster.cattle.io/v3/schema/schema.go +++ b/apis/cluster.cattle.io/v3/schema/schema.go @@ -31,7 +31,7 @@ func cloneProjectSchema(name string, schemas *types.Schemas) { schema := schema.Schemas.Schema(&schema.Version, name) copy := *schema copy.Version = Version - schemas.AddSchema(©) + schemas.AddSchema(copy) } func nodeTypes(schemas *types.Schemas) *types.Schemas { diff --git a/apis/core/v1/zz_generated_component_status_controller.go b/apis/core/v1/zz_generated_component_status_controller.go index dcc060c5..54273ffa 100644 --- a/apis/core/v1/zz_generated_component_status_controller.go +++ b/apis/core/v1/zz_generated_component_status_controller.go @@ -75,7 +75,13 @@ func (l *componentStatusLister) List(namespace string, selector labels.Selector) } func (l *componentStatusLister) Get(namespace, name string) (*v1.ComponentStatus, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/core/v1/zz_generated_event_controller.go b/apis/core/v1/zz_generated_event_controller.go index f41a4ed8..92b509c3 100644 --- a/apis/core/v1/zz_generated_event_controller.go +++ b/apis/core/v1/zz_generated_event_controller.go @@ -75,7 +75,13 @@ func (l *eventLister) List(namespace string, selector labels.Selector) (ret []*v } func (l *eventLister) Get(namespace, name string) (*v1.Event, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/core/v1/zz_generated_namespace_controller.go b/apis/core/v1/zz_generated_namespace_controller.go index 6e25f5a6..337f4f65 100644 --- a/apis/core/v1/zz_generated_namespace_controller.go +++ b/apis/core/v1/zz_generated_namespace_controller.go @@ -75,7 +75,13 @@ func (l *namespaceLister) List(namespace string, selector labels.Selector) (ret } func (l *namespaceLister) Get(namespace, name string) (*v1.Namespace, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/core/v1/zz_generated_node_controller.go b/apis/core/v1/zz_generated_node_controller.go index 796f6249..3743b807 100644 --- a/apis/core/v1/zz_generated_node_controller.go +++ b/apis/core/v1/zz_generated_node_controller.go @@ -75,7 +75,13 @@ func (l *nodeLister) List(namespace string, selector labels.Selector) (ret []*v1 } func (l *nodeLister) Get(namespace, name string) (*v1.Node, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/core/v1/zz_generated_pod_controller.go b/apis/core/v1/zz_generated_pod_controller.go index 2c5f435a..02edbbc2 100644 --- a/apis/core/v1/zz_generated_pod_controller.go +++ b/apis/core/v1/zz_generated_pod_controller.go @@ -75,7 +75,13 @@ func (l *podLister) List(namespace string, selector labels.Selector) (ret []*v1. } func (l *podLister) Get(namespace, name string) (*v1.Pod, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go index c40488de..8731854c 100644 --- a/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go +++ b/apis/extensions/v1beta1/zz_generated_pod_security_policy_controller.go @@ -75,7 +75,13 @@ func (l *podSecurityPolicyLister) List(namespace string, selector labels.Selecto } func (l *podSecurityPolicyLister) Get(namespace, name string) (*v1beta1.PodSecurityPolicy, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go index e546b643..46982971 100644 --- a/apis/management.cattle.io/v3/zz_generated_catalog_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_catalog_controller.go @@ -74,7 +74,13 @@ func (l *catalogLister) List(namespace string, selector labels.Selector) (ret [] } func (l *catalogLister) Get(namespace, name string) (*Catalog, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go index 93de9350..61bfd0d0 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_controller.go @@ -74,7 +74,13 @@ func (l *clusterLister) List(namespace string, selector labels.Selector) (ret [] } func (l *clusterLister) Get(namespace, name string) (*Cluster, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go index d9a5cd02..cc8226c4 100644 --- a/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_cluster_event_controller.go @@ -74,7 +74,13 @@ func (l *clusterEventLister) List(namespace string, selector labels.Selector) (r } func (l *clusterEventLister) Get(namespace, name string) (*ClusterEvent, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_cluster_role_template_binding_controller.go index 82a59dd0..1769e6dd 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 @@ -74,7 +74,13 @@ func (l *clusterRoleTemplateBindingLister) List(namespace string, selector label } func (l *clusterRoleTemplateBindingLister) Get(namespace, name string) (*ClusterRoleTemplateBinding, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go b/apis/management.cattle.io/v3/zz_generated_dynamic_schema_controller.go index 4a3e0771..ea20e5e8 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 @@ -74,7 +74,13 @@ func (l *dynamicSchemaLister) List(namespace string, selector labels.Selector) ( } func (l *dynamicSchemaLister) Get(namespace, name string) (*DynamicSchema, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_group_controller.go b/apis/management.cattle.io/v3/zz_generated_group_controller.go index 686b1777..4b5e8086 100644 --- a/apis/management.cattle.io/v3/zz_generated_group_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_group_controller.go @@ -74,7 +74,13 @@ func (l *groupLister) List(namespace string, selector labels.Selector) (ret []*G } func (l *groupLister) Get(namespace, name string) (*Group, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_group_member_controller.go b/apis/management.cattle.io/v3/zz_generated_group_member_controller.go index 17e013bf..14666911 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 @@ -74,7 +74,13 @@ func (l *groupMemberLister) List(namespace string, selector labels.Selector) (re } func (l *groupMemberLister) Get(namespace, name string) (*GroupMember, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_identity_controller.go b/apis/management.cattle.io/v3/zz_generated_identity_controller.go index b21886f7..e87cf68c 100644 --- a/apis/management.cattle.io/v3/zz_generated_identity_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_identity_controller.go @@ -74,7 +74,13 @@ func (l *identityLister) List(namespace string, selector labels.Selector) (ret [ } func (l *identityLister) Get(namespace, name string) (*Identity, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_machine_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_controller.go index 2740bc72..4dd9c3e0 100644 --- a/apis/management.cattle.io/v3/zz_generated_machine_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_controller.go @@ -74,7 +74,13 @@ func (l *machineLister) List(namespace string, selector labels.Selector) (ret [] } func (l *machineLister) Get(namespace, name string) (*Machine, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go index 2b66c24c..05966c9d 100644 --- a/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_driver_controller.go @@ -74,7 +74,13 @@ func (l *machineDriverLister) List(namespace string, selector labels.Selector) ( } func (l *machineDriverLister) Get(namespace, name string) (*MachineDriver, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go b/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go index fbce768a..ca5499f2 100644 --- a/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_machine_template_controller.go @@ -74,7 +74,13 @@ func (l *machineTemplateLister) List(namespace string, selector labels.Selector) } func (l *machineTemplateLister) Get(namespace, name string) (*MachineTemplate, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go b/apis/management.cattle.io/v3/zz_generated_pod_security_policy_template_controller.go index f7fd7b10..93e46b41 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 @@ -74,7 +74,13 @@ func (l *podSecurityPolicyTemplateLister) List(namespace string, selector labels } func (l *podSecurityPolicyTemplateLister) Get(namespace, name string) (*PodSecurityPolicyTemplate, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_project_controller.go b/apis/management.cattle.io/v3/zz_generated_project_controller.go index 1e49f2e9..98ddfeeb 100644 --- a/apis/management.cattle.io/v3/zz_generated_project_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_project_controller.go @@ -74,7 +74,13 @@ func (l *projectLister) List(namespace string, selector labels.Selector) (ret [] } func (l *projectLister) Get(namespace, name string) (*Project, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go b/apis/management.cattle.io/v3/zz_generated_project_role_template_binding_controller.go index 80ef8758..77f67a45 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 @@ -74,7 +74,13 @@ func (l *projectRoleTemplateBindingLister) List(namespace string, selector label } func (l *projectRoleTemplateBindingLister) Get(namespace, name string) (*ProjectRoleTemplateBinding, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_role_template_controller.go b/apis/management.cattle.io/v3/zz_generated_role_template_controller.go index 82d02458..c310a75e 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 @@ -74,7 +74,13 @@ func (l *roleTemplateLister) List(namespace string, selector labels.Selector) (r } func (l *roleTemplateLister) Get(namespace, name string) (*RoleTemplate, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_template_controller.go b/apis/management.cattle.io/v3/zz_generated_template_controller.go index 40f35541..99f1a4b2 100644 --- a/apis/management.cattle.io/v3/zz_generated_template_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_template_controller.go @@ -74,7 +74,13 @@ func (l *templateLister) List(namespace string, selector labels.Selector) (ret [ } func (l *templateLister) Get(namespace, name string) (*Template, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_template_version_controller.go b/apis/management.cattle.io/v3/zz_generated_template_version_controller.go index cb47c74c..7da4f017 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 @@ -74,7 +74,13 @@ func (l *templateVersionLister) List(namespace string, selector labels.Selector) } func (l *templateVersionLister) Get(namespace, name string) (*TemplateVersion, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_token_controller.go b/apis/management.cattle.io/v3/zz_generated_token_controller.go index 954e189e..dee4a0b1 100644 --- a/apis/management.cattle.io/v3/zz_generated_token_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_token_controller.go @@ -74,7 +74,13 @@ func (l *tokenLister) List(namespace string, selector labels.Selector) (ret []*T } func (l *tokenLister) Get(namespace, name string) (*Token, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/management.cattle.io/v3/zz_generated_user_controller.go b/apis/management.cattle.io/v3/zz_generated_user_controller.go index d3b08c2b..0f5aad03 100644 --- a/apis/management.cattle.io/v3/zz_generated_user_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_user_controller.go @@ -74,7 +74,13 @@ func (l *userLister) List(namespace string, selector labels.Selector) (ret []*Us } func (l *userLister) Get(namespace, name string) (*User, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/project.cattle.io/v3/zz_generated_workload_controller.go b/apis/project.cattle.io/v3/zz_generated_workload_controller.go index e15f381e..e43784d5 100644 --- a/apis/project.cattle.io/v3/zz_generated_workload_controller.go +++ b/apis/project.cattle.io/v3/zz_generated_workload_controller.go @@ -75,7 +75,13 @@ func (l *workloadLister) List(namespace string, selector labels.Selector) (ret [ } func (l *workloadLister) Get(namespace, name string) (*Workload, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/rbac/v1/zz_generated_cluster_role_binding_controller.go b/apis/rbac/v1/zz_generated_cluster_role_binding_controller.go index 435839c6..7b261a35 100644 --- a/apis/rbac/v1/zz_generated_cluster_role_binding_controller.go +++ b/apis/rbac/v1/zz_generated_cluster_role_binding_controller.go @@ -75,7 +75,13 @@ func (l *clusterRoleBindingLister) List(namespace string, selector labels.Select } func (l *clusterRoleBindingLister) Get(namespace, name string) (*v1.ClusterRoleBinding, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/rbac/v1/zz_generated_cluster_role_controller.go b/apis/rbac/v1/zz_generated_cluster_role_controller.go index 865e7071..71bb223f 100644 --- a/apis/rbac/v1/zz_generated_cluster_role_controller.go +++ b/apis/rbac/v1/zz_generated_cluster_role_controller.go @@ -75,7 +75,13 @@ func (l *clusterRoleLister) List(namespace string, selector labels.Selector) (re } func (l *clusterRoleLister) Get(namespace, name string) (*v1.ClusterRole, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err } diff --git a/apis/rbac/v1/zz_generated_role_binding_controller.go b/apis/rbac/v1/zz_generated_role_binding_controller.go index 51723c6a..78c8cb19 100644 --- a/apis/rbac/v1/zz_generated_role_binding_controller.go +++ b/apis/rbac/v1/zz_generated_role_binding_controller.go @@ -75,7 +75,13 @@ func (l *roleBindingLister) List(namespace string, selector labels.Selector) (re } func (l *roleBindingLister) Get(namespace, name string) (*v1.RoleBinding, error) { - obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name) + var key string + if namespace != "" { + key = namespace + "/" + name + } else { + key = name + } + obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(key) if err != nil { return nil, err }