github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

admission: { -> Mutating}Admit(admission.Attributes)

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-10-23 14:26:38 +02:00
parent 02e16cb253
commit 970d2553cc
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/admission/initialresources/admission_test.go
View File

@ -110,7 +110,7 @@ func expectNoAnnotation(t *testing.T, pod *api.Pod) {
}
}
func admit(t *testing.T, ir admission.Interface, pods []*api.Pod) {
func admit(t *testing.T, ir admission.MutationInterface, pods []*api.Pod) {
for i := range pods {
p := pods[i]
@ -123,7 +123,7 @@ func admit(t *testing.T, ir admission.Interface, pods []*api.Pod) {
}
}
func testAdminScenarios(t *testing.T, ir admission.Interface, p *api.Pod) {
func testAdminScenarios(t *testing.T, ir admission.MutationInterface, p *api.Pod) {
podKind := api.Kind("Pod").WithVersion("version")
podRes := api.Resource("pods").WithVersion("version")
@ -151,7 +151,7 @@ func testAdminScenarios(t *testing.T, ir admission.Interface, p *api.Pod) {
}
}
func performTest(t *testing.T, ir admission.Interface) {
func performTest(t *testing.T, ir admission.MutationInterface) {
pods := getPods()
admit(t, ir, pods)
testAdminScenarios(t, ir, pods[0])

2
plugin/pkg/admission/namespace/autoprovision/admission_test.go
View File

@ -35,7 +35,7 @@ import (
)
// newHandlerForTest returns the admission controller configured for testing.
func newHandlerForTest(c clientset.Interface) (admission.Interface, informers.SharedInformerFactory, error) {
func newHandlerForTest(c clientset.Interface) (admission.MutationInterface, informers.SharedInformerFactory, error) {
f := informers.NewSharedInformerFactory(c, 5*time.Minute)
handler := NewProvision()
pluginInitializer := kubeadmission.NewPluginInitializer(c, f, nil, nil, nil, nil, nil)

4
staging/src/k8s.io/apiserver/pkg/admission/interfaces.go
View File

@ -63,8 +63,8 @@ type Interface interface {
// ValidationInterface is an abstract, pluggable interface for Admission Control decisions.
type ValidationInterface interface {
// Validate makes an admission decision based on the request attributes. It is NOT allowed to mutate
Validate(a Attributes) (err error)
// ValidatingAdmit makes an admission decision based on the request attributes. It is NOT allowed to mutate
ValidatingAdmit(a Attributes) (err error)
// Handles returns true if this admission controller can handle the given operation
// where operation can be one of CREATE, UPDATE, DELETE, or CONNECT

4
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go
View File

@ -106,7 +106,7 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope RequestSco
if validatingAdmission != nil && validatingAdmission.Handles(admission.Delete) {
userInfo, _ := request.UserFrom(ctx)
err = validatingAdmission.Validate(admission.NewAttributesRecord(nil, nil, scope.Kind, namespace, name, scope.Resource, scope.Subresource, admission.Delete, userInfo))
err = validatingAdmission.ValidatingAdmit(admission.NewAttributesRecord(nil, nil, scope.Kind, namespace, name, scope.Resource, scope.Subresource, admission.Delete, userInfo))
if err != nil {
scope.err(err, w, req)
return
@ -193,7 +193,7 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco
if validatingAdmission != nil && validatingAdmission.Handles(admission.Delete) {
userInfo, _ := request.UserFrom(ctx)
err = validatingAdmission.Validate(admission.NewAttributesRecord(nil, nil, scope.Kind, namespace, "", scope.Resource, scope.Subresource, admission.Delete, userInfo))
err = validatingAdmission.ValidatingAdmit(admission.NewAttributesRecord(nil, nil, scope.Kind, namespace, "", scope.Resource, scope.Subresource, admission.Delete, userInfo))
if err != nil {
scope.err(err, w, req)
return