From 2cc7dfb96bae2a380227861be221dab2d83bc382 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 13 Nov 2017 14:31:54 -0700 Subject: [PATCH] Fix listmeta --- io.cattle.authorization/v1/zz_generated_deepcopy.go | 8 ++++---- ...z_generated_pod_security_policy_template_controller.go | 6 +++--- .../v1/zz_generated_project_controller.go | 6 +++--- .../v1/zz_generated_project_role_binding_controller.go | 6 +++--- .../v1/zz_generated_role_template_controller.go | 6 +++--- io.cattle.cluster/v1/zz_generated_cluster_controller.go | 6 +++--- .../v1/zz_generated_cluster_node_controller.go | 6 +++--- io.cattle.cluster/v1/zz_generated_deepcopy.go | 4 ++-- vendor.conf | 2 +- .../rancher/norman/generator/controller_template.go | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/io.cattle.authorization/v1/zz_generated_deepcopy.go b/io.cattle.authorization/v1/zz_generated_deepcopy.go index c702157f..fcae8ad9 100644 --- a/io.cattle.authorization/v1/zz_generated_deepcopy.go +++ b/io.cattle.authorization/v1/zz_generated_deepcopy.go @@ -37,7 +37,7 @@ func (in *PodSecurityPolicyTemplate) DeepCopyObject() runtime.Object { func (in *PodSecurityPolicyTemplateList) DeepCopyInto(out *PodSecurityPolicyTemplateList) { *out = *in out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]PodSecurityPolicyTemplate, len(*in)) @@ -98,7 +98,7 @@ func (in *Project) DeepCopyObject() runtime.Object { func (in *ProjectList) DeepCopyInto(out *ProjectList) { *out = *in out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]Project, len(*in)) @@ -164,7 +164,7 @@ func (in *ProjectRoleBinding) DeepCopyObject() runtime.Object { func (in *ProjectRoleBindingList) DeepCopyInto(out *ProjectRoleBindingList) { *out = *in out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]ProjectRoleBinding, len(*in)) @@ -237,7 +237,7 @@ func (in *RoleTemplate) DeepCopyObject() runtime.Object { func (in *RoleTemplateList) DeepCopyInto(out *RoleTemplateList) { *out = *in out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]RoleTemplate, len(*in)) diff --git a/io.cattle.authorization/v1/zz_generated_pod_security_policy_template_controller.go b/io.cattle.authorization/v1/zz_generated_pod_security_policy_template_controller.go index 2f6fb883..4c145f32 100644 --- a/io.cattle.authorization/v1/zz_generated_pod_security_policy_template_controller.go +++ b/io.cattle.authorization/v1/zz_generated_pod_security_policy_template_controller.go @@ -27,9 +27,9 @@ var ( ) type PodSecurityPolicyTemplateList struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Items []PodSecurityPolicyTemplate + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []PodSecurityPolicyTemplate } type PodSecurityPolicyTemplateHandlerFunc func(key string, obj *PodSecurityPolicyTemplate) error diff --git a/io.cattle.authorization/v1/zz_generated_project_controller.go b/io.cattle.authorization/v1/zz_generated_project_controller.go index 4f4ba7d8..60f63958 100644 --- a/io.cattle.authorization/v1/zz_generated_project_controller.go +++ b/io.cattle.authorization/v1/zz_generated_project_controller.go @@ -27,9 +27,9 @@ var ( ) type ProjectList struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Items []Project + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Project } type ProjectHandlerFunc func(key string, obj *Project) error diff --git a/io.cattle.authorization/v1/zz_generated_project_role_binding_controller.go b/io.cattle.authorization/v1/zz_generated_project_role_binding_controller.go index a32b78f3..790b043b 100644 --- a/io.cattle.authorization/v1/zz_generated_project_role_binding_controller.go +++ b/io.cattle.authorization/v1/zz_generated_project_role_binding_controller.go @@ -27,9 +27,9 @@ var ( ) type ProjectRoleBindingList struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Items []ProjectRoleBinding + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ProjectRoleBinding } type ProjectRoleBindingHandlerFunc func(key string, obj *ProjectRoleBinding) error diff --git a/io.cattle.authorization/v1/zz_generated_role_template_controller.go b/io.cattle.authorization/v1/zz_generated_role_template_controller.go index a39a3d23..afe8cd8f 100644 --- a/io.cattle.authorization/v1/zz_generated_role_template_controller.go +++ b/io.cattle.authorization/v1/zz_generated_role_template_controller.go @@ -27,9 +27,9 @@ var ( ) type RoleTemplateList struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Items []RoleTemplate + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []RoleTemplate } type RoleTemplateHandlerFunc func(key string, obj *RoleTemplate) error diff --git a/io.cattle.cluster/v1/zz_generated_cluster_controller.go b/io.cattle.cluster/v1/zz_generated_cluster_controller.go index b9975cba..27ee363e 100644 --- a/io.cattle.cluster/v1/zz_generated_cluster_controller.go +++ b/io.cattle.cluster/v1/zz_generated_cluster_controller.go @@ -27,9 +27,9 @@ var ( ) type ClusterList struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Items []Cluster + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Cluster } type ClusterHandlerFunc func(key string, obj *Cluster) error diff --git a/io.cattle.cluster/v1/zz_generated_cluster_node_controller.go b/io.cattle.cluster/v1/zz_generated_cluster_node_controller.go index 2ede1f77..dbeb233b 100644 --- a/io.cattle.cluster/v1/zz_generated_cluster_node_controller.go +++ b/io.cattle.cluster/v1/zz_generated_cluster_node_controller.go @@ -27,9 +27,9 @@ var ( ) type ClusterNodeList struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - Items []ClusterNode + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterNode } type ClusterNodeHandlerFunc func(key string, obj *ClusterNode) error diff --git a/io.cattle.cluster/v1/zz_generated_deepcopy.go b/io.cattle.cluster/v1/zz_generated_deepcopy.go index 637fd201..c6ab8ba2 100644 --- a/io.cattle.cluster/v1/zz_generated_deepcopy.go +++ b/io.cattle.cluster/v1/zz_generated_deepcopy.go @@ -99,7 +99,7 @@ func (in *ClusterCondition) DeepCopy() *ClusterCondition { func (in *ClusterList) DeepCopyInto(out *ClusterList) { *out = *in out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]Cluster, len(*in)) @@ -159,7 +159,7 @@ func (in *ClusterNode) DeepCopyObject() runtime.Object { func (in *ClusterNodeList) DeepCopyInto(out *ClusterNodeList) { *out = *in out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]ClusterNode, len(*in)) diff --git a/vendor.conf b/vendor.conf index e82b8772..371e394b 100644 --- a/vendor.conf +++ b/vendor.conf @@ -3,4 +3,4 @@ github.com/rancher/types k8s.io/kubernetes v1.8.3 transitive=true,staging=true bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git -github.com/rancher/norman 068b9eb94326e2c566c5eed7636163b1b407c4c0 +github.com/rancher/norman 69589bf00bfd81f9baa3b2d1ec6cccbe26bc7499 diff --git a/vendor/github.com/rancher/norman/generator/controller_template.go b/vendor/github.com/rancher/norman/generator/controller_template.go index 6cdca71e..d61ecdb5 100644 --- a/vendor/github.com/rancher/norman/generator/controller_template.go +++ b/vendor/github.com/rancher/norman/generator/controller_template.go @@ -33,7 +33,7 @@ var ( type {{.schema.CodeName}}List struct { metav1.TypeMeta %BACK%json:",inline"%BACK% - metav1.ObjectMeta %BACK%json:"metadata,omitempty"%BACK% + metav1.ListMeta %BACK%json:"metadata,omitempty"%BACK% Items []{{.schema.CodeName}} }