From d20e3225a1118954ec664f3ba18b7cecf56aa562 Mon Sep 17 00:00:00 2001 From: Aiwantaozi Date: Thu, 14 Feb 2019 12:04:35 +0800 Subject: [PATCH] update vendor --- apis/management.cattle.io/v3/zz_generated_deepcopy.go | 9 +++++++-- client/management/v3/zz_generated_cluster_alert_rule.go | 2 ++ .../v3/zz_generated_cluster_alert_rule_spec.go | 2 ++ client/management/v3/zz_generated_project_alert_rule.go | 2 ++ .../v3/zz_generated_project_alert_rule_spec.go | 2 ++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index ac727c7d..70d4a77e 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -1170,7 +1170,7 @@ func (in *ClusterAlertRuleList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterAlertRuleSpec) DeepCopyInto(out *ClusterAlertRuleSpec) { *out = *in - out.CommonRuleField = in.CommonRuleField + in.CommonRuleField.DeepCopyInto(&out.CommonRuleField) if in.NodeRule != nil { in, out := &in.NodeRule, &out.NodeRule *out = new(NodeRule) @@ -1952,6 +1952,11 @@ func (in *CommonQueryMetricInput) DeepCopy() *CommonQueryMetricInput { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CommonRuleField) DeepCopyInto(out *CommonRuleField) { *out = *in + if in.Inherited != nil { + in, out := &in.Inherited, &out.Inherited + *out = new(bool) + **out = **in + } out.TimingField = in.TimingField return } @@ -6147,7 +6152,7 @@ func (in *ProjectAlertRuleList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ProjectAlertRuleSpec) DeepCopyInto(out *ProjectAlertRuleSpec) { *out = *in - out.CommonRuleField = in.CommonRuleField + in.CommonRuleField.DeepCopyInto(&out.CommonRuleField) if in.PodRule != nil { in, out := &in.PodRule, &out.PodRule *out = new(PodRule) diff --git a/client/management/v3/zz_generated_cluster_alert_rule.go b/client/management/v3/zz_generated_cluster_alert_rule.go index 9aabb5c1..7ea8bad7 100644 --- a/client/management/v3/zz_generated_cluster_alert_rule.go +++ b/client/management/v3/zz_generated_cluster_alert_rule.go @@ -15,6 +15,7 @@ const ( ClusterAlertRuleFieldGroupID = "groupId" ClusterAlertRuleFieldGroupIntervalSeconds = "groupIntervalSeconds" ClusterAlertRuleFieldGroupWaitSeconds = "groupWaitSeconds" + ClusterAlertRuleFieldInherited = "inherited" ClusterAlertRuleFieldLabels = "labels" ClusterAlertRuleFieldMetricRule = "metricRule" ClusterAlertRuleFieldName = "name" @@ -42,6 +43,7 @@ type ClusterAlertRule struct { GroupID string `json:"groupId,omitempty" yaml:"groupId,omitempty"` GroupIntervalSeconds int64 `json:"groupIntervalSeconds,omitempty" yaml:"groupIntervalSeconds,omitempty"` GroupWaitSeconds int64 `json:"groupWaitSeconds,omitempty" yaml:"groupWaitSeconds,omitempty"` + Inherited *bool `json:"inherited,omitempty" yaml:"inherited,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` MetricRule *MetricRule `json:"metricRule,omitempty" yaml:"metricRule,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_alert_rule_spec.go b/client/management/v3/zz_generated_cluster_alert_rule_spec.go index 52efc2af..2cbf67fb 100644 --- a/client/management/v3/zz_generated_cluster_alert_rule_spec.go +++ b/client/management/v3/zz_generated_cluster_alert_rule_spec.go @@ -8,6 +8,7 @@ const ( ClusterAlertRuleSpecFieldGroupID = "groupId" ClusterAlertRuleSpecFieldGroupIntervalSeconds = "groupIntervalSeconds" ClusterAlertRuleSpecFieldGroupWaitSeconds = "groupWaitSeconds" + ClusterAlertRuleSpecFieldInherited = "inherited" ClusterAlertRuleSpecFieldMetricRule = "metricRule" ClusterAlertRuleSpecFieldNodeRule = "nodeRule" ClusterAlertRuleSpecFieldRepeatIntervalSeconds = "repeatIntervalSeconds" @@ -22,6 +23,7 @@ type ClusterAlertRuleSpec struct { GroupID string `json:"groupId,omitempty" yaml:"groupId,omitempty"` GroupIntervalSeconds int64 `json:"groupIntervalSeconds,omitempty" yaml:"groupIntervalSeconds,omitempty"` GroupWaitSeconds int64 `json:"groupWaitSeconds,omitempty" yaml:"groupWaitSeconds,omitempty"` + Inherited *bool `json:"inherited,omitempty" yaml:"inherited,omitempty"` MetricRule *MetricRule `json:"metricRule,omitempty" yaml:"metricRule,omitempty"` NodeRule *NodeRule `json:"nodeRule,omitempty" yaml:"nodeRule,omitempty"` RepeatIntervalSeconds int64 `json:"repeatIntervalSeconds,omitempty" yaml:"repeatIntervalSeconds,omitempty"` diff --git a/client/management/v3/zz_generated_project_alert_rule.go b/client/management/v3/zz_generated_project_alert_rule.go index 89743709..3d1a53b3 100644 --- a/client/management/v3/zz_generated_project_alert_rule.go +++ b/client/management/v3/zz_generated_project_alert_rule.go @@ -13,6 +13,7 @@ const ( ProjectAlertRuleFieldGroupID = "groupId" ProjectAlertRuleFieldGroupIntervalSeconds = "groupIntervalSeconds" ProjectAlertRuleFieldGroupWaitSeconds = "groupWaitSeconds" + ProjectAlertRuleFieldInherited = "inherited" ProjectAlertRuleFieldLabels = "labels" ProjectAlertRuleFieldMetricRule = "metricRule" ProjectAlertRuleFieldName = "name" @@ -39,6 +40,7 @@ type ProjectAlertRule struct { GroupID string `json:"groupId,omitempty" yaml:"groupId,omitempty"` GroupIntervalSeconds int64 `json:"groupIntervalSeconds,omitempty" yaml:"groupIntervalSeconds,omitempty"` GroupWaitSeconds int64 `json:"groupWaitSeconds,omitempty" yaml:"groupWaitSeconds,omitempty"` + Inherited *bool `json:"inherited,omitempty" yaml:"inherited,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` MetricRule *MetricRule `json:"metricRule,omitempty" yaml:"metricRule,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` diff --git a/client/management/v3/zz_generated_project_alert_rule_spec.go b/client/management/v3/zz_generated_project_alert_rule_spec.go index 3fcfce0b..6ca158f9 100644 --- a/client/management/v3/zz_generated_project_alert_rule_spec.go +++ b/client/management/v3/zz_generated_project_alert_rule_spec.go @@ -6,6 +6,7 @@ const ( ProjectAlertRuleSpecFieldGroupID = "groupId" ProjectAlertRuleSpecFieldGroupIntervalSeconds = "groupIntervalSeconds" ProjectAlertRuleSpecFieldGroupWaitSeconds = "groupWaitSeconds" + ProjectAlertRuleSpecFieldInherited = "inherited" ProjectAlertRuleSpecFieldMetricRule = "metricRule" ProjectAlertRuleSpecFieldPodRule = "podRule" ProjectAlertRuleSpecFieldProjectID = "projectId" @@ -19,6 +20,7 @@ type ProjectAlertRuleSpec struct { GroupID string `json:"groupId,omitempty" yaml:"groupId,omitempty"` GroupIntervalSeconds int64 `json:"groupIntervalSeconds,omitempty" yaml:"groupIntervalSeconds,omitempty"` GroupWaitSeconds int64 `json:"groupWaitSeconds,omitempty" yaml:"groupWaitSeconds,omitempty"` + Inherited *bool `json:"inherited,omitempty" yaml:"inherited,omitempty"` MetricRule *MetricRule `json:"metricRule,omitempty" yaml:"metricRule,omitempty"` PodRule *PodRule `json:"podRule,omitempty" yaml:"podRule,omitempty"` ProjectID string `json:"projectId,omitempty" yaml:"projectId,omitempty"`