diff --git a/pkg/registry/core/pod/storage/BUILD b/pkg/registry/core/pod/storage/BUILD index 68c00fcc90e..9ee6edd4f0f 100644 --- a/pkg/registry/core/pod/storage/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -20,16 +20,13 @@ go_test( "//pkg/securitycontext:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/policy/v1beta1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/apitesting:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/apis/example/v1:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//staging/src/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//staging/src/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/core/pod/storage/eviction_test.go b/pkg/registry/core/pod/storage/eviction_test.go index 8bcfffcdde0..3898175aa93 100644 --- a/pkg/registry/core/pod/storage/eviction_test.go +++ b/pkg/registry/core/pod/storage/eviction_test.go @@ -17,25 +17,16 @@ limitations under the License. package storage import ( - "context" "testing" policyv1beta1 "k8s.io/api/policy/v1beta1" - "k8s.io/apimachinery/pkg/api/apitesting" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" - examplev1 "k8s.io/apiserver/pkg/apis/example/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/apiserver/pkg/registry/generic" - genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" - "k8s.io/apiserver/pkg/storage" - etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" "k8s.io/client-go/kubernetes/fake" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/registry/registrytest" ) func TestEviction(t *testing.T) { @@ -155,41 +146,6 @@ func TestEviction(t *testing.T) { } } -type FailDeleteUpdateStorage struct { - storage.Interface -} - -func (f FailDeleteUpdateStorage) Delete(ctx context.Context, key string, out runtime.Object, precondition *storage.Preconditions, validateDeletion storage.ValidateObjectFunc) error { - return storage.NewKeyNotFoundError(key, 0) -} - -func (f FailDeleteUpdateStorage) GuaranteedUpdate(ctx context.Context, key string, ptrToType runtime.Object, ignoreNotFound bool, - preconditions *storage.Preconditions, tryUpdate storage.UpdateFunc, suggestion ...runtime.Object) error { - return storage.NewKeyNotFoundError(key, 0) -} - -var scheme = runtime.NewScheme() -var codecs = serializer.NewCodecFactory(scheme) - -func newFailDeleteUpdateStorage(t *testing.T) (*REST, *etcd3testing.EtcdTestServer) { - etcdStorage, server := registrytest.NewEtcdStorage(t, "") - restOptions := generic.RESTOptions{ - StorageConfig: etcdStorage, - Decorator: generic.UndecoratedStorage, - DeleteCollectionWorkers: 3, - ResourcePrefix: "pods", - } - storage, err := NewStorage(restOptions, nil, nil, nil) - if err != nil { - t.Fatalf("unexpected error from REST storage: %v", err) - } - storage.Pod.Store.Storage = genericregistry.DryRunnableStorage{ - Storage: FailDeleteUpdateStorage{storage.Pod.Store.Storage.Storage}, - Codec: apitesting.TestStorageCodec(codecs, examplev1.SchemeGroupVersion), - } - return storage.Pod, server -} - func TestEvictionDryRun(t *testing.T) { testcases := []struct { name string @@ -227,7 +183,7 @@ func TestEvictionDryRun(t *testing.T) { for _, tc := range testcases { t.Run(tc.name, func(t *testing.T) { testContext := genericapirequest.WithNamespace(genericapirequest.NewContext(), metav1.NamespaceDefault) - storage, server := newFailDeleteUpdateStorage(t) + storage, _, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go index b0b59cf8205..c32de6f8ff9 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go @@ -38,8 +38,7 @@ func (s *DryRunnableStorage) Create(ctx context.Context, key string, obj, out ru if err := s.Storage.Get(ctx, key, "", out, false); err == nil { return storage.NewKeyExistsError(key, 0) } - s.copyInto(obj, out) - return nil + return s.copyInto(obj, out) } return s.Storage.Create(ctx, key, obj, out, ttl) } @@ -97,8 +96,7 @@ func (s *DryRunnableStorage) GuaranteedUpdate( if err != nil { return err } - s.copyInto(out, ptrToType) - return nil + return s.copyInto(out, ptrToType) } return s.Storage.GuaranteedUpdate(ctx, key, ptrToType, ignoreNotFound, preconditions, tryUpdate, suggestion...) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 73be3bd93dd..6640447bc7f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1301,7 +1301,6 @@ k8s.io/apiserver/pkg/apis/config k8s.io/apiserver/pkg/apis/config/v1 k8s.io/apiserver/pkg/apis/config/validation k8s.io/apiserver/pkg/apis/example -k8s.io/apiserver/pkg/apis/example/v1 k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap k8s.io/apiserver/pkg/audit k8s.io/apiserver/pkg/audit/event