From b62774f2f7907e0d519026e8fc3cfaf50eaa5d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= Date: Wed, 19 Jan 2022 21:19:25 +0100 Subject: [PATCH] Couple remaining SelfLink references cleanup --- staging/src/k8s.io/sample-controller/controller.go | 2 +- test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml | 1 - test/integration/etcd/etcd_cross_group_test.go | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/sample-controller/controller.go b/staging/src/k8s.io/sample-controller/controller.go index 439fafa5152..3d2dbaf1594 100644 --- a/staging/src/k8s.io/sample-controller/controller.go +++ b/staging/src/k8s.io/sample-controller/controller.go @@ -376,7 +376,7 @@ func (c *Controller) handleObject(obj interface{}) { foo, err := c.foosLister.Foos(object.GetNamespace()).Get(ownerRef.Name) if err != nil { - klog.V(4).Infof("ignoring orphaned object '%s' of foo '%s'", object.GetSelfLink(), ownerRef.Name) + klog.V(4).Infof("ignoring orphaned object '%s/%s' of foo '%s'", object.GetNamespace(), object.GetName(), ownerRef.Name) return } diff --git a/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml b/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml index 664b87fd770..4ecd3ff1241 100644 --- a/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml +++ b/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml @@ -11,7 +11,6 @@ metadata: name: nginx-deployment namespace: test resourceVersion: "355959" - selfLink: /apis/extensions/v1beta1/namespaces/test/deployments/nginx-deployment uid: 51ac266e-9a37-11e6-8738-0800270c4edc spec: replicas: 1 diff --git a/test/integration/etcd/etcd_cross_group_test.go b/test/integration/etcd/etcd_cross_group_test.go index 860cfca30e5..4f5651cad34 100644 --- a/test/integration/etcd/etcd_cross_group_test.go +++ b/test/integration/etcd/etcd_cross_group_test.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" + "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/client-go/dynamic" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" ) @@ -118,11 +119,11 @@ func TestCrossGroupStorage(t *testing.T) { } } + versioner := etcd3.APIObjectVersioner{} for _, resource := range resources { // clear out the things cleared in etcd versioned := versionedData[resource.Mapping.Resource] - versioned.SetResourceVersion("") - versioned.SetSelfLink("") + versioner.PrepareObjectForStorage(versioned) versionedJSON, err := versioned.MarshalJSON() if err != nil { t.Error(err)