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
3e7d6067
Commit
3e7d6067
authored
Feb 24, 2017
by
Jan Safranek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Install storage v1 API
parent
cea7a46d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
0 deletions
+22
-0
BUILD
pkg/master/BUILD
+1
-0
master.go
pkg/master/master.go
+2
-0
BUILD
pkg/registry/storage/rest/BUILD
+1
-0
storage_storage.go
pkg/registry/storage/rest/storage_storage.go
+18
-0
No files found.
pkg/master/BUILD
View file @
3e7d6067
...
@@ -48,6 +48,7 @@ go_library(
...
@@ -48,6 +48,7 @@ go_library(
"//pkg/apis/rbac/v1alpha1:go_default_library",
"//pkg/apis/rbac/v1alpha1:go_default_library",
"//pkg/apis/rbac/v1beta1:go_default_library",
"//pkg/apis/rbac/v1beta1:go_default_library",
"//pkg/apis/storage/install:go_default_library",
"//pkg/apis/storage/install:go_default_library",
"//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
"//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
...
...
pkg/master/master.go
View file @
3e7d6067
...
@@ -45,6 +45,7 @@ import (
...
@@ -45,6 +45,7 @@ import (
policyapiv1beta1
"k8s.io/kubernetes/pkg/apis/policy/v1beta1"
policyapiv1beta1
"k8s.io/kubernetes/pkg/apis/policy/v1beta1"
rbacapi
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
rbacapi
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
rbacv1beta1
"k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
rbacv1beta1
"k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
storageapiv1
"k8s.io/kubernetes/pkg/apis/storage/v1"
storageapiv1beta1
"k8s.io/kubernetes/pkg/apis/storage/v1beta1"
storageapiv1beta1
"k8s.io/kubernetes/pkg/apis/storage/v1beta1"
corev1client
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
corev1client
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
coreclient
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
coreclient
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
...
@@ -363,6 +364,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
...
@@ -363,6 +364,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
policyapiv1beta1
.
SchemeGroupVersion
,
policyapiv1beta1
.
SchemeGroupVersion
,
rbacv1beta1
.
SchemeGroupVersion
,
rbacv1beta1
.
SchemeGroupVersion
,
rbacapi
.
SchemeGroupVersion
,
rbacapi
.
SchemeGroupVersion
,
storageapiv1
.
SchemeGroupVersion
,
storageapiv1beta1
.
SchemeGroupVersion
,
storageapiv1beta1
.
SchemeGroupVersion
,
certificatesapiv1beta1
.
SchemeGroupVersion
,
certificatesapiv1beta1
.
SchemeGroupVersion
,
authorizationapiv1
.
SchemeGroupVersion
,
authorizationapiv1
.
SchemeGroupVersion
,
...
...
pkg/registry/storage/rest/BUILD
View file @
3e7d6067
...
@@ -14,6 +14,7 @@ go_library(
...
@@ -14,6 +14,7 @@ go_library(
deps = [
deps = [
"//pkg/api:go_default_library",
"//pkg/api:go_default_library",
"//pkg/apis/storage:go_default_library",
"//pkg/apis/storage:go_default_library",
"//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/apis/storage/v1beta1:go_default_library",
"//pkg/registry/storage/storageclass/storage:go_default_library",
"//pkg/registry/storage/storageclass/storage:go_default_library",
"//vendor:k8s.io/apiserver/pkg/registry/generic",
"//vendor:k8s.io/apiserver/pkg/registry/generic",
...
...
pkg/registry/storage/rest/storage_storage.go
View file @
3e7d6067
...
@@ -23,6 +23,7 @@ import (
...
@@ -23,6 +23,7 @@ import (
serverstorage
"k8s.io/apiserver/pkg/server/storage"
serverstorage
"k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api"
storageapi
"k8s.io/kubernetes/pkg/apis/storage"
storageapi
"k8s.io/kubernetes/pkg/apis/storage"
storageapiv1
"k8s.io/kubernetes/pkg/apis/storage/v1"
storageapiv1beta1
"k8s.io/kubernetes/pkg/apis/storage/v1beta1"
storageapiv1beta1
"k8s.io/kubernetes/pkg/apis/storage/v1beta1"
storageclassstore
"k8s.io/kubernetes/pkg/registry/storage/storageclass/storage"
storageclassstore
"k8s.io/kubernetes/pkg/registry/storage/storageclass/storage"
)
)
...
@@ -37,6 +38,10 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -37,6 +38,10 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
storageapiv1beta1
.
SchemeGroupVersion
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
storageapiv1beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
AnyResourcesForVersionEnabled
(
storageapiv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
storageapiv1
.
SchemeGroupVersion
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
}
}
...
@@ -54,6 +59,19 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag
...
@@ -54,6 +59,19 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag
return
storage
return
storage
}
}
func
(
p
RESTStorageProvider
)
v1Storage
(
apiResourceConfigSource
serverstorage
.
APIResourceConfigSource
,
restOptionsGetter
generic
.
RESTOptionsGetter
)
map
[
string
]
rest
.
Storage
{
version
:=
storageapiv1
.
SchemeGroupVersion
storage
:=
map
[
string
]
rest
.
Storage
{}
if
apiResourceConfigSource
.
ResourceEnabled
(
version
.
WithResource
(
"storageclasses"
))
{
storageClassStorage
:=
storageclassstore
.
NewREST
(
restOptionsGetter
)
storage
[
"storageclasses"
]
=
storageClassStorage
}
return
storage
}
func
(
p
RESTStorageProvider
)
GroupName
()
string
{
func
(
p
RESTStorageProvider
)
GroupName
()
string
{
return
storageapi
.
GroupName
return
storageapi
.
GroupName
}
}
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