From 5adceceb36b831441c8dbb564d1dc21fef9e9367 Mon Sep 17 00:00:00 2001
From: Oleksii Kliukin <oleksii.kliukin@zalando.de>
Date: Fri, 12 May 2017 17:48:25 +0200
Subject: [PATCH] go fmt run
---
cmd/main.go | 12 ++++++------
pkg/cluster/k8sres.go | 2 +-
pkg/cluster/pg.go | 20 ++++++++++----------
pkg/controller/exec.go | 2 +-
pkg/util/config/config.go | 2 +-
pkg/util/teams/teams.go | 4 ++--
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/cmd/main.go b/cmd/main.go
index b1e7f7e7..2d53f4b8 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -15,13 +15,13 @@ import (
)
var (
- KubeConfigFile string
- podNamespace string
- configMapName spec.NamespacedName
- OutOfCluster bool
- noTeamsAPI bool
+ KubeConfigFile string
+ podNamespace string
+ configMapName spec.NamespacedName
+ OutOfCluster bool
+ noTeamsAPI bool
noDatabaseAccess bool
- version string
+ version string
)
func init() {
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
index 8d454e17..da25a6ac 100644
--- a/pkg/cluster/k8sres.go
+++ b/pkg/cluster/k8sres.go
@@ -1,8 +1,8 @@
package cluster
import (
- "fmt"
"encoding/json"
+ "fmt"
"k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/v1"
diff --git a/pkg/cluster/pg.go b/pkg/cluster/pg.go
index 34816bca..c1902c5b 100644
--- a/pkg/cluster/pg.go
+++ b/pkg/cluster/pg.go
@@ -40,17 +40,17 @@ func (c *Cluster) DatabaseAccessDisabled() bool {
}
func (c *Cluster) initDbConn() (err error) {
if c.pgDb == nil {
- conn, err := sql.Open("postgres", c.pgConnectionString())
- if err != nil {
- return err
- }
- err = conn.Ping()
- if err != nil {
- conn.Close()
- return err
- }
+ conn, err := sql.Open("postgres", c.pgConnectionString())
+ if err != nil {
+ return err
+ }
+ err = conn.Ping()
+ if err != nil {
+ conn.Close()
+ return err
+ }
- c.pgDb = conn
+ c.pgDb = conn
}
return nil
diff --git a/pkg/controller/exec.go b/pkg/controller/exec.go
index 21a73c8d..be408c32 100644
--- a/pkg/controller/exec.go
+++ b/pkg/controller/exec.go
@@ -4,9 +4,9 @@ import (
"bytes"
"fmt"
+ remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
"k8s.io/client-go/pkg/api"
"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
- remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
"github.com/zalando-incubator/postgres-operator/pkg/spec"
)
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
index 77e5b636..7ed7c76a 100644
--- a/pkg/util/config/config.go
+++ b/pkg/util/config/config.go
@@ -52,7 +52,7 @@ type Config struct {
WALES3Bucket string `name:"wal_s3_bucket"`
KubeIAMRole string `name:"kube_iam_role"`
DebugLogging bool `name:"debug_logging" default:"false"`
- EnableDBAccess bool `name:"enable_database_access" default:"true"`
+ EnableDBAccess bool `name:"enable_database_access" default:"true"`
EnableTeamsAPI bool `name:"enable_teams_api" default:"true"`
DNSNameFormat string `name:"dns_name_format" default:"%s.%s.%s"`
Workers uint32 `name:"workers" default:"4"`
diff --git a/pkg/util/teams/teams.go b/pkg/util/teams/teams.go
index 6b0ba9e2..16eead40 100644
--- a/pkg/util/teams/teams.go
+++ b/pkg/util/teams/teams.go
@@ -42,7 +42,7 @@ type TeamsAPI struct {
httpClient *http.Client
logger *logrus.Entry
RefreshTokenAction func() (string, error)
- enabled bool
+ enabled bool
}
func NewTeamsAPI(url string, log *logrus.Logger, enabled bool) *TeamsAPI {
@@ -50,7 +50,7 @@ func NewTeamsAPI(url string, log *logrus.Logger, enabled bool) *TeamsAPI {
url: strings.TrimRight(url, "/"),
httpClient: &http.Client{},
logger: log.WithField("pkg", "teamsapi"),
- enabled: enabled,
+ enabled: enabled,
}
return &t
--
GitLab