change SecretKeyRef to secretkeyselector

README.md

@@ -127,7 +127,6 @@ spec:
   authPassword:
     key: password
     name: default-email-secret
-    namespace: kubesphere-monitoring-system
   authUsername: sender1 
   from: [email protected]
   requireTLS: true
@@ -178,7 +177,6 @@ spec:
   authPassword:
     key: password
     name: default-email-secret
-    namespace: kubesphere-monitoring-system
   authUsername: sender1 
   from: [email protected]
   requireTLS: true
@@ -376,7 +374,6 @@ spec:
   authPassword:
     key: password
     name: default-email-secret
-    namespace: default
   authUsername: sender1
   from: [email protected]
   requireTLS: true
@@ -427,7 +424,6 @@ spec:
   authPassword:
     key: password
     name: user1-email-secret
-    namespace: default
   authUsername: sender1 
   from: [email protected]
   requireTLS: true

config/bundle.yaml

@@ -39,29 +39,35 @@ spec:
                 authentications.
               properties:
                 key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
                   type: string
                 name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    TODO: Add other useful fields. apiVersion, kind, uid?'
                   type: string
-                namespace:
-                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
               required:
               - key
-              - name
-              - namespace
               type: object
             authSecret:
               description: The secret contains the SMTP secret for CRAM-MD5 authentication.
               properties:
                 key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
                   type: string
                 name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    TODO: Add other useful fields. apiVersion, kind, uid?'
                   type: string
-                namespace:
-                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
               required:
               - key
-              - name
-              - namespace
               type: object
             authUsername:
               description: The username for CRAM-MD5, LOGIN and PLAIN authentications.

config/crd/bases/notification.kubesphere.io_emailconfigs.yaml

@@ -42,29 +42,35 @@ spec:
                 authentications.
               properties:
                 key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
                   type: string
                 name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    TODO: Add other useful fields. apiVersion, kind, uid?'
                   type: string
-                namespace:
-                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
               required:
               - key
-              - name
-              - namespace
               type: object
             authSecret:
               description: The secret contains the SMTP secret for CRAM-MD5 authentication.
               properties:
                 key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
                   type: string
                 name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    TODO: Add other useful fields. apiVersion, kind, uid?'
                   type: string
-                namespace:
-                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
               required:
               - key
-              - name
-              - namespace
               type: object
             authUsername:
               description: The username for CRAM-MD5, LOGIN and PLAIN authentications.

config/samples/bundle.yaml

@@ -21,7 +21,6 @@ spec:
   authPassword:
     key: password
     name: default-email-secret
-    namespace: kubesphere-monitoring-system
   authUsername: sender1
   from: [email protected]
   requireTLS: true
@@ -42,7 +41,6 @@ spec:
   authPassword:
     key: password
     name: default-email-secret
-    namespace: kubesphere-monitoring-system
   authUsername: sender1
   from: [email protected]
   requireTLS: true

config/samples/email_default_config.yaml

@@ -11,7 +11,6 @@ spec:
     port: "25"
   authUsername: sender1
   authPassword:
-    namespace: kubesphere-monitoring-system
     name: default-email-secret
     key: password
   requireTLS: true

config/samples/email_tenant_config.yaml

@@ -12,7 +12,6 @@ spec:
     port: "25"
   authUsername: sender1 
   authPassword:
-    namespace: kubesphere-monitoring-system
     name: default-email-secret
     key: password
   requireTLS: true

helm/crds/emailconfigs.yaml

@@ -38,29 +38,35 @@ spec:
                 authentications.
               properties:
                 key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
                   type: string
                 name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
                   type: string
-                namespace:
-                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
               required:
                 - key
-                - name
-                - namespace
               type: object
             authSecret:
               description: The secret contains the SMTP secret for CRAM-MD5 authentication.
               properties:
                 key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
                   type: string
                 name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
                   type: string
-                namespace:
-                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
               required:
                 - key
-                - name
-                - namespace
               type: object
             authUsername:
               description: The username for CRAM-MD5, LOGIN and PLAIN authentications.

pkg/apis/v1alpha1/emailconfig_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -33,9 +34,9 @@ type EmailConfigSpec struct {
 	// The identity for PLAIN authentication.
 	AuthIdentify *string `json:"authIdentify,omitempty"`
 	// The secret contains the SMTP password for LOGIN and PLAIN authentications.
-	AuthPassword *SecretKeyRef `json:"authPassword,omitempty"`
+	AuthPassword *v1.SecretKeySelector `json:"authPassword,omitempty"`
 	// The secret contains the SMTP secret for CRAM-MD5 authentication.
-	AuthSecret *SecretKeyRef `json:"authSecret,omitempty"`
+	AuthSecret *v1.SecretKeySelector `json:"authSecret,omitempty"`
 	// The default SMTP TLS requirement.
 	RequireTLS *bool `json:"requireTLS,omitempty"`
 }
@@ -45,12 +46,6 @@ type HostPort struct {
 	Port string `json:"port"`
 }
 
-type SecretKeyRef struct {
-	Namespace string `json:"namespace"`
-	Name      string `json:"name"`
-	Key       string `json:"key"`
-}
-
 // EmailConfigStatus defines the observed state of EmailConfig
 type EmailConfigStatus struct {
 }