updating dashboard dependency version and resolve conflicts

Signed-off-by: junotx <junotx@126.com>
This commit is contained in:
junotx
2021-03-16 10:21:26 +08:00
parent 0c1f994695
commit a8b9211416
131 changed files with 75 additions and 21648 deletions

View File

@@ -22,6 +22,7 @@ package v1alpha1
import (
runtime "k8s.io/apimachinery/pkg/runtime"
"kubesphere.io/monitoring-dashboard/api/v1alpha1/panels"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -171,9 +172,21 @@ func (in *DashboardSpec) DeepCopy() *DashboardSpec {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Panel) DeepCopyInto(out *Panel) {
*out = *in
out.Row = in.Row
in.Graph.DeepCopyInto(&out.Graph)
in.SingleStat.DeepCopyInto(&out.SingleStat)
if in.Row != nil {
in, out := &in.Row, &out.Row
*out = new(panels.Row)
**out = **in
}
if in.Graph != nil {
in, out := &in.Graph, &out.Graph
*out = new(panels.Graph)
(*in).DeepCopyInto(*out)
}
if in.SingleStat != nil {
in, out := &in.SingleStat, &out.SingleStat
*out = new(panels.SingleStat)
(*in).DeepCopyInto(*out)
}
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Panel.