Merge pull request #1383 from justaugustus/kubepkg

kubepkg: Use the cross build version marker (ci/k8s-master) for packages
kubernetes · Jun 29, 2020 · 8c711b5 · 8c711b5
2 parents 604b250 + 34dfb10
commit 8c711b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/kubepkg/kubepkg.go b/pkg/kubepkg/kubepkg.go
@@ -445,7 +445,7 @@ func (c *Client) GetKubernetesVersion(packageDef *PackageDefinition) (string, er
 	case ChannelTesting:
 		return c.impl.GetKubeVersion(release.VersionTypeStablePreRelease)
 	case ChannelNightly:
-		return c.impl.GetKubeVersion(release.VersionTypeCILatest)
+		return c.impl.GetKubeVersion(release.VersionTypeCILatestCross)
 	}
 
 	return c.impl.GetKubeVersion(release.VersionTypeStable)
@@ -577,7 +577,7 @@ func (c *Client) GetCIBuildsDownloadLinkBase(packageDef *PackageDefinition) (str
 	ciVersion := packageDef.KubernetesVersion
 	if ciVersion == "" {
 		var err error
-		ciVersion, err = c.impl.GetKubeVersion(release.VersionTypeCILatest)
+		ciVersion, err = c.impl.GetKubeVersion(release.VersionTypeCILatestCross)
 		if err != nil {
 			return "", err
 		}

diff --git a/pkg/release/version.go b/pkg/release/version.go
@@ -60,6 +60,10 @@ const (
 	// for example `v1.19.0-alpha.0.721+f8ff8f44206ff4`
 	VersionTypeCILatest VersionType = "ci/latest"
 
+	// VersionTypeCILatestCross references the latest CI cross build Kubernetes
+	// version, for example `v1.19.0-alpha.0.721+f8ff8f44206ff4`
+	VersionTypeCILatestCross VersionType = "ci/k8s-master"
+
 	// baseURL is the base URL for every release version retrieval
 	baseURL = "https://dl.k8s.io/"
 )