From a0a53a69af54b574c4c1ac0471bdf6b660a8486b Mon Sep 17 00:00:00 2001 From: hongming Date: Wed, 24 Jun 2020 16:03:08 +0800 Subject: [PATCH] fix: federatedworkspace clusterSelector zero value Signed-off-by: hongming --- pkg/apis/tenant/v1alpha2/workspacetemplate_types.go | 4 ++-- pkg/apis/tenant/v1alpha2/zz_generated.deepcopy.go | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go b/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go index 85de918c1..18a5a9806 100644 --- a/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go +++ b/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go @@ -69,8 +69,8 @@ type Template struct { } type Placement struct { - Clusters []Cluster `json:"clusters,omitempty"` - ClusterSelector ClusterSelector `json:"clusterSelector,omitempty"` + Clusters []Cluster `json:"clusters,omitempty"` + ClusterSelector *ClusterSelector `json:"clusterSelector,omitempty"` } type ClusterSelector struct { diff --git a/pkg/apis/tenant/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/tenant/v1alpha2/zz_generated.deepcopy.go index 77214bce5..6cc1c4c13 100644 --- a/pkg/apis/tenant/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/tenant/v1alpha2/zz_generated.deepcopy.go @@ -125,7 +125,11 @@ func (in *Placement) DeepCopyInto(out *Placement) { *out = make([]Cluster, len(*in)) copy(*out, *in) } - in.ClusterSelector.DeepCopyInto(&out.ClusterSelector) + if in.ClusterSelector != nil { + in, out := &in.ClusterSelector, &out.ClusterSelector + *out = new(ClusterSelector) + (*in).DeepCopyInto(*out) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Placement.