update SvcAnnotations to ServiceAnnotations

src/backend/controllers/common/ingress.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"github.com/Qihoo360/wayne/src/backend/models"
+
 	kapiv1beta1 "k8s.io/api/extensions/v1beta1"
 )
 
@@ -14,11 +15,11 @@ func IngressPreDeploy(kubeIngress *kapiv1beta1.Ingress, cluster *models.Cluster,
 		preDefinedAnnotationMap[k] = v
 	}
 	// cluster defined, overwrite user defined
-	for k, v := range cluster.MetaDataObj.SvcAnnotations {
+	for k, v := range cluster.MetaDataObj.ServiceAnnotations {
 		preDefinedAnnotationMap[k] = v
 	}
 	// namespace defined, overwrite cluster and user defined
-	for k, v := range namespace.MetaDataObj.SvcAnnotations {
+	for k, v := range namespace.MetaDataObj.ServiceAnnotations {
 		preDefinedAnnotationMap[k] = v
 	}
 	for k, v := range preDefinedAnnotationMap {

src/backend/models/cluster.go

@@ -84,7 +84,7 @@ type ClusterMetaData struct {
 	// current cluster image pull secrets, will be overwrite by namespace's ImagePullSecrets
 	ImagePullSecrets []v1.LocalObjectReference `json:"imagePullSecrets"`
 	// 默认添加service注解，会在发布资源时在每个service添加此Annotations, will be overwrite by namespace's Annotations
-	SvcAnnotations map[string]string `json:"svcAnnotations,omitempty"`
+	ServiceAnnotations map[string]string `json:"serviceAnnotations,omitempty"`
 	// 默认添加ingress注解，会在发布资源时在每个ingress添加此Annotations, will be overwrite by namespace's Annotations
 	IngressAnnotations map[string]string `json:"ingressAnnotations,omitempty"`
 }

src/backend/models/namespace.go

@@ -50,7 +50,7 @@ type NamespaceMetaData struct {
 	// current namespace image pull secrets, will overwrite cluster's ImagePullSecrets
 	ImagePullSecrets []v1.LocalObjectReference `json:"imagePullSecrets"`
 	// current namespace service annotation, will overwrite cluster service's Annotation
-	SvcAnnotations map[string]string `json:"svcAnnotations,omitempty"`
+	ServiceAnnotations map[string]string `json:"serviceAnnotations,omitempty"`
 	// current namespace ingress annotation, will overwrite cluster ingress's Annotation
 	IngressAnnotations map[string]string `json:"ingressAnnotations,omitempty"`
 }