remove var shading; fix imports

This commit is contained in:
Murat Kabilov
2017-08-15 15:59:10 +02:00
parent 272d7e1bcf
commit d2828e5ece
3 changed files with 10 additions and 11 deletions
+6 -6
View File
@@ -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)
if err != nil {
return false, err
masterPods, err2 := c.KubeClient.Pods(namespace).List(masterListOption)
if err2 != nil {
return false, err2
}
replicaPods, err := c.KubeClient.Pods(namespace).List(replicaListOption)
if err != nil {
return false, err
replicaPods, err2 := c.KubeClient.Pods(namespace).List(replicaListOption)
if err2 != nil {
return false, err2
}
if len(masterPods.Items) > 1 {
return false, fmt.Errorf("too many masters")