github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Tolerate a Forbidden error in e2e RBAC RoleBinding setup.

Browse Source
This commit is contained in:
CJ Cullen 2016-12-27 19:41:55 -08:00
parent c3771cbaf9
commit 345d652598
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/ingress.go
View File

@ -21,6 +21,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
apierrors "k8s.io/kubernetes/pkg/api/errors"
legacyv1 "k8s.io/kubernetes/pkg/api/v1" legacyv1 "k8s.io/kubernetes/pkg/api/v1"
rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
"k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/schema"
@ -94,6 +95,13 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() {
}, },
}, },
}) })
if apierrors.IsForbidden(err) {
// The user is not allowed to create ClusterRoleBindings. This
// probably means that RBAC is not being used. If RBAC is being
// used, this test will probably fail later.
framework.Logf("Attempt to create ClusterRoleBinding was forbidden: %v.", err)
return
}
framework.ExpectNoError(err) framework.ExpectNoError(err)
err = framework.WaitForAuthorizationUpdate(jig.client.Authorization(), err = framework.WaitForAuthorizationUpdate(jig.client.Authorization(),

8
test/e2e/node_problem_detector.go
View File

@ -23,6 +23,7 @@ import (
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apierrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
legacyv1 "k8s.io/kubernetes/pkg/api/v1" legacyv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
@ -81,6 +82,13 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
}, },
}, },
}) })
if apierrors.IsForbidden(err) {
// The user is not allowed to create ClusterRoleBindings. This
// probably means that RBAC is not being used. If RBAC is being
// used, this test will probably fail later.
framework.Logf("Attempt to create ClusterRoleBinding was forbidden: %v.", err)
return
}
framework.ExpectNoError(err) framework.ExpectNoError(err)
err = framework.WaitForAuthorizationUpdate(f.ClientSet.Authorization(), err = framework.WaitForAuthorizationUpdate(f.ClientSet.Authorization(),

8
test/e2e/pre_stop.go
View File

@ -21,6 +21,7 @@ import (
"fmt" "fmt"
"time" "time"
apierrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
legacyv1 "k8s.io/kubernetes/pkg/api/v1" legacyv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
@ -187,6 +188,13 @@ var _ = framework.KubeDescribe("PreStop", func() {
}, },
}, },
}) })
if apierrors.IsForbidden(err) {
// The user is not allowed to create ClusterRoleBindings. This
// probably means that RBAC is not being used. If RBAC is being
// used, this test will probably fail later.
framework.Logf("Attempt to create ClusterRoleBinding was forbidden: %v.", err)
return
}
framework.ExpectNoError(err) framework.ExpectNoError(err)
err = framework.WaitForAuthorizationUpdate(f.ClientSet.Authorization(), err = framework.WaitForAuthorizationUpdate(f.ClientSet.Authorization(),