remove var shading; fix imports

pkg/cluster/resources.go

@@ -372,9 +372,9 @@ func (c *Cluster) applySecrets() error {
 		secret, err := c.KubeClient.Secrets(secretSpec.Namespace).Create(secretSpec)
 		if k8sutil.ResourceAlreadyExists(err) {
 			var userMap map[string]spec.PgUser
-			curSecret, err := c.KubeClient.Secrets(secretSpec.Namespace).Get(secretSpec.Name, metav1.GetOptions{})
+			curSecret, err2 := c.KubeClient.Secrets(secretSpec.Namespace).Get(secretSpec.Name, metav1.GetOptions{})
-			if err != nil {
+			if err2 != nil {
-				return fmt.Errorf("could not get current secret: %v", err)
+				return fmt.Errorf("could not get current secret: %v", err2)
 			}
 			c.logger.Debugf("secret %q already exists, fetching it's password", util.NameFromMeta(curSecret.ObjectMeta))
 			if secretUsername == c.systemUsers[constants.SuperuserKeyName].Name {

pkg/cluster/util.go

@@ -235,13 +235,13 @@ func (c *Cluster) waitPodLabelsReady() error {
 
 	err = retryutil.Retry(c.OpConfig.ResourceCheckInterval, c.OpConfig.ResourceCheckTimeout,
 		func() (bool, error) {
-			masterPods, err := c.KubeClient.Pods(namespace).List(masterListOption)
+			masterPods, err2 := c.KubeClient.Pods(namespace).List(masterListOption)
-			if err != nil {
+			if err2 != nil {
-				return false, err
+				return false, err2
 			}
-			replicaPods, err := c.KubeClient.Pods(namespace).List(replicaListOption)
+			replicaPods, err2 := c.KubeClient.Pods(namespace).List(replicaListOption)
-			if err != nil {
+			if err2 != nil {
-				return false, err
+				return false, err2
 			}
 			if len(masterPods.Items) > 1 {
 				return false, fmt.Errorf("too many masters")

pkg/util/util.go

@@ -4,14 +4,13 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"math/rand"
+	"regexp"
 	"strings"
 	"time"
 
 	"github.com/motomux/pretty"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"regexp"
-
 	"github.com/zalando-incubator/postgres-operator/pkg/spec"
 )