From 2357e6acc1e7e28a747a420bf9025b77cd5285f6 Mon Sep 17 00:00:00 2001 From: zionwu Date: Mon, 16 Apr 2018 19:57:24 +0800 Subject: [PATCH 1/2] Remove required for smtp and add send field --- apis/management.cattle.io/v3/alerting_types.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/alerting_types.go b/apis/management.cattle.io/v3/alerting_types.go index 834fd5bd..4a34fde0 100644 --- a/apis/management.cattle.io/v3/alerting_types.go +++ b/apis/management.cattle.io/v3/alerting_types.go @@ -135,8 +135,9 @@ type Notification struct { type SMTPConfig struct { Host string `json:"host,omitempty" norman:"required,type=dnsLabel"` Port int `json:"port,omitempty" norman:"required,min=1,max=65535,default=465"` - Username string `json:"username,omitempty" norman:"required"` - Password string `json:"password,omitempty" norman:"required"` + Username string `json:"username,omitempty"` + Password string `json:"password,omitempty"` + Sender string `json:"sender,omitempty" norman:"required"` DefaultRecipient string `json:"defaultRecipient,omitempty" norman:"required"` TLS bool `json:"tls,omitempty" norman:"required,default=true"` } From 162f5bbe73f9bc8f9d62a4aab6c2caf605520e4a Mon Sep 17 00:00:00 2001 From: zionwu Date: Mon, 16 Apr 2018 19:58:31 +0800 Subject: [PATCH 2/2] Update generated code --- client/management/v3/zz_generated_smtp_config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/management/v3/zz_generated_smtp_config.go b/client/management/v3/zz_generated_smtp_config.go index 9e46fd02..33f19a50 100644 --- a/client/management/v3/zz_generated_smtp_config.go +++ b/client/management/v3/zz_generated_smtp_config.go @@ -6,6 +6,7 @@ const ( SMTPConfigFieldHost = "host" SMTPConfigFieldPassword = "password" SMTPConfigFieldPort = "port" + SMTPConfigFieldSender = "sender" SMTPConfigFieldTLS = "tls" SMTPConfigFieldUsername = "username" ) @@ -15,6 +16,7 @@ type SMTPConfig struct { Host string `json:"host,omitempty" yaml:"host,omitempty"` Password string `json:"password,omitempty" yaml:"password,omitempty"` Port int64 `json:"port,omitempty" yaml:"port,omitempty"` + Sender string `json:"sender,omitempty" yaml:"sender,omitempty"` TLS bool `json:"tls,omitempty" yaml:"tls,omitempty"` Username string `json:"username,omitempty" yaml:"username,omitempty"` }