From 5e8e1ff118ed36006728681be0c846cce9d4cc4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= <wojtekt@google.com>
Date: Thu, 13 Jan 2022 16:34:56 +0100
Subject: [PATCH] Relax to using namer instead of selflinker in API
 groupversion

Kubernetes-commit: 0ad588b27b6845d9ece955bfdde0e2863b8e1394
---
 pkg/endpoints/apiserver_test.go | 11 +++++------
 pkg/endpoints/groupversion.go   |  2 +-
 pkg/endpoints/handlers/namer.go |  6 +++---
 pkg/endpoints/installer.go      |  4 ++--
 pkg/server/genericapiserver.go  |  2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go
index c6105ba05..db9ca568b 100644
--- a/pkg/endpoints/apiserver_test.go
+++ b/pkg/endpoints/apiserver_test.go
@@ -126,7 +126,7 @@ var newCodec = codecs.LegacyCodec(newGroupVersion)
 var parameterCodec = runtime.NewParameterCodec(scheme)
 
 var accessor = meta.NewAccessor()
-var selfLinker runtime.SelfLinker = accessor
+var namer runtime.Namer = accessor
 var admissionControl admission.Interface
 
 func init() {
@@ -232,8 +232,7 @@ func handleInternal(storage map[string]rest.Storage, admissionControl admission.
 		UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme),
 		Defaulter:       scheme,
 		Typer:           scheme,
-		// TODO(wojtek-t): Switch to Namer.
-		Linker:          selfLinker,
+		Namer:           namer,
 		RootScopedKinds: sets.NewString("SimpleRoot"),
 
 		EquivalentResourceRegistry: runtime.NewEquivalentResourceRegistry(),
@@ -3280,7 +3279,7 @@ func TestParentResourceIsRequired(t *testing.T) {
 		UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme),
 		Defaulter:       scheme,
 		Typer:           scheme,
-		Linker:          selfLinker,
+		Namer:           namer,
 		RootScopedKinds: sets.NewString("SimpleRoot"),
 
 		EquivalentResourceRegistry: runtime.NewEquivalentResourceRegistry(),
@@ -3313,7 +3312,7 @@ func TestParentResourceIsRequired(t *testing.T) {
 		UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme),
 		Defaulter:       scheme,
 		Typer:           scheme,
-		Linker:          selfLinker,
+		Namer:           namer,
 
 		EquivalentResourceRegistry: runtime.NewEquivalentResourceRegistry(),
 
@@ -4100,7 +4099,7 @@ func TestXGSubresource(t *testing.T) {
 		UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme),
 		Defaulter:       scheme,
 		Typer:           scheme,
-		Linker:          selfLinker,
+		Namer:           namer,
 
 		EquivalentResourceRegistry: runtime.NewEquivalentResourceRegistry(),
 
diff --git a/pkg/endpoints/groupversion.go b/pkg/endpoints/groupversion.go
index a6f17e84a..94b1788ef 100644
--- a/pkg/endpoints/groupversion.go
+++ b/pkg/endpoints/groupversion.go
@@ -79,7 +79,7 @@ type APIGroupVersion struct {
 	Convertor             runtime.ObjectConvertor
 	ConvertabilityChecker ConvertabilityChecker
 	Defaulter             runtime.ObjectDefaulter
-	Linker                runtime.SelfLinker
+	Namer                 runtime.Namer
 	UnsafeConvertor       runtime.ObjectConvertor
 	TypeConverter         fieldmanager.TypeConverter
 
diff --git a/pkg/endpoints/handlers/namer.go b/pkg/endpoints/handlers/namer.go
index 7439caa40..191417060 100644
--- a/pkg/endpoints/handlers/namer.go
+++ b/pkg/endpoints/handlers/namer.go
@@ -39,7 +39,7 @@ type ScopeNamer interface {
 }
 
 type ContextBasedNaming struct {
-	SelfLinker    runtime.SelfLinker
+	Namer         runtime.Namer
 	ClusterScoped bool
 
 	SelfLinkPathPrefix string
@@ -70,14 +70,14 @@ func (n ContextBasedNaming) Name(req *http.Request) (namespace, name string, err
 }
 
 func (n ContextBasedNaming) ObjectName(obj runtime.Object) (namespace, name string, err error) {
-	name, err = n.SelfLinker.Name(obj)
+	name, err = n.Namer.Name(obj)
 	if err != nil {
 		return "", "", err
 	}
 	if len(name) == 0 {
 		return "", "", errEmptyName
 	}
-	namespace, err = n.SelfLinker.Namespace(obj)
+	namespace, err = n.Namer.Namespace(obj)
 	if err != nil {
 		return "", "", err
 	}
diff --git a/pkg/endpoints/installer.go b/pkg/endpoints/installer.go
index 13d703afb..af8418e53 100644
--- a/pkg/endpoints/installer.go
+++ b/pkg/endpoints/installer.go
@@ -428,7 +428,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
 		apiResource.Namespaced = false
 		apiResource.Kind = resourceKind
 		namer := handlers.ContextBasedNaming{
-			SelfLinker:         a.group.Linker,
+			Namer:              a.group.Namer,
 			ClusterScoped:      true,
 			SelfLinkPathPrefix: gpath.Join(a.prefix, resource) + "/",
 			SelfLinkPathSuffix: suffix,
@@ -477,7 +477,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
 		apiResource.Namespaced = true
 		apiResource.Kind = resourceKind
 		namer := handlers.ContextBasedNaming{
-			SelfLinker:         a.group.Linker,
+			Namer:              a.group.Namer,
 			ClusterScoped:      false,
 			SelfLinkPathPrefix: gpath.Join(a.prefix, namespaceParamName) + "/",
 			SelfLinkPathSuffix: itemPathSuffix,
diff --git a/pkg/server/genericapiserver.go b/pkg/server/genericapiserver.go
index 0f856e913..c530bb599 100644
--- a/pkg/server/genericapiserver.go
+++ b/pkg/server/genericapiserver.go
@@ -676,7 +676,7 @@ func (s *GenericAPIServer) newAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupV
 		UnsafeConvertor:       runtime.UnsafeObjectConvertor(apiGroupInfo.Scheme),
 		Defaulter:             apiGroupInfo.Scheme,
 		Typer:                 apiGroupInfo.Scheme,
-		Linker:                runtime.SelfLinker(meta.NewAccessor()),
+		Namer:                 runtime.Namer(meta.NewAccessor()),
 
 		EquivalentResourceRegistry: s.EquivalentResourceRegistry,