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
959c56d3
Commit
959c56d3
authored
Apr 05, 2019
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Install meta.k8s.io/v1beta1 types into kubectl scheme
parent
4d380ee2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
BUILD
pkg/kubectl/scheme/BUILD
+1
-0
install.go
pkg/kubectl/scheme/install.go
+2
-0
register.go
...src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go
+8
-4
No files found.
pkg/kubectl/scheme/BUILD
View file @
959c56d3
...
@@ -38,6 +38,7 @@ go_library(
...
@@ -38,6 +38,7 @@ go_library(
"//staging/src/k8s.io/api/storage/v1beta1:go_default_library",
"//staging/src/k8s.io/api/storage/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
...
...
pkg/kubectl/scheme/install.go
View file @
959c56d3
...
@@ -45,6 +45,7 @@ import (
...
@@ -45,6 +45,7 @@ import (
storagev1
"k8s.io/api/storage/v1"
storagev1
"k8s.io/api/storage/v1"
storagev1beta1
"k8s.io/api/storage/v1beta1"
storagev1beta1
"k8s.io/api/storage/v1beta1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1beta1
"k8s.io/apimachinery/pkg/apis/meta/v1beta1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/schema"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/kubernetes/scheme"
...
@@ -56,6 +57,7 @@ import (
...
@@ -56,6 +57,7 @@ import (
func
init
()
{
func
init
()
{
// Register external types for Scheme
// Register external types for Scheme
metav1
.
AddToGroupVersion
(
Scheme
,
schema
.
GroupVersion
{
Version
:
"v1"
})
metav1
.
AddToGroupVersion
(
Scheme
,
schema
.
GroupVersion
{
Version
:
"v1"
})
utilruntime
.
Must
(
metav1beta1
.
AddToScheme
(
Scheme
))
utilruntime
.
Must
(
scheme
.
AddToScheme
(
Scheme
))
utilruntime
.
Must
(
scheme
.
AddToScheme
(
Scheme
))
utilruntime
.
Must
(
Scheme
.
SetVersionPriority
(
corev1
.
SchemeGroupVersion
))
utilruntime
.
Must
(
Scheme
.
SetVersionPriority
(
corev1
.
SchemeGroupVersion
))
...
...
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/register.go
View file @
959c56d3
...
@@ -39,6 +39,12 @@ var scheme = runtime.NewScheme()
...
@@ -39,6 +39,12 @@ var scheme = runtime.NewScheme()
var
ParameterCodec
=
runtime
.
NewParameterCodec
(
scheme
)
var
ParameterCodec
=
runtime
.
NewParameterCodec
(
scheme
)
func
init
()
{
func
init
()
{
if
err
:=
AddToScheme
(
scheme
);
err
!=
nil
{
panic
(
err
)
}
}
func
AddToScheme
(
scheme
*
runtime
.
Scheme
)
error
{
scheme
.
AddKnownTypes
(
SchemeGroupVersion
,
scheme
.
AddKnownTypes
(
SchemeGroupVersion
,
&
Table
{},
&
Table
{},
&
TableOptions
{},
&
TableOptions
{},
...
@@ -46,11 +52,9 @@ func init() {
...
@@ -46,11 +52,9 @@ func init() {
&
PartialObjectMetadataList
{},
&
PartialObjectMetadataList
{},
)
)
if
err
:=
scheme
.
AddConversionFuncs
(
return
scheme
.
AddConversionFuncs
(
Convert_Slice_string_To_v1beta1_IncludeObjectPolicy
,
Convert_Slice_string_To_v1beta1_IncludeObjectPolicy
,
);
err
!=
nil
{
)
panic
(
err
)
}
// register manually. This usually goes through the SchemeBuilder, which we cannot use here.
// register manually. This usually goes through the SchemeBuilder, which we cannot use here.
//scheme.AddGeneratedDeepCopyFuncs(GetGeneratedDeepCopyFuncs()...)
//scheme.AddGeneratedDeepCopyFuncs(GetGeneratedDeepCopyFuncs()...)
...
...
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