From 6d21f0eec2bfe1c00cce0282067d5e9b9dfe102e Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Fri, 1 Mar 2019 20:06:09 +0200 Subject: [PATCH] vendor update --- vendor.conf | 2 +- .../management.cattle.io/v3/alerting_types.go | 7 +++--- .../v3/multi_cluster_app.go | 15 ++++++------ .../v3/zz_generated_deepcopy.go | 24 +++++++++++++++++-- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/vendor.conf b/vendor.conf index 65fc76de..55817816 100644 --- a/vendor.conf +++ b/vendor.conf @@ -28,4 +28,4 @@ github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0e github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/rancher/norman 0557aa4ff31a3a0f007dcb1b684894f23cda390c -github.com/rancher/types ee7e7deb08570aea1a6053fd492c0a7792f1b423 +github.com/rancher/types d20e3225a1118954ec664f3ba18b7cecf56aa562 diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go index 310acdec..2e0c0435 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go @@ -195,6 +195,7 @@ type CommonGroupField struct { type CommonRuleField struct { DisplayName string `json:"displayName,omitempty"` Severity string `json:"severity,omitempty" norman:"required,options=info|critical|warning,default=critical"` + Inherited *bool `json:"inherited,omitempty" norman:"default=true"` TimingField } @@ -207,9 +208,9 @@ type MetricRule struct { } type TimingField struct { - GroupWaitSeconds int `json:"groupWaitSeconds,omitempty" norman:"required,default=30,min=0"` - GroupIntervalSeconds int `json:"groupIntervalSeconds,omitempty" norman:"required,default=180,min=0"` - RepeatIntervalSeconds int `json:"repeatIntervalSeconds,omitempty" norman:"required,default=3600,min=0"` + GroupWaitSeconds int `json:"groupWaitSeconds,omitempty" norman:"required,default=30,min=1"` + GroupIntervalSeconds int `json:"groupIntervalSeconds,omitempty" norman:"required,default=180,min=1"` + RepeatIntervalSeconds int `json:"repeatIntervalSeconds,omitempty" norman:"required,default=3600,min=1"` } type NodeRule struct { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/multi_cluster_app.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/multi_cluster_app.go index 4b064b62..d0e35dd9 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/multi_cluster_app.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/multi_cluster_app.go @@ -26,13 +26,14 @@ type MultiClusterApp struct { } type MultiClusterAppSpec struct { - TemplateVersionName string `json:"templateVersionName,omitempty" norman:"type=reference[templateVersion],required"` - Answers []Answer `json:"answers,omitempty"` - Targets []Target `json:"targets,omitempty" norman:"required,noupdate"` - Members []Member `json:"members,omitempty"` - Roles []string `json:"roles,omitempty" norman:"type=array[reference[roleTemplate]]"` - RevisionHistoryLimit int `json:"revisionHistoryLimit,omitempty" norman:"default=10"` - UpgradeStrategy UpgradeStrategy `json:"upgradeStrategy,omitempty"` + TemplateVersionName string `json:"templateVersionName,omitempty" norman:"type=reference[templateVersion],required"` + Answers []Answer `json:"answers,omitempty"` + Targets []Target `json:"targets,omitempty" norman:"required,noupdate"` + Members []Member `json:"members,omitempty"` + Roles []string `json:"roles,omitempty" norman:"type=array[reference[roleTemplate]]"` + RevisionHistoryLimit int `json:"revisionHistoryLimit,omitempty" norman:"default=10"` + UpgradeStrategy UpgradeStrategy `json:"upgradeStrategy,omitempty"` + TargetToRole map[string][]string `json:"targetToRole,omitempty"` } type MultiClusterAppStatus struct { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 0f4a688f..70d4a77e 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/vendor/github.com/rancher/types/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 } @@ -4513,6 +4518,21 @@ func (in *MultiClusterAppSpec) DeepCopyInto(out *MultiClusterAppSpec) { copy(*out, *in) } in.UpgradeStrategy.DeepCopyInto(&out.UpgradeStrategy) + if in.TargetToRole != nil { + in, out := &in.TargetToRole, &out.TargetToRole + *out = make(map[string][]string, len(*in)) + for key, val := range *in { + var outVal []string + if val == nil { + (*out)[key] = nil + } else { + in, out := &val, &outVal + *out = make([]string, len(*in)) + copy(*out, *in) + } + (*out)[key] = outVal + } + } return } @@ -6132,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)