This commit is contained in:
Murat Kabilov 2017-07-27 11:27:08 +02:00
parent b0b25ecfd3
commit 5db09facd5
4 changed files with 5 additions and 5 deletions

View File

@ -5,11 +5,11 @@ import (
"fmt"
"net/http"
"net/http/pprof"
"sync"
"regexp"
"sync"
"github.com/Sirupsen/logrus"
"encoding/json"
"github.com/Sirupsen/logrus"
)
type ClusterInformer interface {

View File

@ -36,7 +36,7 @@ var (
// Config contains operator-wide clients and configuration used from a cluster. TODO: remove struct duplication.
type Config struct {
OpConfig config.Config
RestConfig *rest.Config `json:"-"`
RestConfig *rest.Config `json:"-"`
InfrastructureRoles map[string]spec.PgUser // inherited from the controller
}

View File

@ -10,12 +10,12 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"
"github.com/zalando-incubator/postgres-operator/pkg/apiserver"
"github.com/zalando-incubator/postgres-operator/pkg/cluster"
"github.com/zalando-incubator/postgres-operator/pkg/spec"
"github.com/zalando-incubator/postgres-operator/pkg/util/config"
"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
"github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil"
"github.com/zalando-incubator/postgres-operator/pkg/apiserver"
)
type Config struct {

View File

@ -42,7 +42,7 @@ func (c *Controller) ClusterStatus(team, cluster string) interface{} {
Status: cl.Status,
Resources: cl.KubeResources,
Spec: cl.Spec,
Error: cl.Error,
Error: cl.Error,
}
}