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
937d45a8
Commit
937d45a8
authored
Aug 02, 2018
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove legacy scheme from create
parent
dd2af1c8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
14 deletions
+9
-14
BUILD
pkg/kubectl/cmd/create/BUILD
+0
-3
create.go
pkg/kubectl/cmd/create/create.go
+5
-5
create_job.go
pkg/kubectl/cmd/create/create_job.go
+1
-2
create_role.go
pkg/kubectl/cmd/create/create_role.go
+2
-2
BUILD
pkg/kubectl/cmd/get/BUILD
+0
-1
BUILD
pkg/kubectl/metricsutil/BUILD
+1
-1
No files found.
pkg/kubectl/cmd/create/BUILD
View file @
937d45a8
...
@@ -22,7 +22,6 @@ go_library(
...
@@ -22,7 +22,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create",
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create",
visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"],
visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"],
deps = [
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl/cmd/templates:go_default_library",
"//pkg/kubectl/cmd/templates:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
...
@@ -75,9 +74,7 @@ go_test(
...
@@ -75,9 +74,7 @@ go_test(
],
],
embed = [":go_default_library"],
embed = [":go_default_library"],
deps = [
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testing:go_default_library",
"//pkg/api/testing:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl/cmd/testing:go_default_library",
"//pkg/kubectl/cmd/testing:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
...
...
pkg/kubectl/cmd/create/create.go
View file @
937d45a8
...
@@ -32,13 +32,13 @@ import (
...
@@ -32,13 +32,13 @@ import (
kruntime
"k8s.io/apimachinery/pkg/runtime"
kruntime
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/dynamic"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/printers"
"k8s.io/kubernetes/pkg/printers"
)
)
...
@@ -79,7 +79,7 @@ var (
...
@@ -79,7 +79,7 @@ var (
func
NewCreateOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateOptions
{
func
NewCreateOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateOptions
{
return
&
CreateOptions
{
return
&
CreateOptions
{
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
legacy
scheme
.
Scheme
),
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
scheme
.
Scheme
),
RecordFlags
:
genericclioptions
.
NewRecordFlags
(),
RecordFlags
:
genericclioptions
.
NewRecordFlags
(),
Recorder
:
genericclioptions
.
NoopRecorder
{},
Recorder
:
genericclioptions
.
NoopRecorder
{},
...
@@ -358,7 +358,7 @@ type CreateSubcommandOptions struct {
...
@@ -358,7 +358,7 @@ type CreateSubcommandOptions struct {
func
NewCreateSubcommandOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateSubcommandOptions
{
func
NewCreateSubcommandOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateSubcommandOptions
{
return
&
CreateSubcommandOptions
{
return
&
CreateSubcommandOptions
{
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
legacy
scheme
.
Scheme
),
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
scheme
.
Scheme
),
IOStreams
:
ioStreams
,
IOStreams
:
ioStreams
,
}
}
}
}
...
@@ -412,7 +412,7 @@ func (o *CreateSubcommandOptions) Run() error {
...
@@ -412,7 +412,7 @@ func (o *CreateSubcommandOptions) Run() error {
}
}
if
!
o
.
DryRun
{
if
!
o
.
DryRun
{
// create subcommands have compiled knowledge of things they create, so type them directly
// create subcommands have compiled knowledge of things they create, so type them directly
gvks
,
_
,
err
:=
legacy
scheme
.
Scheme
.
ObjectKinds
(
obj
)
gvks
,
_
,
err
:=
scheme
.
Scheme
.
ObjectKinds
(
obj
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -428,7 +428,7 @@ func (o *CreateSubcommandOptions) Run() error {
...
@@ -428,7 +428,7 @@ func (o *CreateSubcommandOptions) Run() error {
asUnstructured
:=
&
unstructured
.
Unstructured
{}
asUnstructured
:=
&
unstructured
.
Unstructured
{}
if
err
:=
legacy
scheme
.
Scheme
.
Convert
(
obj
,
asUnstructured
,
nil
);
err
!=
nil
{
if
err
:=
scheme
.
Scheme
.
Convert
(
obj
,
asUnstructured
,
nil
);
err
!=
nil
{
return
err
return
err
}
}
if
mapping
.
Scope
.
Name
()
==
meta
.
RESTScopeNameRoot
{
if
mapping
.
Scope
.
Name
()
==
meta
.
RESTScopeNameRoot
{
...
...
pkg/kubectl/cmd/create/create_job.go
View file @
937d45a8
...
@@ -27,7 +27,6 @@ import (
...
@@ -27,7 +27,6 @@ import (
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
batchv1client
"k8s.io/client-go/kubernetes/typed/batch/v1"
batchv1client
"k8s.io/client-go/kubernetes/typed/batch/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
...
@@ -72,7 +71,7 @@ type CreateJobOptions struct {
...
@@ -72,7 +71,7 @@ type CreateJobOptions struct {
func
NewCreateJobOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateJobOptions
{
func
NewCreateJobOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateJobOptions
{
return
&
CreateJobOptions
{
return
&
CreateJobOptions
{
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
legacy
scheme
.
Scheme
),
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
scheme
.
Scheme
),
IOStreams
:
ioStreams
,
IOStreams
:
ioStreams
,
}
}
}
}
...
...
pkg/kubectl/cmd/create/create_role.go
View file @
937d45a8
...
@@ -29,10 +29,10 @@ import (
...
@@ -29,10 +29,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
clientgorbacv1
"k8s.io/client-go/kubernetes/typed/rbac/v1"
clientgorbacv1
"k8s.io/client-go/kubernetes/typed/rbac/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)
)
...
@@ -131,7 +131,7 @@ type CreateRoleOptions struct {
...
@@ -131,7 +131,7 @@ type CreateRoleOptions struct {
func
NewCreateRoleOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateRoleOptions
{
func
NewCreateRoleOptions
(
ioStreams
genericclioptions
.
IOStreams
)
*
CreateRoleOptions
{
return
&
CreateRoleOptions
{
return
&
CreateRoleOptions
{
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
legacy
scheme
.
Scheme
),
PrintFlags
:
genericclioptions
.
NewPrintFlags
(
"created"
)
.
WithTypeSetter
(
scheme
.
Scheme
),
IOStreams
:
ioStreams
,
IOStreams
:
ioStreams
,
}
}
...
...
pkg/kubectl/cmd/get/BUILD
View file @
937d45a8
...
@@ -66,7 +66,6 @@ go_test(
...
@@ -66,7 +66,6 @@ go_test(
],
],
embed = [":go_default_library"],
embed = [":go_default_library"],
deps = [
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testing:go_default_library",
"//pkg/api/testing:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/v1:go_default_library",
"//pkg/apis/core/v1:go_default_library",
...
...
pkg/kubectl/metricsutil/BUILD
View file @
937d45a8
...
@@ -14,7 +14,6 @@ go_library(
...
@@ -14,7 +14,6 @@ go_library(
"//build/visible_to:pkg_kubectl_metricsutil_CONSUMERS",
"//build/visible_to:pkg_kubectl_metricsutil_CONSUMERS",
],
],
deps = [
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core/validation:go_default_library",
"//pkg/apis/core/validation:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/printers:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
...
@@ -22,6 +21,7 @@ go_library(
...
@@ -22,6 +21,7 @@ go_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/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels: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/client-go/kubernetes/scheme:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
...
...
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