fixing more url stuff

upup/pkg/fi/cloudup/apply_cluster.go

@@ -216,7 +216,7 @@ func (c *ApplyClusterCmd) Run() error {
 	}
 
 	if err := c.applyFileAssets(assetBuilder); err != nil {
-		return err
+		return fmt.Errorf("error getting assets: %v", err)
 	}
 
 	checkExisting := true
@@ -554,27 +554,27 @@ func (c *ApplyClusterCmd) Run() error {
 		var images []*nodeup.Image
 
 		if components.IsBaseURL(cluster.Spec.KubernetesVersion) {
-			baseURL, err := url.Parse(cluster.Spec.KubernetesVersion)
-			if err != nil {
-				return nil, err
-			}
-
 			// When using a custom version, we want to preload the images over http
 			components := []string{"kube-proxy"}
 			if role == kops.InstanceGroupRoleMaster {
 				components = append(components, "kube-apiserver", "kube-controller-manager", "kube-scheduler")
 			}
 
 			for _, component := range components {
-				var k *url.URL
-				k.Path = path.Join(baseURL.Path, "/bin/linux/amd64/", component+".tar")
-				u := k.String()
+				baseURL, err := url.Parse(cluster.Spec.KubernetesVersion)
+				if err != nil {
+					return nil, err
+				}
+
+				baseURL.Path = path.Join(baseURL.Path, "/bin/linux/amd64/", component+".tar")
+				u := baseURL.String()
 				sha := fmt.Sprintf("%s.sha", u)
 
 				u, hash, err := assetBuilder.RemapFileAndSHA(u, sha)
 				if err != nil {
 					return nil, err
 				}
+
 				image := &nodeup.Image{
 					Source: u,
 					Hash:   hash.Hex(),
@@ -938,18 +938,12 @@ func (c *ApplyClusterCmd) applyFileAssets(assetBuilder *assets.AssetBuilder) err
 		c.Cluster.Spec.KubernetesVersion = versionWithoutV
 	}
 
-	var baseURL *url.URL
+	var baseURL string
 	var err error
 	if components.IsBaseURL(c.Cluster.Spec.KubernetesVersion) {
-		baseURL, err = url.Parse(c.Cluster.Spec.KubernetesVersion)
-		if err != nil {
-			return err
-		}
+		baseURL = c.Cluster.Spec.KubernetesVersion
 	} else {
-		baseURL, err = url.Parse("https://storage.googleapis.com/kubernetes-release/release/v" + c.Cluster.Spec.KubernetesVersion)
-		if err != nil {
-			return err
-		}
+		baseURL = "https://storage.googleapis.com/kubernetes-release/release/v" + c.Cluster.Spec.KubernetesVersion
 	}
 
 	k8sAssetsNames := []string{
@@ -961,8 +955,11 @@ func (c *ApplyClusterCmd) applyFileAssets(assetBuilder *assets.AssetBuilder) err
 	}
 
 	for _, a := range k8sAssetsNames {
-		k := &url.URL { }
-		k.Path = path.Join(baseURL.Path, a)
+		k, err := url.Parse(baseURL)
+		if err != nil {
+			return err
+		}
+		k.Path = path.Join(k.Path, a)
 		u := k.String()
 		sha := fmt.Sprintf("%s.sha", u)
 
@@ -1003,6 +1000,7 @@ func (c *ApplyClusterCmd) applyFileAssets(assetBuilder *assets.AssetBuilder) err
 	c.NodeUpSource = n
 
 	// When the Target is DryRun this is not being called
+	// Is there another way to call this?
 	_, _, err = ProtokubeImageSource(assetBuilder)
 	if err != nil {
 		return err