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

fix wrongly reported "nothing changed" 

when there are changes that has been made in the local filesystem repo
and make the issue mentioned in the PR message ("fixes: ") a parameter
pull/9384/head
Predrag Rogic 2020-10-04 01:25:27 +01:00
parent 61a579a8f9
commit 5ba07d547b
No known key found for this signature in database
GPG Key ID: F1FF5748C4855229
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hack/kubernetes_version/update_kubernetes_version.go
View File

@ -87,6 +87,7 @@ var (
// PR data
prBranchPrefix = "update-kubernetes-version_" // will be appended with first 7 characters of the PR commit SHA
prTitle = `update_kubernetes_version: {stable:"{{.K8sStableVersion}}", latest:"{{.K8sLatestVersion}}"}`
prIssue = 4392
prSearchLimit = 100 // limit the number of previous PRs searched for same prTitle to be <= N * ghListOptionsPerPage
)
@ -183,7 +184,7 @@ func main() {
klog.Infof("PR create skipped: already exists (%s)", prURL)
} else {
// create PR
pr, err := ghCreatePR(ctx, ghOwner, ghRepo, ghBase, prBranchPrefix, prTitle, ghToken, plan, data)
pr, err := ghCreatePR(ctx, ghOwner, ghRepo, ghBase, prBranchPrefix, prTitle, prIssue, ghToken, plan, data)
if err != nil {
klog.Fatalf("Error creating PR: %v", err)
} else if pr == nil {
@ -209,10 +210,13 @@ func fsUpdate(fsRoot string, plan map[string]Patch, data Data) (changed bool, er
mode := info.Mode()
p.Content = blob
changed, err = p.apply(data)
chg, err := p.apply(data)
if err != nil {
return false, err
}
if chg {
changed = true
}
if err := ioutil.WriteFile(path, p.Content, mode); err != nil {
return false, err
}
@ -220,7 +224,7 @@ func fsUpdate(fsRoot string, plan map[string]Patch, data Data) (changed bool, er
return changed, nil
}
func ghCreatePR(ctx context.Context, owner, repo, base, branch, title, token string, plan map[string]Patch, data Data) (*github.PullRequest, error) {
func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, issue int, token string, plan map[string]Patch, data Data) (*github.PullRequest, error) {
ghc := ghClient(ctx, token)
// get base branch
@ -296,7 +300,6 @@ func ghCreatePR(ctx context.Context, owner, repo, base, branch, title, token str
klog.Infof("PR branch '%s' created: %s", prBranch, prRef.GetURL())
// create PR
issue := 4392
modifiable := true
pr, _, err := ghc.PullRequests.Create(ctx, owner, repo, &github.NewPullRequest{
Title: github.String(title),