Skip to content
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

Jump to bottom

Collapse back to upstream reconcile command #20177

Merged
merged 3 commits into from
Jul 11, 2018
Merged

Collapse back to upstream reconcile command #20177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e5da13
UPSTREAM: revert: <drop>: make auth reconcile work with backlevel ver…
deads2k Jul 2, 2018
b10515a
UPSTREAM: 65715: fail on rbac resources of non-v1 versions in reconcile
deads2k Jul 5, 2018
a9b4aee
simplify vendor commit checker
deads2k Jul 10, 2018
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
10 changes: 3 additions & 7 deletions tools/rebasehelpers/commitchecker/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ The following UPSTREAM commits have invalid summaries:
{{ end }}
UPSTREAM commit summaries should look like:

UPSTREAM: [non-kube-repo/name: ]<PR number|carry|drop>: description
UPSTREAM: <PR number|carry|drop>: description

UPSTREAM commits which revert previous UPSTREAM commits should look like:

UPSTREAM: revert: <sha>: <normal upstream format>
UPSTREAM: revert: <normal upstream format>

UPSTREAM commits are validated against the following regular expression:

Expand All @@ -31,20 +31,16 @@ UPSTREAM commits are validated against the following regular expression:
Examples of valid summaries:

UPSTREAM: 12345: A kube fix
UPSTREAM: coreos/etcd: 12345: An etcd fix
UPSTREAM: <carry>: A carried kube change
UPSTREAM: <drop>: A dropped kube change
UPSTREAM: revert: abcd123: coreos/etcd: 12345: An etcd fix
UPSTREAM: k8s.io/heapster: 12345: A heapster fix
UPSTREAM: revert: 12345: A kube revert

`

var AllValidators = []func([]util.Commit) error{
ValidateUpstreamCommitSummaries,
ValidateUpstreamCommitsWithoutGodepsChanges,
ValidateUpstreamCommitModifiesSingleGodepsRepo,
ValidateUpstreamCommitModifiesOnlyGodeps,
ValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo,
ValidateUpstreamCommitModifiesOnlyKubernetes,
}

Expand Down
42 changes: 22 additions & 20 deletions tools/rebasehelpers/commitchecker/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,29 +296,31 @@ func TestValidateUpstreamCommitSummaries(t *testing.T) {
{valid: true, summary: "UPSTREAM: <drop>: a change"},
{valid: true, summary: "UPSTREAM: coreos/etcd: <carry>: a change"},
{valid: true, summary: "UPSTREAM: coreos/etcd: <drop>: a change"},
{valid: true, summary: "UPSTREAM: revert: abcd123: 12345: a change"},
{valid: true, summary: "UPSTREAM: revert: abcd123: k8s.io/heapster: 12345: a change"},
{valid: true, summary: "UPSTREAM: revert: abcd123: <carry>: a change"},
{valid: true, summary: "UPSTREAM: revert: abcd123: <drop>: a change"},
{valid: true, summary: "UPSTREAM: revert: abcd123: coreos/etcd: <carry>: a change"},
{valid: true, summary: "UPSTREAM: revert: abcd123: coreos/etcd: <drop>: a change"},
{valid: true, summary: "UPSTREAM: revert: 12345: a change"},
{valid: true, summary: "UPSTREAM: revert: k8s.io/heapster: 12345: a change"},
{valid: true, summary: "UPSTREAM: revert: <carry>: a change"},
{valid: true, summary: "UPSTREAM: revert: <drop>: a change"},
{valid: true, summary: "UPSTREAM: revert: coreos/etcd: <carry>: a change"},
{valid: true, summary: "UPSTREAM: revert: coreos/etcd: <drop>: a change"},
{valid: false, summary: "UPSTREAM: whoopsie daisy"},
{valid: true, summary: "UPSTREAM: gopkg.in/ldap.v2: 51: exposed better API for paged search"},
}
for _, test := range tests {
commit := util.Commit{Summary: test.summary, Sha: "abcd000"}
err := ValidateUpstreamCommitSummaries([]util.Commit{commit})
if err != nil {
if test.valid {
t.Fatalf("unexpected error:\n%s", err)
t.Run(test.summary, func(t *testing.T) {
commit := util.Commit{Summary: test.summary, Sha: "abcd000"}
err := ValidateUpstreamCommitSummaries([]util.Commit{commit})
if err != nil {
if test.valid {
t.Fatalf("unexpected error:\n%s", err)
} else {
t.Logf("got expected error:\n%s", err)
}
} else {
t.Logf("got expected error:\n%s", err)
if !test.valid {
t.Fatalf("expected an error, got none; summary: %s", test.summary)
}
}
} else {
if !test.valid {
t.Fatalf("expected an error, got none; summary: %s", test.summary)
}
}
})
}
}

Expand Down Expand Up @@ -409,7 +411,7 @@ func TestValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo(t *testing.T) {
commits: []util.Commit{
{
Sha: "aaa0001",
Summary: "UPSTREAM: revert: abcd000: 12345: a change",
Summary: "UPSTREAM: revert: 12345: a change",
Files: []util.File{
"Godeps/_workspace/src/k8s.io/kubernetes/file1",
"Godeps/_workspace/src/k8s.io/kubernetes/file2",
Expand All @@ -423,7 +425,7 @@ func TestValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo(t *testing.T) {
commits: []util.Commit{
{
Sha: "aaa0001",
Summary: "UPSTREAM: revert: abcd000: coreos/etcd: 12345: a change",
Summary: "UPSTREAM: revert: coreos/etcd: 12345: a change",
Files: []util.File{
"Godeps/_workspace/src/k8s.io/kubernetes/file1",
"Godeps/_workspace/src/k8s.io/kubernetes/file2",
Expand All @@ -437,7 +439,7 @@ func TestValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo(t *testing.T) {
commits: []util.Commit{
{
Sha: "aaa0001",
Summary: "UPSTREAM: revert: abcd000: coreos/etcd: 12345: a change",
Summary: "UPSTREAM: revert: coreos/etcd: 12345: a change",
Files: []util.File{
"Godeps/_workspace/src/github.com/coreos/etcd/file1",
"Godeps/_workspace/src/github.com/coreos/etcd/file2",
Expand Down
2 changes: 1 addition & 1 deletion tools/rebasehelpers/util/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
)

var UpstreamSummaryPattern = regexp.MustCompile(`UPSTREAM: (revert: [a-f0-9]{7,}: )?(([\w\.-]+\/[\w-\.-]+)?: )?(\d+:|<carry>:|<drop>:)`)
var UpstreamSummaryPattern = regexp.MustCompile(`UPSTREAM: (revert: )?(([\w\.-]+\/[\w-\.-]+)?: )?(\d+:|<carry>:|<drop>:)`)

// supportedHosts maps source hosts to the number of path segments that
// represent the account/repo for that host. This is necessary because we
Expand Down
3 changes: 3 additions & 0 deletions vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 15 additions & 10 deletions vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions vendor/k8s.io/kubernetes/test/fixtures/pkg/kubectl/cmd/auth/rbac-v1beta1.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.