Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
22410d4b
Commit
22410d4b
authored
Apr 26, 2018
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove self linker from group info
parent
625bce3f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
12 deletions
+3
-12
BUILD
staging/src/k8s.io/apimachinery/pkg/apimachinery/BUILD
+0
-1
group_factory.go
.../apimachinery/pkg/apimachinery/announced/group_factory.go
+0
-3
types.go
staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go
+0
-7
BUILD
staging/src/k8s.io/apiserver/pkg/server/BUILD
+1
-0
genericapiserver.go
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
+2
-1
No files found.
staging/src/k8s.io/apimachinery/pkg/apimachinery/BUILD
View file @
22410d4b
...
...
@@ -14,7 +14,6 @@ go_library(
importpath = "k8s.io/apimachinery/pkg/apimachinery",
deps = [
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
],
...
...
staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/group_factory.go
View file @
22410d4b
...
...
@@ -150,11 +150,8 @@ func (gmf *GroupMetaFactory) Register(m *registered.APIRegistrationManager, sche
gmf
.
GroupArgs
.
AddInternalObjectsToScheme
(
scheme
)
}
accessor
:=
meta
.
NewAccessor
()
groupMeta
:=
&
apimachinery
.
GroupMeta
{
GroupVersions
:
externalVersions
,
SelfLinker
:
runtime
.
SelfLinker
(
accessor
),
RootScopedKinds
:
gmf
.
GroupArgs
.
RootScopedKinds
,
}
groupMeta
.
RESTMapper
=
gmf
.
newRESTMapper
(
scheme
,
externalVersions
,
groupMeta
)
...
...
staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go
View file @
22410d4b
...
...
@@ -18,7 +18,6 @@ package apimachinery
import
(
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
)
...
...
@@ -30,12 +29,6 @@ type GroupMeta struct {
RootScopedKinds
sets
.
String
// SelfLinker can set or get the SelfLink field of all API types.
// TODO: when versioning changes, make this part of each API definition.
// TODO(lavalamp): Combine SelfLinker & ResourceVersioner interfaces, force all uses
// to go through the InterfacesFor method below.
SelfLinker
runtime
.
SelfLinker
// RESTMapper provides the default mapping between REST paths and the objects declared in a Scheme and all known
// versions.
RESTMapper
meta
.
RESTMapper
...
...
staging/src/k8s.io/apiserver/pkg/server/BUILD
View file @
22410d4b
...
...
@@ -98,6 +98,7 @@ go_library(
"//vendor/github.com/pborman/uuid:go_default_library",
"//vendor/golang.org/x/net/http2:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
...
...
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
View file @
22410d4b
...
...
@@ -27,6 +27,7 @@ import (
"github.com/emicklei/go-restful-swagger12"
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apimachinery"
"k8s.io/apimachinery/pkg/apimachinery/registered"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
...
@@ -422,7 +423,7 @@ func (s *GenericAPIServer) newAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupV
UnsafeConvertor
:
runtime
.
UnsafeObjectConvertor
(
apiGroupInfo
.
Scheme
),
Defaulter
:
apiGroupInfo
.
Scheme
,
Typer
:
apiGroupInfo
.
Scheme
,
Linker
:
apiGroupInfo
.
GroupMeta
.
SelfLinker
,
Linker
:
runtime
.
SelfLinker
(
meta
.
NewAccessor
())
,
RootScopedKinds
:
apiGroupInfo
.
GroupMeta
.
RootScopedKinds
,
Admit
:
s
.
admissionControl
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment