kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #94397 from wojtek-t/stop_setting_selflink 

Stop setting SelfLink in kube-apiserver.

Kubernetes-commit: f736be5721e370db8fa4445a8a3264bb3770fb6e
This commit is contained in:
Kubernetes Publisher 2020-09-03 12:31:55 -07:00
parent da8b2c5e5e 14d59e2950
commit 76b3773bc1
4 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
pkg/endpoints/apiserver_test.go
View File

@ -1144,9 +1144,8 @@ func TestList(t *testing.T) {
t.Logf("%d: body: %s", i, string(body)) t.Logf("%d: body: %s", i, string(body))
continue continue
} }
// TODO: future, restore get links if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
if !selfLinker.called { t.Errorf("%d: unexpected selfLinker.called: %v", i, selfLinker.called)
t.Errorf("%d: never set self link", i)
} }
if !simpleStorage.namespacePresent { if !simpleStorage.namespacePresent {
t.Errorf("%d: namespace not set", i) t.Errorf("%d: namespace not set", i)
@ -1279,9 +1278,8 @@ func TestListCompression(t *testing.T) {
t.Logf("%d: body: %s", i, string(body)) t.Logf("%d: body: %s", i, string(body))
continue continue
} }
// TODO: future, restore get links if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
if !selfLinker.called { t.Errorf("%d: unexpected selfLinker.called: %v", i, selfLinker.called)
t.Errorf("%d: never set self link", i)
} }
if !simpleStorage.namespacePresent { if !simpleStorage.namespacePresent {
t.Errorf("%d: namespace not set", i) t.Errorf("%d: namespace not set", i)
@ -1399,12 +1397,14 @@ func TestNonEmptyList(t *testing.T) {
if listOut.Items[0].Other != simpleStorage.list[0].Other { if listOut.Items[0].Other != simpleStorage.list[0].Other {
t.Errorf("Unexpected data: %#v, %s", listOut.Items[0], string(body)) t.Errorf("Unexpected data: %#v, %s", listOut.Items[0], string(body))
} }
if listOut.SelfLink != "/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/simple" { if !utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) {
t.Errorf("unexpected list self link: %#v", listOut) if listOut.SelfLink != "/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/simple" {
} t.Errorf("unexpected list self link: %#v", listOut)
expectedSelfLink := "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/namespaces/other/simple/something" }
if listOut.Items[0].ObjectMeta.SelfLink != expectedSelfLink { expectedSelfLink := "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/namespaces/other/simple/something"
t.Errorf("Unexpected data: %#v, %s", listOut.Items[0].ObjectMeta.SelfLink, expectedSelfLink) if listOut.Items[0].ObjectMeta.SelfLink != expectedSelfLink {
t.Errorf("Unexpected data: %#v, %s", listOut.Items[0].ObjectMeta.SelfLink, expectedSelfLink)
}
} }
} }
@ -1449,16 +1449,20 @@ func TestSelfLinkSkipsEmptyName(t *testing.T) {
if listOut.Items[0].Other != simpleStorage.list[0].Other { if listOut.Items[0].Other != simpleStorage.list[0].Other {
t.Errorf("Unexpected data: %#v, %s", listOut.Items[0], string(body)) t.Errorf("Unexpected data: %#v, %s", listOut.Items[0], string(body))
} }
if listOut.SelfLink != "/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/simple" { if !utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) {
t.Errorf("unexpected list self link: %#v", listOut) if listOut.SelfLink != "/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/simple" {
} t.Errorf("unexpected list self link: %#v", listOut)
expectedSelfLink := "" }
if listOut.Items[0].ObjectMeta.SelfLink != expectedSelfLink { expectedSelfLink := ""
t.Errorf("Unexpected data: %#v, %s", listOut.Items[0].ObjectMeta.SelfLink, expectedSelfLink) if listOut.Items[0].ObjectMeta.SelfLink != expectedSelfLink {
t.Errorf("Unexpected data: %#v, %s", listOut.Items[0].ObjectMeta.SelfLink, expectedSelfLink)
}
} }
} }
func TestRootSelfLink(t *testing.T) { func TestRootSelfLink(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.RemoveSelfLink, false)()
storage := map[string]rest.Storage{} storage := map[string]rest.Storage{}
simpleStorage := GetWithOptionsRootRESTStorage{ simpleStorage := GetWithOptionsRootRESTStorage{
SimpleTypedStorage: &SimpleTypedStorage{ SimpleTypedStorage: &SimpleTypedStorage{
@ -1596,8 +1600,8 @@ func TestExport(t *testing.T) {
t.Errorf("Expected: exported, saw: %s", itemOut.Other) t.Errorf("Expected: exported, saw: %s", itemOut.Other)
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
@ -1635,8 +1639,8 @@ func TestGet(t *testing.T) {
if itemOut.Name != simpleStorage.item.Name { if itemOut.Name != simpleStorage.item.Name {
t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body)) t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body))
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
@ -1715,6 +1719,7 @@ func BenchmarkGetNoCompression(b *testing.B) {
} }
b.StopTimer() b.StopTimer()
} }
func TestGetCompression(t *testing.T) { func TestGetCompression(t *testing.T) {
storage := map[string]rest.Storage{} storage := map[string]rest.Storage{}
simpleStorage := SimpleRESTStorage{ simpleStorage := SimpleRESTStorage{
@ -1781,8 +1786,8 @@ func TestGetCompression(t *testing.T) {
if itemOut.Name != simpleStorage.item.Name { if itemOut.Name != simpleStorage.item.Name {
t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body)) t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body))
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
} }
@ -2762,8 +2767,8 @@ func TestGetAlternateSelfLink(t *testing.T) {
if itemOut.Name != simpleStorage.item.Name { if itemOut.Name != simpleStorage.item.Name {
t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body)) t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body))
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
@ -2800,8 +2805,8 @@ func TestGetNamespaceSelfLink(t *testing.T) {
if itemOut.Name != simpleStorage.item.Name { if itemOut.Name != simpleStorage.item.Name {
t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body)) t.Errorf("Unexpected data: %#v, expected %#v (%s)", itemOut, simpleStorage.item, string(body))
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
@ -3342,8 +3347,8 @@ func TestUpdate(t *testing.T) {
if simpleStorage.updated == nil || simpleStorage.updated.Name != item.Name { if simpleStorage.updated == nil || simpleStorage.updated.Name != item.Name {
t.Errorf("Unexpected update value %#v, expected %#v.", simpleStorage.updated, item) t.Errorf("Unexpected update value %#v, expected %#v.", simpleStorage.updated, item)
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
@ -4010,8 +4015,8 @@ func TestCreate(t *testing.T) {
if response.StatusCode != http.StatusCreated { if response.StatusCode != http.StatusCreated {
t.Errorf("Unexpected status: %d, Expected: %d, %#v", response.StatusCode, http.StatusOK, response) t.Errorf("Unexpected status: %d, Expected: %d, %#v", response.StatusCode, http.StatusOK, response)
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
@ -4080,8 +4085,8 @@ func TestCreateYAML(t *testing.T) {
if response.StatusCode != http.StatusCreated { if response.StatusCode != http.StatusCreated {
t.Errorf("Unexpected status: %d, Expected: %d, %#v", response.StatusCode, http.StatusOK, response) t.Errorf("Unexpected status: %d, Expected: %d, %#v", response.StatusCode, http.StatusOK, response)
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }
@ -4140,8 +4145,8 @@ func TestCreateInNamespace(t *testing.T) {
if response.StatusCode != http.StatusCreated { if response.StatusCode != http.StatusCreated {
t.Errorf("Unexpected status: %d, Expected: %d, %#v", response.StatusCode, http.StatusOK, response) t.Errorf("Unexpected status: %d, Expected: %d, %#v", response.StatusCode, http.StatusOK, response)
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }

6
pkg/endpoints/handlers/rest.go
View File

@ -328,6 +328,12 @@ func checkName(obj runtime.Object, name, namespace string, namer ScopeNamer) err
// interfaces // interfaces
func setObjectSelfLink(ctx context.Context, obj runtime.Object, req *http.Request, namer ScopeNamer) error { func setObjectSelfLink(ctx context.Context, obj runtime.Object, req *http.Request, namer ScopeNamer) error {
if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) {
// Ensure that for empty lists we don't return <nil> items.
if meta.IsListType(obj) && meta.LenList(obj) == 0 {
if err := meta.SetList(obj, []runtime.Object{}); err != nil {
return err
}
}
return nil return nil
} }

6
pkg/endpoints/patchhandler_test.go
View File

@ -25,7 +25,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
genericapitesting "k8s.io/apiserver/pkg/endpoints/testing" genericapitesting "k8s.io/apiserver/pkg/endpoints/testing"
"k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
utilfeature "k8s.io/apiserver/pkg/util/feature"
) )
func TestPatch(t *testing.T) { func TestPatch(t *testing.T) {
@ -67,8 +69,8 @@ func TestPatch(t *testing.T) {
if simpleStorage.updated == nil || simpleStorage.updated.Labels["foo"] != "bar" { if simpleStorage.updated == nil || simpleStorage.updated.Labels["foo"] != "bar" {
t.Errorf("Unexpected update value %#v, expected %#v.", simpleStorage.updated, item) t.Errorf("Unexpected update value %#v, expected %#v.", simpleStorage.updated, item)
} }
if !selfLinker.called { if utilfeature.DefaultFeatureGate.Enabled(features.RemoveSelfLink) == selfLinker.called {
t.Errorf("Never set self link") t.Errorf("unexpected selfLinker.called: %v", selfLinker.called)
} }
} }

2
pkg/features/kube_features.go
View File

@ -159,7 +159,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, StorageVersionHash: {Default: true, PreRelease: featuregate.Beta},
WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha}, APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha},
RemoveSelfLink: {Default: false, PreRelease: featuregate.Alpha}, RemoveSelfLink: {Default: true, PreRelease: featuregate.Beta},
SelectorIndex: {Default: true, PreRelease: featuregate.Beta}, SelectorIndex: {Default: true, PreRelease: featuregate.Beta},
WarningHeaders: {Default: true, PreRelease: featuregate.Beta}, WarningHeaders: {Default: true, PreRelease: featuregate.Beta},
} }