public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-03 10:15:36 +02:00
Code Issues Projects Releases Wiki Activity

feat: add ignored annotations

Browse Source
This commit is contained in:
Moshe Immerman
2021-05-05 22:24:15 +02:00
parent 32e6c135b9
commit 24bb45cf62
12 changed files with 655 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+3
View File
@@ -184,6 +184,9 @@ func (c *Controller) modifyConfigFromEnvironment() {
if c.config.NoTeamsAPI {
c.opConfig.EnableTeamsAPI = false
}
c.opConfig.IgnoredAnnotations = append(c.opConfig.IgnoredAnnotations, c.config.IgnoredAnnotations...)
scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
if scalyrAPIKey != "" {
c.opConfig.ScalyrAPIKey = scalyrAPIKey
pkg/controller/operator_config.go
+1
View File
@@ -60,6 +60,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.TargetMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.TargetMajorVersion, "13")
// kubernetes config
result.IgnoredAnnotations = fromCRD.Kubernetes.IgnoredAnnotations
result.CustomPodAnnotations = fromCRD.Kubernetes.CustomPodAnnotations
result.PodServiceAccountName = util.Coalesce(fromCRD.Kubernetes.PodServiceAccountName, "postgres-pod")
result.PodServiceAccountDefinition = fromCRD.Kubernetes.PodServiceAccountDefinition