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

Merge pull request #94685 from verb/ec-admission

Browse Source 
Convert to EphemeralContainers for validation in EphemeralContainersREST
This commit is contained in:
Kubernetes Prow Robot 2020-09-30 00:29:25 -07:00 committed by GitHub
commit def8fe3b4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/registry/core/pod/storage/storage.go
View File

@ -346,13 +346,26 @@ func (r *EphemeralContainersREST) Update(ctx context.Context, name string, objIn
return newPod, nil return newPod, nil
}) })
obj, _, err = r.store.Update(ctx, name, updatedPodInfo, createValidation, updateValidation, false, options) // Validation should be passed the API kind (EphemeralContainers) rather than the storage kind.
obj, _, err = r.store.Update(ctx, name, updatedPodInfo, toEphemeralContainersCreateValidation(createValidation), toEphemeralContainersUpdateValidation(updateValidation), false, options)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
return ephemeralContainersInPod(obj.(*api.Pod)), false, err return ephemeralContainersInPod(obj.(*api.Pod)), false, err
} }
func toEphemeralContainersCreateValidation(f rest.ValidateObjectFunc) rest.ValidateObjectFunc {
return func(ctx context.Context, obj runtime.Object) error {
return f(ctx, ephemeralContainersInPod(obj.(*api.Pod)))
}
}
func toEphemeralContainersUpdateValidation(f rest.ValidateObjectUpdateFunc) rest.ValidateObjectUpdateFunc {
return func(ctx context.Context, obj, old runtime.Object) error {
return f(ctx, ephemeralContainersInPod(obj.(*api.Pod)), ephemeralContainersInPod(old.(*api.Pod)))
}
}
// Extract the list of Ephemeral Containers from a Pod // Extract the list of Ephemeral Containers from a Pod
func ephemeralContainersInPod(pod *api.Pod) *api.EphemeralContainers { func ephemeralContainersInPod(pod *api.Pod) *api.EphemeralContainers {
ephemeralContainers := pod.Spec.EphemeralContainers ephemeralContainers := pod.Spec.EphemeralContainers

2
test/integration/apiserver/admissionwebhook/admission_test.go
View File

@ -480,6 +480,8 @@ func testWebhookAdmission(t *testing.T, watchCache bool) {
"--disable-admission-plugins=ServiceAccount,StorageObjectInUseProtection", "--disable-admission-plugins=ServiceAccount,StorageObjectInUseProtection",
// force enable all resources so we can check storage. // force enable all resources so we can check storage.
"--runtime-config=api/all=true", "--runtime-config=api/all=true",
// enable feature-gates that protect resources to check their storage, too.
"--feature-gates=EphemeralContainers=true",
}, etcdConfig) }, etcdConfig)
defer server.TearDownFn() defer server.TearDownFn()