From 6e1f5d96cdd02d11607dcbb1229a13bc3b1a7903 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 15 Nov 2017 11:09:28 -0800 Subject: [PATCH] Cluster status not a pointer value --- apis/cluster.cattle.io/v1/types.go | 2 +- apis/cluster.cattle.io/v1/zz_generated_deepcopy.go | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apis/cluster.cattle.io/v1/types.go b/apis/cluster.cattle.io/v1/types.go index b8b9eb00..6433994f 100644 --- a/apis/cluster.cattle.io/v1/types.go +++ b/apis/cluster.cattle.io/v1/types.go @@ -31,7 +31,7 @@ type Cluster struct { Spec ClusterSpec `json:"spec"` // Most recent observed status of the cluster. More info: // https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status - Status *ClusterStatus `json:"status"` + Status ClusterStatus `json:"status"` } type ClusterSpec struct { diff --git a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go b/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go index 77123c0c..78419ae5 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go +++ b/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go @@ -73,15 +73,7 @@ func (in *Cluster) DeepCopyInto(out *Cluster) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - if in.Status != nil { - in, out := &in.Status, &out.Status - if *in == nil { - *out = nil - } else { - *out = new(ClusterStatus) - (*in).DeepCopyInto(*out) - } - } + in.Status.DeepCopyInto(&out.Status) return }