github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Couple remaining SelfLink references cleanup

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-01-19 21:19:25 +01:00 committed by wojtekt
parent 9b2908ea3b
commit b62774f2f7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/sample-controller/controller.go
View File

@ -376,7 +376,7 @@ func (c *Controller) handleObject(obj interface{}) {
foo, err := c.foosLister.Foos(object.GetNamespace()).Get(ownerRef.Name) foo, err := c.foosLister.Foos(object.GetNamespace()).Get(ownerRef.Name)
if err != nil { 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 return
} }

1
test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml vendored
View File

@ -11,7 +11,6 @@ metadata:
name: nginx-deployment name: nginx-deployment
namespace: test namespace: test
resourceVersion: "355959" resourceVersion: "355959"
selfLink: /apis/extensions/v1beta1/namespaces/test/deployments/nginx-deployment
uid: 51ac266e-9a37-11e6-8738-0800270c4edc uid: 51ac266e-9a37-11e6-8738-0800270c4edc
spec: spec:
replicas: 1 replicas: 1

5
test/integration/etcd/etcd_cross_group_test.go
View File

@ -29,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/storage/etcd3"
"k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/cmd/kube-apiserver/app/options"
) )
@ -118,11 +119,11 @@ func TestCrossGroupStorage(t *testing.T) {
} }
} }
versioner := etcd3.APIObjectVersioner{}
for _, resource := range resources { for _, resource := range resources {
// clear out the things cleared in etcd // clear out the things cleared in etcd
versioned := versionedData[resource.Mapping.Resource] versioned := versionedData[resource.Mapping.Resource]
versioned.SetResourceVersion("") versioner.PrepareObjectForStorage(versioned)
versioned.SetSelfLink("")
versionedJSON, err := versioned.MarshalJSON() versionedJSON, err := versioned.MarshalJSON()
if err != nil { if err != nil {
t.Error(err) t.Error(err)