Merge pull request #5008 from zaneb/image-cache-always

baremetal: Always use image cache
openshift · Jul 2, 2021 · 976e3a6 · 976e3a6
2 parents e4c6022 + fc99be5
commit 976e3a6
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/pkg/asset/machines/baremetal/machines.go b/pkg/asset/machines/baremetal/machines.go
@@ -89,12 +89,10 @@ func provider(platform *baremetal.Platform, osImage string, userDataSecret strin
 	cachedImageFilename := "cached-" + imageFilename
 
 	cacheImageIP := platform.ClusterProvisioningIP
-	cacheImagePort := "6180"
 	if platform.ProvisioningNetwork == baremetal.DisabledProvisioningNetwork && platform.ClusterProvisioningIP == "" {
 		cacheImageIP = platform.APIVIP
-		cacheImagePort = "6181"
 	}
-	cacheImageURL := fmt.Sprintf("http://%s/images/%s/%s", net.JoinHostPort(cacheImageIP, cacheImagePort), imageFilename, cachedImageFilename)
+	cacheImageURL := fmt.Sprintf("http://%s/images/%s/%s", net.JoinHostPort(cacheImageIP, "6181"), imageFilename, cachedImageFilename)
 	cacheChecksumURL := fmt.Sprintf("%s.md5sum", cacheImageURL)
 	config := &baremetalprovider.BareMetalMachineProviderSpec{
 		TypeMeta: metav1.TypeMeta{