diff --git a/tools/rebasehelpers/commitchecker/validate.go b/tools/rebasehelpers/commitchecker/validate.go
index 66c981d56823..cf7518704a0b 100644
--- a/tools/rebasehelpers/commitchecker/validate.go
+++ b/tools/rebasehelpers/commitchecker/validate.go
@@ -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:
@@ -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,
}
diff --git a/tools/rebasehelpers/commitchecker/validate_test.go b/tools/rebasehelpers/commitchecker/validate_test.go
index d82dc36832c3..812fcb722bd1 100644
--- a/tools/rebasehelpers/commitchecker/validate_test.go
+++ b/tools/rebasehelpers/commitchecker/validate_test.go
@@ -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)
- }
- }
+ })
}
}
@@ -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",
@@ -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",
@@ -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",
diff --git a/tools/rebasehelpers/util/git.go b/tools/rebasehelpers/util/git.go
index f1c6bc06829d..42d3f77b7c05 100644
--- a/tools/rebasehelpers/util/git.go
+++ b/tools/rebasehelpers/util/git.go
@@ -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
diff --git a/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh b/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
index 91f08751d679..bb8c63d74116 100755
--- a/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
+++ b/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
@@ -5335,6 +5335,9 @@ runTests() {
kube::test::get_object_assert 'clusterrolebindings -l test-cmd=auth' "{{range.items}}{{$id_field}}:{{end}}" 'testing-CRB:'
kube::test::get_object_assert 'clusterroles -l test-cmd=auth' "{{range.items}}{{$id_field}}:{{end}}" 'testing-CR:'
+ failure_message=$(! kubectl auth reconcile "${kube_flags[@]}" -f test/fixtures/pkg/kubectl/cmd/auth/rbac-v1beta1.yaml 2>&1 )
+ kube::test::if_has_string "${failure_message}" 'only rbac.authorization.k8s.io/v1 is supported'
+
kubectl delete "${kube_flags[@]}" rolebindings,role,clusterroles,clusterrolebindings -n some-other-random -l test-cmd=auth
fi
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go
index f4e84e31e84b..a30fb101ed83 100644
--- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go
+++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go
@@ -23,9 +23,10 @@ import (
"github.com/spf13/cobra"
rbacv1 "k8s.io/api/rbac/v1"
+ rbacv1beta1 "k8s.io/api/rbac/v1beta1"
+ rbacv1alpha1 "k8s.io/api/rbac/v1alpha1"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
rbacv1client "k8s.io/client-go/kubernetes/typed/rbac/v1"
- "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
@@ -33,6 +34,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/registry/rbac/reconciliation"
+ "fmt"
)
// ReconcileOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of
@@ -106,7 +108,7 @@ func (o *ReconcileOptions) Complete(cmd *cobra.Command, f cmdutil.Factory, args
}
r := f.NewBuilder().
- WithScheme(legacyscheme.Scheme).
+ WithScheme(scheme.Scheme, scheme.Scheme.PrioritizedVersionsAllGroups()...).
ContinueOnError().
NamespaceParam(namespace).DefaultNamespace().
FilenameParam(enforceNamespace, o.FilenameOptions).
@@ -171,14 +173,7 @@ func (o *ReconcileOptions) RunReconcile() error {
return err
}
- obj, err := legacyscheme.Scheme.ConvertToVersion(info.Object, rbacv1.SchemeGroupVersion)
- if err != nil {
- glog.V(1).Infof("skipping %#v", info.Object.GetObjectKind())
- // skip ignored resources
- return nil
- }
-
- switch t := obj.(type) {
+ switch t := info.Object.(type) {
case *rbacv1.Role:
reconcileOptions := reconciliation.ReconcileRoleOptions{
Confirm: !o.DryRun,
@@ -241,6 +236,16 @@ func (o *ReconcileOptions) RunReconcile() error {
}
o.PrintObject(result.RoleBinding.GetObject(), o.Out)
+ case *rbacv1beta1.Role,
+ *rbacv1beta1.RoleBinding,
+ *rbacv1beta1.ClusterRole,
+ *rbacv1beta1.ClusterRoleBinding,
+ *rbacv1alpha1.Role,
+ *rbacv1alpha1.RoleBinding,
+ *rbacv1alpha1.ClusterRole,
+ *rbacv1alpha1.ClusterRoleBinding:
+ return fmt.Errorf("only rbac.authorization.k8s.io/v1 is supported: not %T", t)
+
default:
glog.V(1).Infof("skipping %#v", info.Object.GetObjectKind())
// skip ignored resources
diff --git a/vendor/k8s.io/kubernetes/test/fixtures/pkg/kubectl/cmd/auth/rbac-v1beta1.yaml b/vendor/k8s.io/kubernetes/test/fixtures/pkg/kubectl/cmd/auth/rbac-v1beta1.yaml
new file mode 100644
index 000000000000..2fb1f1fbbae0
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/test/fixtures/pkg/kubectl/cmd/auth/rbac-v1beta1.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+items:
+- apiVersion: rbac.authorization.k8s.io/v1beta1
+ kind: ClusterRole
+ metadata:
+ labels:
+ test-cmd: auth
+ name: testing-CR
+ rules:
+ - apiGroups:
+ - ""
+ resources:
+ - pods
+ verbs:
+ - create
+ - delete
+ - deletecollection
+ - get
+ - list
+ - patch
+ - update
+ - watch
+
+kind: List
+metadata: {}