Skip to content

[krel] gcbmgr: Dynamically retrieve build version from CI markers #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 20, 2020
Merged

[krel] gcbmgr: Dynamically retrieve build version from CI markers #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c0cec7
pkg/release: Add getters for tools GitHub url, org, repo, and branch
justaugustus Feb 19, 2020
3e52346
pkg/release: Refactor version marker getters
justaugustus Feb 19, 2020
f2cc7cd
[krel] gcbmgr: Dynamically retrieve build version from CI markers
justaugustus Feb 20, 2020
812201d
pkg/util: Check HTTP status code before return in GetURLResponse()
justaugustus Feb 20, 2020
497d958
pkg/release: Allow version getters to return [non-]SemVer-compliant
justaugustus Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions cmd/krel/cmd/gcbmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func init() {
gcbmgrCmd.PersistentFlags().StringVar(
&gcbmgrOpts.buildVersion,
"build-version",
"FAKE+BUILD+POINT",
"",
"Build version",
)

Expand Down Expand Up @@ -260,18 +260,14 @@ func runGcbmgr() error {
func setGCBSubstitutions(o *gcbmgrOptions) (map[string]string, error) {
gcbSubs := map[string]string{}

releaseToolRepo := os.Getenv("RELEASE_TOOL_REPO")
if releaseToolRepo == "" {
releaseToolRepo = release.DefaultReleaseToolRepo
}
toolOrg := release.GetToolOrg()
gcbSubs["TOOL_ORG"] = toolOrg

releaseToolBranch := os.Getenv("RELEASE_TOOL_BRANCH")
if releaseToolBranch == "" {
releaseToolBranch = release.DefaultReleaseToolBranch
}
toolRepo := release.GetToolRepo()
gcbSubs["TOOL_REPO"] = toolRepo

gcbSubs["RELEASE_TOOL_REPO"] = releaseToolRepo
gcbSubs["RELEASE_TOOL_BRANCH"] = releaseToolBranch
toolBranch := release.GetToolBranch()
gcbSubs["TOOL_BRANCH"] = toolBranch

gcpUser := o.gcpUser
if gcpUser == "" {
Expand Down Expand Up @@ -312,25 +308,33 @@ func setGCBSubstitutions(o *gcbmgrOptions) (map[string]string, error) {
gcbSubs["RC"] = ""
}

branch := o.branch
if branch == "" {
return gcbSubs, errors.New("Release branch must be set to continue")
}

gcbSubs["RELEASE_BRANCH"] = branch

// TODO: Remove once we remove support for --built-at-head.
gcbSubs["BUILD_AT_HEAD"] = ""

buildpoint := o.buildVersion
buildVersion := o.buildVersion
if buildVersion == "" {
var versionErr error
buildVersion, versionErr = release.GetCIKubeVersion(o.branch, false)
if versionErr != nil {
return gcbSubs, versionErr
}
}

buildpoint := buildVersion
buildpoint = strings.ReplaceAll(buildpoint, "+", "-")
gcbSubs["BUILD_POINT"] = buildpoint

// TODO: Add conditionals for find_green_build
buildVersion := o.buildVersion
buildVersion = fmt.Sprintf("--buildversion=%s", buildVersion)
gcbSubs["BUILDVERSION"] = buildVersion

branch := o.branch
if branch == "" {
return gcbSubs, errors.New("Release branch must be set to continue")
}

gcbSubs["RELEASE_BRANCH"] = branch

kubecrossBranches := []string{
branch,
"master",
Expand Down
88 changes: 57 additions & 31 deletions cmd/krel/cmd/gcbmgr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package cmd

import (
"fmt"
"os"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -96,6 +97,9 @@ func TestSetGCBSubstitutionsSuccess(t *testing.T) {
testcases := []struct {
name string
gcbmgrOpts gcbmgrOptions
toolOrg string
toolRepo string
toolBranch string
expected map[string]string
}{
{
Expand All @@ -106,16 +110,15 @@ func TestSetGCBSubstitutionsSuccess(t *testing.T) {
gcpUser: "test-user",
},
expected: map[string]string{
"BUILDVERSION": "--buildversion=",
"BUILD_AT_HEAD": "",
"BUILD_POINT": "",
"OFFICIAL": "",
"OFFICIAL_TAG": "",
"RC": "",
"RC_TAG": "",
"RELEASE_BRANCH": "master",
"RELEASE_TOOL_BRANCH": "master",
"RELEASE_TOOL_REPO": "https://github.com/kubernetes/release",
"BUILD_AT_HEAD": "",
"OFFICIAL": "",
"OFFICIAL_TAG": "",
"RC": "",
"RC_TAG": "",
"RELEASE_BRANCH": "master",
"TOOL_ORG": "kubernetes",
"TOOL_REPO": "release",
"TOOL_BRANCH": "master",
},
},
{
Expand All @@ -126,16 +129,15 @@ func TestSetGCBSubstitutionsSuccess(t *testing.T) {
gcpUser: "test-user",
},
expected: map[string]string{
"BUILDVERSION": "--buildversion=",
"BUILD_AT_HEAD": "",
"BUILD_POINT": "",
"OFFICIAL": "",
"OFFICIAL_TAG": "",
"RC": "--rc",
"RC_TAG": "rc",
"RELEASE_BRANCH": "release-1.14",
"RELEASE_TOOL_BRANCH": "master",
"RELEASE_TOOL_REPO": "https://github.com/kubernetes/release",
"BUILD_AT_HEAD": "",
"OFFICIAL": "",
"OFFICIAL_TAG": "",
"RC": "--rc",
"RC_TAG": "rc",
"RELEASE_BRANCH": "release-1.14",
"TOOL_ORG": "kubernetes",
"TOOL_REPO": "release",
"TOOL_BRANCH": "master",
},
},
{
Expand All @@ -146,16 +148,37 @@ func TestSetGCBSubstitutionsSuccess(t *testing.T) {
gcpUser: "test-user",
},
expected: map[string]string{
"BUILDVERSION": "--buildversion=",
"BUILD_AT_HEAD": "",
"BUILD_POINT": "",
"OFFICIAL": "--official",
"OFFICIAL_TAG": "official",
"RC": "",
"RC_TAG": "",
"RELEASE_BRANCH": "release-1.15",
"RELEASE_TOOL_BRANCH": "master",
"RELEASE_TOOL_REPO": "https://github.com/kubernetes/release",
"BUILD_AT_HEAD": "",
"OFFICIAL": "--official",
"OFFICIAL_TAG": "official",
"RC": "",
"RC_TAG": "",
"RELEASE_BRANCH": "release-1.15",
"TOOL_ORG": "kubernetes",
"TOOL_REPO": "release",
"TOOL_BRANCH": "master",
},
},
{
name: "release-1.16 official with custom tool org, repo, and branch",
gcbmgrOpts: gcbmgrOptions{
branch: "release-1.16",
releaseType: "official",
gcpUser: "test-user",
},
toolOrg: "honk",
toolRepo: "best-tools",
toolBranch: "tool-branch",
expected: map[string]string{
"BUILD_AT_HEAD": "",
"OFFICIAL": "--official",
"OFFICIAL_TAG": "official",
"RC": "",
"RC_TAG": "",
"RELEASE_BRANCH": "release-1.16",
"TOOL_ORG": "honk",
"TOOL_REPO": "best-tools",
"TOOL_BRANCH": "tool-branch",
},
},
}
Expand All @@ -164,6 +187,9 @@ func TestSetGCBSubstitutionsSuccess(t *testing.T) {
t.Logf("Test case: %s", tc.name)

opts := tc.gcbmgrOpts
os.Setenv("TOOL_ORG", tc.toolOrg)
os.Setenv("TOOL_REPO", tc.toolRepo)
os.Setenv("TOOL_BRANCH", tc.toolBranch)

subs, err := setGCBSubstitutions(&opts)
actual := dropDynamicSubstitutions(subs)
Expand Down Expand Up @@ -205,7 +231,7 @@ func dropDynamicSubstitutions(orig map[string]string) (result map[string]string)
result = orig

for k := range result {
if k == "GCP_USER_TAG" || k == "KUBE_CROSS_VERSION" {
if k == "BUILDVERSION" || k == "BUILD_POINT" || k == "GCP_USER_TAG" || k == "KUBE_CROSS_VERSION" {
delete(result, k)
}
}
Expand Down
6 changes: 2 additions & 4 deletions pkg/kubepkg/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/command:go_default_library",
"//pkg/release:go_default_library",
"//pkg/util:go_default_library",
"@com_github_blang_semver//:go_default_library",
"@com_github_google_go_github_v29//github:go_default_library",
Expand All @@ -36,8 +37,5 @@ go_test(
name = "go_default_test",
srcs = ["kubepkg_test.go"],
embed = [":go_default_library"],
deps = [
"@com_github_stretchr_testify//assert:go_default_library",
"@com_github_stretchr_testify//require:go_default_library",
],
deps = ["@com_github_stretchr_testify//assert:go_default_library"],
)
46 changes: 7 additions & 39 deletions pkg/kubepkg/kubepkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"fmt"
"io/ioutil"
"net/http"
"os"
"path/filepath"
"reflect"
Expand All @@ -34,6 +33,7 @@ import (
"github.com/sirupsen/logrus"

"k8s.io/release/pkg/command"
"k8s.io/release/pkg/release"
"k8s.io/release/pkg/util"
)

Expand All @@ -60,6 +60,8 @@ const (
templateRootDir = "templates"

kubeadmConf = "10-kubeadm.conf"

useSemver = true
)

var (
Expand Down Expand Up @@ -391,46 +393,12 @@ func getKubernetesVersion(packageDef *PackageDefinition) (string, error) {
}
switch packageDef.Channel {
case ChannelTesting:
return getTestingKubeVersion()
return release.GetStablePrereleaseKubeVersion(useSemver)
case ChannelNightly:
return getNightlyKubeVersion()
}

return getReleaseKubeVersion()
}

func getReleaseKubeVersion() (string, error) {
logrus.Info("Retrieving Kubernetes release version...")
return fetchVersion("https://dl.k8s.io/release/stable.txt")
}

func getTestingKubeVersion() (string, error) {
logrus.Info("Retrieving Kubernetes testing version...")
return fetchVersion("https://dl.k8s.io/release/latest.txt")
}

func getNightlyKubeVersion() (string, error) {
logrus.Info("Retrieving Kubernetes nightly version...")
return fetchVersion("https://dl.k8s.io/ci/k8s-master.txt")
}

func fetchVersion(url string) (string, error) {
res, err := http.Get(url)
if err != nil {
return "", err
return release.GetLatestCIKubeVersion(useSemver)
}

versionBytes, err := ioutil.ReadAll(res.Body)
res.Body.Close()
if err != nil {
return "", err
}

// Remove a newline and the v prefix from the string
version := strings.Replace(strings.Replace(string(versionBytes), "v", "", 1), "\n", "", 1)

logrus.Infof("Retrieved Kubernetes version: %s", version)
return version, nil
return release.GetStableReleaseKubeVersion(useSemver)
}

func getCNIVersion(packageDef *PackageDefinition) (string, error) {
Expand Down Expand Up @@ -584,7 +552,7 @@ func getCIBuildsDownloadLinkBase(packageDef *PackageDefinition) (string, error)
ciVersion := packageDef.KubernetesVersion
if ciVersion == "" {
var err error
ciVersion, err = getNightlyKubeVersion()
ciVersion, err = release.GetLatestCIKubeVersion(useSemver)
if err != nil {
return "", err
}
Expand Down
52 changes: 0 additions & 52 deletions pkg/kubepkg/kubepkg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestGetPackageVersionSuccess(t *testing.T) {
Expand Down Expand Up @@ -120,57 +119,6 @@ func TestGetKubernetesVersionFailure(t *testing.T) {
a.Error(err)
}

func TestFetchVersionSuccess(t *testing.T) {
testcases := []struct {
name string
url string
expected string
}{
{
name: "Release URL",
url: "https://dl.k8s.io/release/stable-1.13.txt",
expected: "1.13.12",
},
{
name: "CI URL",
url: "https://dl.k8s.io/ci/latest-1.14.txt",
expected: "1.14.11-beta.1.2+c8b135d0b49c44",
},
}

for _, tc := range testcases {
actual, err := fetchVersion(tc.url)

if err != nil {
t.Fatalf("did not expect an error: %v", err)
}

assert.Equal(t, tc.expected, actual)
}
}

func TestFetchVersionFailure(t *testing.T) {
testcases := []struct {
name string
url string
}{
{
name: "Empty URL string",
url: "",
},
{
name: "Bad URL",
url: "https://fake.url",
},
}

for _, tc := range testcases {
_, err := fetchVersion(tc.url)

require.Error(t, err)
}
}

func TestGetCNIVersionSuccess(t *testing.T) {
testcases := []struct {
name string
Expand Down
Loading