Merge pull request #17395 from liggitt/normalize-cluster-up

Automatic merge from submit-queue (batch tested with PRs 17395, 17385).

Normalize image ref before pulling in cluster up

Fixes #17394

/test extended_clusterup

Author: openshift-merge-robot

pkg/oc/bootstrap/docker/dockerhelper/helper.go

@@ -10,6 +10,7 @@ import (
 	"regexp"
 	"strconv"
 
+	"github.com/docker/distribution/reference"
 	"github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
 	"github.com/golang/glog"
@@ -146,7 +147,13 @@ func (h *Helper) CheckAndPull(image string, out io.Writer) error {
 	if glog.V(5) {
 		outputStream = out
 	}
-	err = h.client.ImagePull(image, types.ImagePullOptions{}, outputStream)
+
+	normalized, err := reference.ParseNormalizedNamed(image)
+	if err != nil {
+		return err
+	}
+
+	err = h.client.ImagePull(normalized.String(), types.ImagePullOptions{}, outputStream)
 	if err != nil {
 		return starterrors.NewError("error pulling Docker image %s", image).WithCause(err)
 	}