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

finish ignored_annotations feature

Browse Source
This commit is contained in:
Felix Kunde
2022-03-22 12:25:45 +01:00
parent a020708ef1 3ecd1e94a0
commit 2e2ac12086
21 changed files with 587 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+1
View File
@@ -186,6 +186,7 @@ func (c *Controller) modifyConfigFromEnvironment() {
if c.config.NoTeamsAPI {
c.opConfig.EnableTeamsAPI = false
}
scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
if scalyrAPIKey != "" {
c.opConfig.ScalyrAPIKey = scalyrAPIKey
pkg/controller/operator_config.go
+1
View File
@@ -108,6 +108,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels
result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations
result.DownscalerAnnotations = fromCRD.Kubernetes.DownscalerAnnotations
result.IgnoredAnnotations = fromCRD.Kubernetes.IgnoredAnnotations
result.ClusterNameLabel = util.Coalesce(fromCRD.Kubernetes.ClusterNameLabel, "cluster-name")
result.DeleteAnnotationDateKey = fromCRD.Kubernetes.DeleteAnnotationDateKey
result.DeleteAnnotationNameKey = fromCRD.Kubernetes.DeleteAnnotationNameKey