mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Allow delete with grace period 1s even if metadata period is negative
This commit is contained in:
Shiming Zhang
parent
45ce2dfacc
commit
a8d4cfac93
@ -27,6 +27,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/apiserver/pkg/admission"
|
||||
utilpointer "k8s.io/utils/pointer"
|
||||
)
|
||||
|
||||
// RESTDeleteStrategy defines deletion behavior on an object that follows Kubernetes
|
||||
@ -86,6 +87,15 @@ func BeforeDelete(strategy RESTDeleteStrategy, ctx context.Context, obj runtime.
|
||||
return false, false, errors.NewConflict(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, objectMeta.GetName(), fmt.Errorf("the ResourceVersion in the precondition (%s) does not match the ResourceVersion in record (%s). The object might have been modified", *options.Preconditions.ResourceVersion, objectMeta.GetResourceVersion()))
|
||||
}
|
||||
}
|
||||
|
||||
// Negative values will be treated as the value `1s` on the delete path.
|
||||
if gracePeriodSeconds := options.GracePeriodSeconds; gracePeriodSeconds != nil && *gracePeriodSeconds < 0 {
|
||||
options.GracePeriodSeconds = utilpointer.Int64(1)
|
||||
}
|
||||
if deletionGracePeriodSeconds := objectMeta.GetDeletionGracePeriodSeconds(); deletionGracePeriodSeconds != nil && *deletionGracePeriodSeconds < 0 {
|
||||
objectMeta.SetDeletionGracePeriodSeconds(utilpointer.Int64(1))
|
||||
}
|
||||
|
||||
gracefulStrategy, ok := strategy.(RESTGracefulDeleteStrategy)
|
||||
if !ok {
|
||||
// If we're not deleting gracefully there's no point in updating Generation, as we won't update
|
||||
|
||||
305
staging/src/k8s.io/apiserver/pkg/registry/rest/delete_test.go
Normal file
305
staging/src/k8s.io/apiserver/pkg/registry/rest/delete_test.go
Normal file
@ -0,0 +1,305 @@
|
||||
/*
|
||||
Copyright 2021 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 rest
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
utilpointer "k8s.io/utils/pointer"
|
||||
)
|
||||
|
||||
type mockStrategy struct {
|
||||
RESTDeleteStrategy
|
||||
RESTGracefulDeleteStrategy
|
||||
}
|
||||
|
||||
func (m mockStrategy) ObjectKinds(obj runtime.Object) ([]schema.GroupVersionKind, bool, error) {
|
||||
gvk := obj.GetObjectKind().GroupVersionKind()
|
||||
if len(gvk.Kind) == 0 {
|
||||
return nil, false, runtime.NewMissingKindErr("object has no kind field ")
|
||||
}
|
||||
if len(gvk.Version) == 0 {
|
||||
return nil, false, runtime.NewMissingVersionErr("object has no apiVersion field")
|
||||
}
|
||||
return []schema.GroupVersionKind{obj.GetObjectKind().GroupVersionKind()}, false, nil
|
||||
}
|
||||
|
||||
func TestBeforeDelete(t *testing.T) {
|
||||
type args struct {
|
||||
strategy RESTDeleteStrategy
|
||||
ctx context.Context
|
||||
pod *v1.Pod
|
||||
options *metav1.DeleteOptions
|
||||
}
|
||||
|
||||
makePod := func(deletionGracePeriodSeconds int64) *v1.Pod {
|
||||
return &v1.Pod{
|
||||
TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: "Pod"},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
DeletionTimestamp: &metav1.Time{},
|
||||
DeletionGracePeriodSeconds: &deletionGracePeriodSeconds,
|
||||
},
|
||||
}
|
||||
}
|
||||
makeOption := func(gracePeriodSeconds int64) *metav1.DeleteOptions {
|
||||
return &metav1.DeleteOptions{
|
||||
GracePeriodSeconds: &gracePeriodSeconds,
|
||||
}
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
wantGraceful bool
|
||||
wantGracefulPending bool
|
||||
wantGracePeriodSeconds *int64
|
||||
wantDeletionGracePeriodSeconds *int64
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=-1, GracePeriodSeconds=-1",
|
||||
args: args{
|
||||
pod: makePod(-1),
|
||||
options: makeOption(-1),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: true,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=-1, GracePeriodSeconds=0",
|
||||
args: args{
|
||||
pod: makePod(-1),
|
||||
options: makeOption(0),
|
||||
},
|
||||
// want 0
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGraceful: true,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=-1, GracePeriodSeconds=1",
|
||||
args: args{
|
||||
pod: makePod(-1),
|
||||
options: makeOption(1),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: true,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=-1, GracePeriodSeconds=2",
|
||||
args: args{
|
||||
pod: makePod(-1),
|
||||
options: makeOption(2),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(2),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: true,
|
||||
},
|
||||
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=0, GracePeriodSeconds=-1",
|
||||
args: args{
|
||||
pod: makePod(0),
|
||||
options: makeOption(-1),
|
||||
},
|
||||
// want 0
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=0, GracePeriodSeconds=0",
|
||||
args: args{
|
||||
pod: makePod(0),
|
||||
options: makeOption(0),
|
||||
},
|
||||
// want 0
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=0, GracePeriodSeconds=1",
|
||||
args: args{
|
||||
pod: makePod(0),
|
||||
options: makeOption(1),
|
||||
},
|
||||
// want 0
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=0, GracePeriodSeconds=2",
|
||||
args: args{
|
||||
pod: makePod(0),
|
||||
options: makeOption(2),
|
||||
},
|
||||
// want 0
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(2),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=1, GracePeriodSeconds=-1",
|
||||
args: args{
|
||||
pod: makePod(1),
|
||||
options: makeOption(-1),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: true,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=1, GracePeriodSeconds=0",
|
||||
args: args{
|
||||
pod: makePod(1),
|
||||
options: makeOption(0),
|
||||
},
|
||||
// want 0
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGraceful: true,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=1, GracePeriodSeconds=1",
|
||||
args: args{
|
||||
pod: makePod(1),
|
||||
options: makeOption(1),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: true,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=1, GracePeriodSeconds=2",
|
||||
args: args{
|
||||
pod: makePod(1),
|
||||
options: makeOption(2),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(2),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: true,
|
||||
},
|
||||
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=2, GracePeriodSeconds=-1",
|
||||
args: args{
|
||||
pod: makePod(2),
|
||||
options: makeOption(-1),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: true,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=2, GracePeriodSeconds=0",
|
||||
args: args{
|
||||
pod: makePod(2),
|
||||
options: makeOption(0),
|
||||
},
|
||||
// want 0
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(0),
|
||||
wantGraceful: true,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=2, GracePeriodSeconds=1",
|
||||
args: args{
|
||||
pod: makePod(2),
|
||||
options: makeOption(1),
|
||||
},
|
||||
// want 1
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(1),
|
||||
wantGraceful: true,
|
||||
wantGracefulPending: false,
|
||||
},
|
||||
{
|
||||
name: "when DeletionGracePeriodSeconds=2, GracePeriodSeconds=2",
|
||||
args: args{
|
||||
pod: makePod(2),
|
||||
options: makeOption(2),
|
||||
},
|
||||
// want 2
|
||||
wantDeletionGracePeriodSeconds: utilpointer.Int64(2),
|
||||
wantGracePeriodSeconds: utilpointer.Int64(2),
|
||||
wantGraceful: false,
|
||||
wantGracefulPending: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if tt.args.strategy == nil {
|
||||
tt.args.strategy = mockStrategy{}
|
||||
}
|
||||
if tt.args.ctx == nil {
|
||||
tt.args.ctx = context.Background()
|
||||
}
|
||||
|
||||
gotGraceful, gotGracefulPending, err := BeforeDelete(tt.args.strategy, tt.args.ctx, tt.args.pod, tt.args.options)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("BeforeDelete() error = %v, wantErr %v", err, tt.wantErr)
|
||||
return
|
||||
}
|
||||
if gotGraceful != tt.wantGraceful {
|
||||
t.Errorf("BeforeDelete() gotGraceful = %v, want %v", gotGraceful, tt.wantGraceful)
|
||||
}
|
||||
if gotGracefulPending != tt.wantGracefulPending {
|
||||
t.Errorf("BeforeDelete() gotGracefulPending = %v, want %v", gotGracefulPending, tt.wantGracefulPending)
|
||||
}
|
||||
if gotGracefulPending != tt.wantGracefulPending {
|
||||
t.Errorf("BeforeDelete() gotGracefulPending = %v, want %v", gotGracefulPending, tt.wantGracefulPending)
|
||||
}
|
||||
if !utilpointer.Int64Equal(tt.args.pod.DeletionGracePeriodSeconds, tt.wantDeletionGracePeriodSeconds) {
|
||||
t.Errorf("metadata.DeletionGracePeriodSeconds = %v, want %v", utilpointer.Int64Deref(tt.args.pod.DeletionGracePeriodSeconds, 0), utilpointer.Int64Deref(tt.wantDeletionGracePeriodSeconds, 0))
|
||||
}
|
||||
if !utilpointer.Int64Equal(tt.args.options.GracePeriodSeconds, tt.wantGracePeriodSeconds) {
|
||||
t.Errorf("options.GracePeriodSeconds = %v, want %v", utilpointer.Int64Deref(tt.args.options.GracePeriodSeconds, 0), utilpointer.Int64Deref(tt.wantGracePeriodSeconds, 0))
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user