From 9824ddae5ed9f53c973b4ba2631f0f586326e348 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Thu, 24 May 2018 16:05:45 +0200 Subject: [PATCH 1/3] Fix etcd_host default --- pkg/util/config/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 3ffdfb932..2892b1fcf 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -68,8 +68,8 @@ type Config struct { Auth Scalyr - WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' - EtcdHost string `name:"etcd_host" default:"etcd-client.default.svc.cluster.local:2379"` + WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' + EtcdHost string `name:"etcd_host" default:""` // empty string forces Patroni use k8s as a DCS DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spiloprivate-9.6:1.2-p4"` // default name `operator` enables backward compatibility with the older ServiceAccountName field PodServiceAccountName string `name:"pod_service_account_name" default:"operator"` From 749d723f55a5cd65def9f6b516116ec70600435b Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Thu, 24 May 2018 16:22:13 +0200 Subject: [PATCH 2/3] Shorten the commen --- pkg/util/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 2892b1fcf..f9f52d151 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -69,7 +69,7 @@ type Config struct { Scalyr WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' - EtcdHost string `name:"etcd_host" default:""` // empty string forces Patroni use k8s as a DCS + EtcdHost string `name:"etcd_host" default:""` // forces Patroni use k8s as a DCS DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spiloprivate-9.6:1.2-p4"` // default name `operator` enables backward compatibility with the older ServiceAccountName field PodServiceAccountName string `name:"pod_service_account_name" default:"operator"` From 32a1456a68da631921864671c4c9895d2bf81825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20G=C3=B3mez?= Date: Thu, 24 May 2018 16:58:46 +0200 Subject: [PATCH 3/3] Update config.go --- pkg/util/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index f9f52d151..26f835ec4 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -69,7 +69,7 @@ type Config struct { Scalyr WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' - EtcdHost string `name:"etcd_host" default:""` // forces Patroni use k8s as a DCS + EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use k8s as a DCS DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spiloprivate-9.6:1.2-p4"` // default name `operator` enables backward compatibility with the older ServiceAccountName field PodServiceAccountName string `name:"pod_service_account_name" default:"operator"`