rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-18 07:52:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #355 from zionwu/alertbugs

Browse Source 
User pointer for target in alert spec
This commit is contained in:
Alena Prokharchyk
2018-04-09 16:53:40 -07:00
committed by GitHub
parent c03ce00002 1a6b285595
commit 6306c85dbc
2 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apis/management.cattle.io/v3/alerting_types.go
View File

@@ -45,18 +45,18 @@ type AlertCommonSpec struct {
type ClusterAlertSpec struct {
AlertCommonSpec
ClusterName string `json:"clusterName" norman:"type=reference[cluster]"`
TargetNode TargetNode `json:"targetNode,omitempty"`
TargetSystemService TargetSystemService `json:"targetSystemService,omitempty"`
TargetEvent TargetEvent `json:"targetEvent,omitempty"`
ClusterName string `json:"clusterName" norman:"type=reference[cluster]"`
TargetNode *TargetNode `json:"targetNode,omitempty"`
TargetSystemService *TargetSystemService `json:"targetSystemService,omitempty"`
TargetEvent *TargetEvent `json:"targetEvent,omitempty"`
}
type ProjectAlertSpec struct {
AlertCommonSpec
ProjectName string `json:"projectName" norman:"type=reference[project]"`
TargetWorkload TargetWorkload `json:"targetWorkload,omitempty"`
TargetPod TargetPod `json:"targetPod,omitempty"`
ProjectName string `json:"projectName" norman:"type=reference[project]"`
TargetWorkload *TargetWorkload `json:"targetWorkload,omitempty"`
TargetPod *TargetPod `json:"targetPod,omitempty"`
}
type Recipient struct {

50
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@@ -1583,9 +1583,33 @@ func (in *ClusterAlertList) DeepCopyObject() runtime.Object {
func (in *ClusterAlertSpec) DeepCopyInto(out *ClusterAlertSpec) {
*out = *in
in.AlertCommonSpec.DeepCopyInto(&out.AlertCommonSpec)
in.TargetNode.DeepCopyInto(&out.TargetNode)
out.TargetSystemService = in.TargetSystemService
out.TargetEvent = in.TargetEvent
if in.TargetNode != nil {
in, out := &in.TargetNode, &out.TargetNode
if *in == nil {
*out = nil
} else {
*out = new(TargetNode)
(*in).DeepCopyInto(*out)
}
}
if in.TargetSystemService != nil {
in, out := &in.TargetSystemService, &out.TargetSystemService
if *in == nil {
*out = nil
} else {
*out = new(TargetSystemService)
**out = **in
}
}
if in.TargetEvent != nil {
in, out := &in.TargetEvent, &out.TargetEvent
if *in == nil {
*out = nil
} else {
*out = new(TargetEvent)
**out = **in
}
}
return
}
@@ -5082,8 +5106,24 @@ func (in *ProjectAlertList) DeepCopyObject() runtime.Object {
func (in *ProjectAlertSpec) DeepCopyInto(out *ProjectAlertSpec) {
*out = *in
in.AlertCommonSpec.DeepCopyInto(&out.AlertCommonSpec)
in.TargetWorkload.DeepCopyInto(&out.TargetWorkload)
out.TargetPod = in.TargetPod
if in.TargetWorkload != nil {
in, out := &in.TargetWorkload, &out.TargetWorkload
if *in == nil {
*out = nil
} else {
*out = new(TargetWorkload)
(*in).DeepCopyInto(*out)
}
}
if in.TargetPod != nil {
in, out := &in.TargetPod, &out.TargetPod
if *in == nil {
*out = nil
} else {
*out = new(TargetPod)
**out = **in
}
}
return
}