Merge pull request #2153 from justaugustus/buckets

k8s-ci-robot · web-flow · commit 88533d53ffb2 · 2021-07-03T14:36:18.000-07:00
packages/deb: Use ci/latest.txt as canonical cross build marker
diff --git a/packages/deb/build.go b/packages/deb/build.go
@@ -289,7 +289,7 @@ func getCRIToolsLatestVersion() (string, error) {
 }
 
 func getLatestKubeCIBuild() (string, error) {
-	return fetchVersion("https://dl.k8s.io/ci-cross/latest.txt")
+	return fetchVersion("https://dl.k8s.io/ci/latest.txt")
 }
 
 func getCIBuildsDownloadLinkBase(_ version) (string, error) {
@@ -298,7 +298,7 @@ func getCIBuildsDownloadLinkBase(_ version) (string, error) {
 		return "", err
 	}
 
-	return fmt.Sprintf("https://dl.k8s.io/ci-cross/v%s", latestCiVersion), nil
+	return fmt.Sprintf("https://dl.k8s.io/ci/v%s", latestCiVersion), nil
 }
 
 func getReleaseDownloadLinkBase(v version) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func getCRIToolsLatestVersion() (string, error) {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`func getLatestKubeCIBuild() (string, error) {`
`292`		`- return fetchVersion("https://dl.k8s.io/ci-cross/latest.txt")`
	`292`	`+ return fetchVersion("https://dl.k8s.io/ci/latest.txt")`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`func getCIBuildsDownloadLinkBase(_ version) (string, error) {`
`@@ -298,7 +298,7 @@ func getCIBuildsDownloadLinkBase(_ version) (string, error) {`
`298`	`298`	`return "", err`
`299`	`299`	`}`
`300`	`300`
`301`		`- return fmt.Sprintf("https://dl.k8s.io/ci-cross/v%s", latestCiVersion), nil`
	`301`	`+ return fmt.Sprintf("https://dl.k8s.io/ci/v%s", latestCiVersion), nil`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`func getReleaseDownloadLinkBase(v version) (string, error) {`