kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get greatest instead of just latest version

pull/9464/head
Predrag Rogic 2020-10-17 00:07:25 +01:00
parent 5e602b8662
commit fa17b9641c
No known key found for this signature in database
GPG Key ID: F1FF5748C4855229
2 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hack/kubernetes_version/update_kubernetes_version.go
View File

@ -43,8 +43,9 @@ import (
"golang.org/x/mod/semver" "golang.org/x/mod/semver"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/golang/glog"
"github.com/google/go-github/v32/github" "github.com/google/go-github/v32/github"
"k8s.io/klog/v2"
) )
const ( const (
@ -128,17 +129,17 @@ func (p *Patch) apply(data interface{}) (changed bool, err error) {
func main() { func main() {
// write log statements to stderr instead of to files // write log statements to stderr instead of to files
if err := flag.Set("logtostderr", "true"); err != nil { if err := flag.Set("logtostderr", "true"); err != nil {
fmt.Printf("Error setting 'logtostderr' glog flag: %v", err) fmt.Printf("Error setting 'logtostderr' klog flag: %v", err)
} }
flag.Parse() flag.Parse()
defer glog.Flush() defer klog.Flush()
if target == "" { if target == "" {
target = "fs" target = "fs"
} else if target != "fs" && target != "gh" && target != "all" { } else if target != "fs" && target != "gh" && target != "all" {
glog.Fatalf("Invalid UPDATE_TARGET option: '%s'; Valid options are: unset/absent (defaults to 'fs'), 'fs', 'gh', or 'all'", target) klog.Fatalf("Invalid UPDATE_TARGET option: '%s'; Valid options are: unset/absent (defaults to 'fs'), 'fs', 'gh', or 'all'", target)
} else if (target == "gh" || target == "all") && ghToken == "" { } else if (target == "gh" || target == "all") && ghToken == "" {
glog.Fatalf("GITHUB_TOKEN is required if UPDATE_TARGET is 'gh' or 'all'") klog.Fatalf("GITHUB_TOKEN is required if UPDATE_TARGET is 'gh' or 'all'")
} }
// set a context with defined timeout // set a context with defined timeout
@ -148,21 +149,21 @@ func main() {
// get Kubernetes versions from GitHub Releases // get Kubernetes versions from GitHub Releases
stable, latest, err := ghReleases(ctx, "kubernetes", "kubernetes", ghToken) stable, latest, err := ghReleases(ctx, "kubernetes", "kubernetes", ghToken)
if err != nil || stable == "" || latest == "" { if err != nil || stable == "" || latest == "" {
glog.Fatalf("Error getting Kubernetes versions: %v", err) klog.Fatalf("Error getting Kubernetes versions: %v", err)
} }
data := Data{K8sStableVersion: stable, K8sLatestVersion: latest} data := Data{K8sStableVersion: stable, K8sLatestVersion: latest}
glog.Infof("Kubernetes versions: 'stable' is %s and 'latest' is %s", data.K8sStableVersion, data.K8sLatestVersion) klog.Infof("Kubernetes versions: 'stable' is %s and 'latest' is %s", data.K8sStableVersion, data.K8sLatestVersion)
glog.Infof("The Plan:\n%s", thePlan(plan, data)) klog.Infof("The Plan:\n%s", thePlan(plan, data))
if target == "fs" || target == "all" { if target == "fs" || target == "all" {
changed, err := fsUpdate(fsRoot, plan, data) changed, err := fsUpdate(fsRoot, plan, data)
if err != nil { if err != nil {
glog.Errorf("Error updating local repo: %v", err) klog.Errorf("Error updating local repo: %v", err)
} else if !changed { } else if !changed {
glog.Infof("Local repo update skipped: nothing changed") klog.Infof("Local repo update skipped: nothing changed")
} else { } else {
glog.Infof("Local repo updated") klog.Infof("Local repo updated")
} }
} }
@ -171,25 +172,25 @@ func main() {
tmpl := template.Must(template.New("prTitle").Parse(prTitle)) tmpl := template.Must(template.New("prTitle").Parse(prTitle))
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
if err := tmpl.Execute(buf, data); err != nil { if err := tmpl.Execute(buf, data); err != nil {
glog.Fatalf("Error parsing PR Title: %v", err) klog.Fatalf("Error parsing PR Title: %v", err)
} }
prTitle = buf.String() prTitle = buf.String()
// check if PR already exists // check if PR already exists
prURL, err := ghFindPR(ctx, prTitle, ghOwner, ghRepo, ghBase, ghToken) prURL, err := ghFindPR(ctx, prTitle, ghOwner, ghRepo, ghBase, ghToken)
if err != nil { if err != nil {
glog.Errorf("Error checking if PR already exists: %v", err) klog.Errorf("Error checking if PR already exists: %v", err)
} else if prURL != "" { } else if prURL != "" {
glog.Infof("PR create skipped: already exists (%s)", prURL) klog.Infof("PR create skipped: already exists (%s)", prURL)
} else { } else {
// create PR // create PR
pr, err := ghCreatePR(ctx, ghOwner, ghRepo, ghBase, prBranchPrefix, prTitle, prIssue, ghToken, plan, data) pr, err := ghCreatePR(ctx, ghOwner, ghRepo, ghBase, prBranchPrefix, prTitle, prIssue, ghToken, plan, data)
if err != nil { if err != nil {
glog.Fatalf("Error creating PR: %v", err) klog.Fatalf("Error creating PR: %v", err)
} else if pr == nil { } else if pr == nil {
glog.Infof("PR create skipped: nothing changed") klog.Infof("PR create skipped: nothing changed")
} else { } else {
glog.Infof("PR created: %s", *pr.HTMLURL) klog.Infof("PR created: %s", *pr.HTMLURL)
} }
} }
} }
@ -288,7 +289,7 @@ func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, is
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating fork commit: %w", err) return nil, fmt.Errorf("error creating fork commit: %w", err)
} }
glog.Infof("PR commit '%s' created: %s", forkCommit.GetSHA(), forkCommit.GetHTMLURL()) klog.Infof("PR commit '%s' created: %s", forkCommit.GetSHA(), forkCommit.GetHTMLURL())
// create PR branch // create PR branch
prBranch := branch + forkCommit.GetSHA()[:7] prBranch := branch + forkCommit.GetSHA()[:7]
@ -302,7 +303,7 @@ func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, is
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating PR branch: %w", err) return nil, fmt.Errorf("error creating PR branch: %w", err)
} }
glog.Infof("PR branch '%s' created: %s", prBranch, prRef.GetURL()) klog.Infof("PR branch '%s' created: %s", prBranch, prRef.GetURL())
// create PR // create PR
modifiable := true modifiable := true
@ -441,7 +442,7 @@ func thePlan(plan map[string]Patch, data Data) (prettyprint string) {
tmpl := template.Must(template.New("").Parse(dst)) tmpl := template.Must(template.New("").Parse(dst))
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
if err := tmpl.Execute(buf, data); err != nil { if err := tmpl.Execute(buf, data); err != nil {
glog.Fatalf("Error parsing the Plan: %v", err) klog.Fatalf("Error parsing the Plan: %v", err)
return fmt.Sprintf("%+v", plan) return fmt.Sprintf("%+v", plan)
} }
p.Replace[src] = buf.String() p.Replace[src] = buf.String()
@ -449,7 +450,7 @@ func thePlan(plan map[string]Patch, data Data) (prettyprint string) {
} }
str, err := json.MarshalIndent(plan, "", " ") str, err := json.MarshalIndent(plan, "", " ")
if err != nil { if err != nil {
glog.Fatalf("Error parsing the Plan: %v", err) klog.Fatalf("Error parsing the Plan: %v", err)
return fmt.Sprintf("%+v", plan) return fmt.Sprintf("%+v", plan)
} }
return string(str) return string(str)

28
hack/update/github.go
View File

@ -23,6 +23,7 @@ import (
"strings" "strings"
"time" "time"
"golang.org/x/mod/semver"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/google/go-github/v32/github" "github.com/google/go-github/v32/github"
@ -220,7 +221,7 @@ func ghClient(ctx context.Context, token string) *github.Client {
return github.NewClient(tc) return github.NewClient(tc)
} }
// GHVersions returns current stable release and latest rc or beta pre-release // GHVersions returns greatest current stable release and greatest latest rc or beta pre-release
// from GitHub owner/repo repository, and any error; // from GitHub owner/repo repository, and any error;
// if latest pre-release version is lower than current stable release, then it // if latest pre-release version is lower than current stable release, then it
// will return current stable release for both // will return current stable release for both
@ -236,27 +237,20 @@ func GHVersions(ctx context.Context, owner, repo string) (stable, latest string,
} }
for _, rl := range rls { for _, rl := range rls {
ver := rl.GetName() ver := rl.GetName()
if ver == "" { if !semver.IsValid(ver) {
continue continue
} }
// check if ver version is a release (ie, 'v1.19.2') or a // check if ver version is release (ie, 'v1.19.2') or pre-release (ie, 'v1.19.3-rc.0' or 'v1.19.0-beta.2')
// pre-release (ie, 'v1.19.3-rc.0' or 'v1.19.0-beta.2') channel ch prerls := semver.Prerelease(ver)
// note: github.RepositoryRelease GetPrerelease() bool would be useful for all pre-rels if prerls == "" {
ch := strings.Split(ver, "-") stable = semver.Max(ver, stable)
if len(ch) == 1 && stable == "" { } else if strings.HasPrefix(prerls, "-rc") || strings.HasPrefix(prerls, "-beta") {
stable = ver latest = semver.Max(ver, latest)
} else if len(ch) > 1 && latest == "" {
if strings.HasPrefix(ch[1], "rc") || strings.HasPrefix(ch[1], "beta") {
latest = ver
} }
} // make sure that latest >= stable
if stable != "" && latest != "" { if semver.Compare(latest, stable) == -1 {
// make sure that v.Latest >= stable
if latest < stable {
latest = stable latest = stable
} }
return stable, latest, nil
}
} }
if resp.NextPage == 0 { if resp.NextPage == 0 {
break break