-
Notifications
You must be signed in to change notification settings - Fork 830
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #274 from iyacontrol/announce
增加集群和命名空间级别自定义注解
- Loading branch information
Showing
7 changed files
with
135 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package common | ||
|
||
import ( | ||
kapiv1beta1 "k8s.io/api/extensions/v1beta1" | ||
|
||
"github.com/Qihoo360/wayne/src/backend/models" | ||
) | ||
|
||
func IngressPreDeploy(kubeIngress *kapiv1beta1.Ingress, cluster *models.Cluster, namespace *models.Namespace) { | ||
preDefinedAnnotationMap := make(map[string]string) | ||
|
||
annotationResult := make(map[string]string, 0) | ||
// user defined | ||
for k, v := range kubeIngress.Annotations { | ||
preDefinedAnnotationMap[k] = v | ||
} | ||
// cluster defined, overwrite user defined | ||
for k, v := range cluster.MetaDataObj.IngressAnnotations { | ||
preDefinedAnnotationMap[k] = v | ||
} | ||
// namespace defined, overwrite cluster and user defined | ||
for k, v := range namespace.MetaDataObj.IngressAnnotations { | ||
preDefinedAnnotationMap[k] = v | ||
} | ||
for k, v := range preDefinedAnnotationMap { | ||
annotationResult[k] = v | ||
} | ||
|
||
kubeIngress.Annotations = annotationResult | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package common | ||
|
||
import ( | ||
"k8s.io/api/core/v1" | ||
|
||
"github.com/Qihoo360/wayne/src/backend/models" | ||
) | ||
|
||
func ServicePreDeploy(kubeService *v1.Service, cluster *models.Cluster, namespace *models.Namespace) { | ||
preDefinedAnnotationMap := make(map[string]string) | ||
|
||
annotationResult := make(map[string]string, 0) | ||
// user defined | ||
for k, v := range kubeService.Annotations { | ||
preDefinedAnnotationMap[k] = v | ||
} | ||
// cluster defined, overwrite user defined | ||
for k, v := range cluster.MetaDataObj.ServiceAnnotations { | ||
preDefinedAnnotationMap[k] = v | ||
} | ||
// namespace defined, overwrite cluster and user defined | ||
for k, v := range namespace.MetaDataObj.ServiceAnnotations { | ||
preDefinedAnnotationMap[k] = v | ||
} | ||
for k, v := range preDefinedAnnotationMap { | ||
annotationResult[k] = v | ||
} | ||
|
||
kubeService.Annotations = annotationResult | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters