Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d9a4cfc0
Commit
d9a4cfc0
authored
Dec 15, 2016
by
deads2k
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix e2e tests which use SAs for permissions
parent
19391164
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
155 additions
and
0 deletions
+155
-0
BUILD
test/e2e/BUILD
+2
-0
BUILD
test/e2e/framework/BUILD
+3
-0
authorizer_util.go
test/e2e/framework/authorizer_util.go
+58
-0
ingress.go
test/e2e/ingress.go
+30
-0
node_problem_detector.go
test/e2e/node_problem_detector.go
+30
-0
pre_stop.go
test/e2e/pre_stop.go
+32
-0
No files found.
test/e2e/BUILD
View file @
d9a4cfc0
...
@@ -128,6 +128,7 @@ go_library(
...
@@ -128,6 +128,7 @@ go_library(
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/apis/rbac/v1alpha1:go_default_library",
"//pkg/apis/storage/util:go_default_library",
"//pkg/apis/storage/util:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/apis/storage/v1beta1/util:go_default_library",
"//pkg/apis/storage/v1beta1/util:go_default_library",
...
@@ -163,6 +164,7 @@ go_library(
...
@@ -163,6 +164,7 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/security/apparmor:go_default_library",
"//pkg/security/apparmor:go_default_library",
"//pkg/serviceaccount:go_default_library",
"//pkg/types:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/exec:go_default_library",
...
...
test/e2e/framework/BUILD
View file @
d9a4cfc0
...
@@ -10,6 +10,7 @@ load(
...
@@ -10,6 +10,7 @@ load(
go_library(
go_library(
name = "go_default_library",
name = "go_default_library",
srcs = [
srcs = [
"authorizer_util.go",
"cleanup.go",
"cleanup.go",
"exec_util.go",
"exec_util.go",
"federation_util.go",
"federation_util.go",
...
@@ -38,6 +39,7 @@ go_library(
...
@@ -38,6 +39,7 @@ go_library(
"//pkg/api/validation:go_default_library",
"//pkg/api/validation:go_default_library",
"//pkg/apimachinery/registered:go_default_library",
"//pkg/apimachinery/registered:go_default_library",
"//pkg/apis/apps/v1beta1:go_default_library",
"//pkg/apis/apps/v1beta1:go_default_library",
"//pkg/apis/authorization/v1beta1:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/apis/batch/v1:go_default_library",
"//pkg/apis/batch/v1:go_default_library",
"//pkg/apis/componentconfig:go_default_library",
"//pkg/apis/componentconfig:go_default_library",
...
@@ -46,6 +48,7 @@ go_library(
...
@@ -46,6 +48,7 @@ go_library(
"//pkg/apis/meta/v1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/apis/meta/v1/unstructured:go_default_library",
"//pkg/apis/meta/v1/unstructured:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/authorization/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/client/conditions:go_default_library",
"//pkg/client/conditions:go_default_library",
...
...
test/e2e/framework/authorizer_util.go
0 → 100644
View file @
d9a4cfc0
/*
Copyright 2016 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
framework
import
(
"time"
authorizationv1beta1
"k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
v1beta1authorization
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/util/wait"
)
const
(
policyCachePollInterval
=
100
*
time
.
Millisecond
policyCachePollTimeout
=
5
*
time
.
Second
)
// WaitForAuthorizationUpdate checks if the given user can perform the named verb and action.
// If policyCachePollTimeout is reached without the expected condition matching, an error is returned
func
WaitForAuthorizationUpdate
(
c
v1beta1authorization
.
SubjectAccessReviewsGetter
,
user
,
namespace
,
verb
string
,
resource
schema
.
GroupResource
,
allowed
bool
)
error
{
review
:=
&
authorizationv1beta1
.
SubjectAccessReview
{
Spec
:
authorizationv1beta1
.
SubjectAccessReviewSpec
{
ResourceAttributes
:
&
authorizationv1beta1
.
ResourceAttributes
{
Group
:
resource
.
Group
,
Verb
:
verb
,
Resource
:
resource
.
Resource
,
Namespace
:
namespace
,
},
User
:
user
,
},
}
err
:=
wait
.
Poll
(
policyCachePollInterval
,
policyCachePollTimeout
,
func
()
(
bool
,
error
)
{
response
,
err
:=
c
.
SubjectAccessReviews
()
.
Create
(
review
)
if
err
!=
nil
{
return
false
,
err
}
if
response
.
Status
.
Allowed
!=
allowed
{
return
false
,
nil
}
return
true
,
nil
})
return
err
}
test/e2e/ingress.go
View file @
d9a4cfc0
...
@@ -21,6 +21,10 @@ import (
...
@@ -21,6 +21,10 @@ import (
"path/filepath"
"path/filepath"
"time"
"time"
legacyv1
"k8s.io/kubernetes/pkg/api/v1"
rbacv1alpha1
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/ginkgo"
...
@@ -70,6 +74,32 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() {
...
@@ -70,6 +74,32 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() {
f
.
BeforeEach
()
f
.
BeforeEach
()
jig
=
newTestJig
(
f
.
ClientSet
)
jig
=
newTestJig
(
f
.
ClientSet
)
ns
=
f
.
Namespace
.
Name
ns
=
f
.
Namespace
.
Name
// this test wants powerful permissions. Since the namespace names are unique, we can leave this
// lying around so we don't have to race any caches
_
,
err
:=
jig
.
client
.
Rbac
()
.
ClusterRoleBindings
()
.
Create
(
&
rbacv1alpha1
.
ClusterRoleBinding
{
ObjectMeta
:
legacyv1
.
ObjectMeta
{
Name
:
f
.
Namespace
.
Name
+
"--cluster-admin"
,
},
RoleRef
:
rbacv1alpha1
.
RoleRef
{
APIGroup
:
"rbac.authorization.k8s.io"
,
Kind
:
"ClusterRole"
,
Name
:
"cluster-admin"
,
},
Subjects
:
[]
rbacv1alpha1
.
Subject
{
{
Kind
:
rbacv1alpha1
.
ServiceAccountKind
,
Namespace
:
f
.
Namespace
.
Name
,
Name
:
"default"
,
},
},
})
framework
.
ExpectNoError
(
err
)
err
=
framework
.
WaitForAuthorizationUpdate
(
jig
.
client
.
Authorization
(),
serviceaccount
.
MakeUsername
(
f
.
Namespace
.
Name
,
"default"
),
""
,
"create"
,
schema
.
GroupResource
{
Resource
:
"pods"
},
true
)
framework
.
ExpectNoError
(
err
)
})
})
// Before enabling this loadbalancer test in any other test list you must
// Before enabling this loadbalancer test in any other test list you must
...
...
test/e2e/node_problem_detector.go
View file @
d9a4cfc0
...
@@ -24,11 +24,15 @@ import (
...
@@ -24,11 +24,15 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"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"
rbacv1alpha1
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
clientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
clientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
coreclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
coreclientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/pkg/util/system"
"k8s.io/kubernetes/pkg/util/system"
"k8s.io/kubernetes/pkg/util/uuid"
"k8s.io/kubernetes/pkg/util/uuid"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework"
...
@@ -57,6 +61,32 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
...
@@ -57,6 +61,32 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
configName
=
"node-problem-detector-config-"
+
uid
configName
=
"node-problem-detector-config-"
+
uid
// There is no namespace for Node, event recorder will set default namespace for node events.
// There is no namespace for Node, event recorder will set default namespace for node events.
eventNamespace
=
v1
.
NamespaceDefault
eventNamespace
=
v1
.
NamespaceDefault
// this test wants extra permissions. Since the namespace names are unique, we can leave this
// lying around so we don't have to race any caches
_
,
err
:=
f
.
ClientSet
.
Rbac
()
.
ClusterRoleBindings
()
.
Create
(
&
rbacv1alpha1
.
ClusterRoleBinding
{
ObjectMeta
:
legacyv1
.
ObjectMeta
{
Name
:
f
.
Namespace
.
Name
+
"--cluster-admin"
,
},
RoleRef
:
rbacv1alpha1
.
RoleRef
{
APIGroup
:
"rbac.authorization.k8s.io"
,
Kind
:
"ClusterRole"
,
Name
:
"cluster-admin"
,
},
Subjects
:
[]
rbacv1alpha1
.
Subject
{
{
Kind
:
rbacv1alpha1
.
ServiceAccountKind
,
Namespace
:
f
.
Namespace
.
Name
,
Name
:
"default"
,
},
},
})
framework
.
ExpectNoError
(
err
)
err
=
framework
.
WaitForAuthorizationUpdate
(
f
.
ClientSet
.
Authorization
(),
serviceaccount
.
MakeUsername
(
f
.
Namespace
.
Name
,
"default"
),
""
,
"create"
,
schema
.
GroupResource
{
Resource
:
"pods"
},
true
)
framework
.
ExpectNoError
(
err
)
})
})
// Test kernel monitor. We may add other tests if we have more problem daemons in the future.
// Test kernel monitor. We may add other tests if we have more problem daemons in the future.
...
...
test/e2e/pre_stop.go
View file @
d9a4cfc0
...
@@ -22,8 +22,12 @@ import (
...
@@ -22,8 +22,12 @@ import (
"time"
"time"
"k8s.io/kubernetes/pkg/api/v1"
"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"
rbacv1alpha1
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
clientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
clientset
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/serviceaccount"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework"
...
@@ -163,6 +167,34 @@ func testPreStop(c clientset.Interface, ns string) {
...
@@ -163,6 +167,34 @@ func testPreStop(c clientset.Interface, ns string) {
var
_
=
framework
.
KubeDescribe
(
"PreStop"
,
func
()
{
var
_
=
framework
.
KubeDescribe
(
"PreStop"
,
func
()
{
f
:=
framework
.
NewDefaultFramework
(
"prestop"
)
f
:=
framework
.
NewDefaultFramework
(
"prestop"
)
BeforeEach
(
func
()
{
// this test wants extra permissions. Since the namespace names are unique, we can leave this
// lying around so we don't have to race any caches
_
,
err
:=
f
.
ClientSet
.
Rbac
()
.
ClusterRoleBindings
()
.
Create
(
&
rbacv1alpha1
.
ClusterRoleBinding
{
ObjectMeta
:
legacyv1
.
ObjectMeta
{
Name
:
f
.
Namespace
.
Name
+
"--cluster-admin"
,
},
RoleRef
:
rbacv1alpha1
.
RoleRef
{
APIGroup
:
"rbac.authorization.k8s.io"
,
Kind
:
"ClusterRole"
,
Name
:
"cluster-admin"
,
},
Subjects
:
[]
rbacv1alpha1
.
Subject
{
{
Kind
:
rbacv1alpha1
.
ServiceAccountKind
,
Namespace
:
f
.
Namespace
.
Name
,
Name
:
"default"
,
},
},
})
framework
.
ExpectNoError
(
err
)
err
=
framework
.
WaitForAuthorizationUpdate
(
f
.
ClientSet
.
Authorization
(),
serviceaccount
.
MakeUsername
(
f
.
Namespace
.
Name
,
"default"
),
""
,
"create"
,
schema
.
GroupResource
{
Resource
:
"pods"
},
true
)
framework
.
ExpectNoError
(
err
)
})
It
(
"should call prestop when killing a pod [Conformance]"
,
func
()
{
It
(
"should call prestop when killing a pod [Conformance]"
,
func
()
{
testPreStop
(
f
.
ClientSet
,
f
.
Namespace
.
Name
)
testPreStop
(
f
.
ClientSet
,
f
.
Namespace
.
Name
)
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment