fix ingress service bug

iyacontrol · iyacontrol · commit 212bca8072fc · 2019-02-18T14:48:18.000+08:00
diff --git a/src/backend/controllers/common/ingress.go b/src/backend/controllers/common/ingress.go
@@ -15,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.ServiceAnnotations {
+	for k, v := range cluster.MetaDataObj.IngressAnnotations {
 		preDefinedAnnotationMap[k] = v
 	}
 	// namespace defined, overwrite cluster and user defined
-	for k, v := range namespace.MetaDataObj.ServiceAnnotations {
+	for k, v := range namespace.MetaDataObj.IngressAnnotations {
 		preDefinedAnnotationMap[k] = v
 	}
 	for k, v := range preDefinedAnnotationMap {

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ func IngressPreDeploy(kubeIngress kapiv1beta1.Ingress, cluster models.Cluster,`
`15`	`15`	`preDefinedAnnotationMap[k] = v`
`16`	`16`	`}`
`17`	`17`	`// cluster defined, overwrite user defined`
`18`		`- for k, v := range cluster.MetaDataObj.ServiceAnnotations {`
	`18`	`+ for k, v := range cluster.MetaDataObj.IngressAnnotations {`
`19`	`19`	`preDefinedAnnotationMap[k] = v`
`20`	`20`	`}`
`21`	`21`	`// namespace defined, overwrite cluster and user defined`
`22`		`- for k, v := range namespace.MetaDataObj.ServiceAnnotations {`
	`22`	`+ for k, v := range namespace.MetaDataObj.IngressAnnotations {`
`23`	`23`	`preDefinedAnnotationMap[k] = v`
`24`	`24`	`}`
`25`	`25`	`for k, v := range preDefinedAnnotationMap {`