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

Merge branch 'master' into feature/refactor-tpr

Browse Source 
# Conflicts:
#	cmd/main.go
#	pkg/cluster/cluster.go
#	pkg/controller/controller.go
#	pkg/controller/util.go
This commit is contained in:
Murat Kabilov
2017-07-24 21:21:42 +02:00
parent 72a8fcc9aa 4455f1b639
commit 035069137a
7 changed files with 197 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/cluster.go
+3 -3
View File
@@ -13,7 +13,7 @@ import (
"github.com/Sirupsen/logrus"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/apis/apps/v1beta1"
"k8s.io/client-go/rest"
@@ -67,7 +67,7 @@ type Cluster struct {
podEventsQueue *cache.FIFO
teamsAPIClient *teams.API
KubeClient *kubernetes.Clientset //TODO: move clients to the better place?
KubeClient k8sutil.KubernetesClient //TODO: move clients to the better place?
}
type compareStatefulsetResult struct {
@@ -78,7 +78,7 @@ type compareStatefulsetResult struct {
}
// New creates a new cluster. This function should be called from a controller.
func New(cfg Config, kubeClient *kubernetes.Clientset, pgSpec spec.Postgresql, logger *logrus.Entry) *Cluster {
func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec spec.Postgresql, logger *logrus.Entry) *Cluster {
lg := logger.WithField("pkg", "cluster").WithField("cluster-name", pgSpec.Metadata.Name)
kubeResources := kubeResources{Secrets: make(map[types.UID]*v1.Secret), Service: make(map[PostgresRole]*v1.Service)}
orphanDependents := true