github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Service REST: Use DeepCopy() on Create() and fix tests

Browse Source
This commit is contained in:
Tim Hockin
2021-07-07 10:25:27 -07:00
parent 3a26b864f4
commit 75dea6b8bc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/registry/core/service/storage/rest.go
View File

@@ -189,6 +189,9 @@ func (rs *REST) Watch(ctx context.Context, options *metainternalversion.ListOpti
} }
func (rs *REST) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) { func (rs *REST) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
// DeepCopy to prevent writes here propagating back to tests.
obj = obj.DeepCopyObject()
service := obj.(*api.Service) service := obj.(*api.Service)
// bag of clusterIPs allocated in the process of creation // bag of clusterIPs allocated in the process of creation

6
pkg/registry/core/service/storage/rest_test.go
View File

@@ -993,7 +993,7 @@ func TestServiceRegistryDeleteDryRun(t *testing.T) {
t.Errorf("expected NodePort to be allocated") t.Errorf("expected NodePort to be allocated")
} }
isValidClusterIPFields(t, storage, svc, svc) isValidClusterIPFields(t, storage, svc, createdSvc)
_, _, err = storage.Delete(ctx, svc.Name, rest.ValidateAllObjectFunc, &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}}) _, _, err = storage.Delete(ctx, svc.Name, rest.ValidateAllObjectFunc, &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}})
if err != nil { if err != nil {
@@ -1371,7 +1371,7 @@ func TestServiceRegistryIPReallocation(t *testing.T) {
t.Errorf("Unexpected error deleting service: %v", err) t.Errorf("Unexpected error deleting service: %v", err)
} }
svc2 := svctest.MakeService("bar", svctest.SetClusterIPs(svc1.Spec.ClusterIP)) svc2 := svctest.MakeService("bar", svctest.SetClusterIPs(createdSvc1.Spec.ClusterIP))
ctx = genericapirequest.NewDefaultContext() ctx = genericapirequest.NewDefaultContext()
obj, err = storage.Create(ctx, svc2, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) obj, err = storage.Create(ctx, svc2, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
if err != nil { if err != nil {
@@ -3585,6 +3585,8 @@ func TestDefaultingValidation(t *testing.T) {
// validates that the service created, updated by REST // validates that the service created, updated by REST
// has correct ClusterIPs related fields // has correct ClusterIPs related fields
func isValidClusterIPFields(t *testing.T, storage *REST, pre *api.Service, post *api.Service) { func isValidClusterIPFields(t *testing.T, storage *REST, pre *api.Service, post *api.Service) {
t.Helper()
// valid for gate off/on scenarios // valid for gate off/on scenarios
// ClusterIP // ClusterIP
if len(post.Spec.ClusterIP) == 0 { if len(post.Spec.ClusterIP) == 0 {