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
5e6be9de
Unverified
Commit
5e6be9de
authored
Jul 08, 2018
by
Lucas Käldström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
autogenerated
parent
71eda34c
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
50 additions
and
191 deletions
+50
-191
BUILD
cmd/kubeadm/app/apis/kubeadm/BUILD
+2
-2
BUILD
cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD
+3
-1
BUILD
cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD
+3
-0
zz_generated.conversion.go
...eadm/app/apis/kubeadm/v1alpha2/zz_generated.conversion.go
+3
-68
BUILD
cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD
+3
-0
zz_generated.conversion.go
...eadm/app/apis/kubeadm/v1alpha3/zz_generated.conversion.go
+3
-68
BUILD
cmd/kubeadm/app/apis/kubeadm/validation/BUILD
+2
-5
zz_generated.deepcopy.go
cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go
+29
-46
BUILD
cmd/kubeadm/app/phases/kubelet/BUILD
+2
-1
No files found.
cmd/kubeadm/app/apis/kubeadm/BUILD
View file @
5e6be9de
...
...
@@ -18,8 +18,8 @@ go_library(
],
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm",
deps = [
"//pkg/kubelet/apis/kubeletconfig
/v1beta1
:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig
/v1alpha1
:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
...
...
cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD
View file @
5e6be9de
...
...
@@ -12,8 +12,10 @@ go_library(
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/fuzzer",
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig
/v1alpha1
:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig:go_default_library",
"//pkg/util/pointer:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
...
...
cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD
View file @
5e6be9de
...
...
@@ -4,6 +4,7 @@ go_library(
name = "go_default_library",
srcs = [
"bootstraptokenstring.go",
"conversion.go",
"defaults.go",
"defaults_unix.go",
"defaults_windows.go",
...
...
@@ -19,8 +20,10 @@ go_library(
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//cmd/kubeadm/app/constants:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig/scheme:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library",
"//pkg/util/pointer:go_default_library",
...
...
cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.conversion.go
View file @
5e6be9de
...
...
@@ -28,8 +28,6 @@ import (
conversion
"k8s.io/apimachinery/pkg/conversion"
runtime
"k8s.io/apimachinery/pkg/runtime"
kubeadm
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
v1beta1
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
v1alpha1
"k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
)
func
init
()
{
...
...
@@ -54,10 +52,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
Convert_kubeadm_ExternalEtcd_To_v1alpha2_ExternalEtcd
,
Convert_v1alpha2_HostPathMount_To_kubeadm_HostPathMount
,
Convert_kubeadm_HostPathMount_To_v1alpha2_HostPathMount
,
Convert_v1alpha2_KubeProxy_To_kubeadm_KubeProxy
,
Convert_kubeadm_KubeProxy_To_v1alpha2_KubeProxy
,
Convert_v1alpha2_KubeletConfiguration_To_kubeadm_KubeletConfiguration
,
Convert_kubeadm_KubeletConfiguration_To_v1alpha2_KubeletConfiguration
,
Convert_v1alpha2_LocalEtcd_To_kubeadm_LocalEtcd
,
Convert_kubeadm_LocalEtcd_To_v1alpha2_LocalEtcd
,
Convert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration
,
...
...
@@ -247,46 +241,6 @@ func Convert_kubeadm_HostPathMount_To_v1alpha2_HostPathMount(in *kubeadm.HostPat
return
autoConvert_kubeadm_HostPathMount_To_v1alpha2_HostPathMount
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha2_KubeProxy_To_kubeadm_KubeProxy
(
in
*
KubeProxy
,
out
*
kubeadm
.
KubeProxy
,
s
conversion
.
Scope
)
error
{
out
.
Config
=
(
*
v1alpha1
.
KubeProxyConfiguration
)(
unsafe
.
Pointer
(
in
.
Config
))
return
nil
}
// Convert_v1alpha2_KubeProxy_To_kubeadm_KubeProxy is an autogenerated conversion function.
func
Convert_v1alpha2_KubeProxy_To_kubeadm_KubeProxy
(
in
*
KubeProxy
,
out
*
kubeadm
.
KubeProxy
,
s
conversion
.
Scope
)
error
{
return
autoConvert_v1alpha2_KubeProxy_To_kubeadm_KubeProxy
(
in
,
out
,
s
)
}
func
autoConvert_kubeadm_KubeProxy_To_v1alpha2_KubeProxy
(
in
*
kubeadm
.
KubeProxy
,
out
*
KubeProxy
,
s
conversion
.
Scope
)
error
{
out
.
Config
=
(
*
v1alpha1
.
KubeProxyConfiguration
)(
unsafe
.
Pointer
(
in
.
Config
))
return
nil
}
// Convert_kubeadm_KubeProxy_To_v1alpha2_KubeProxy is an autogenerated conversion function.
func
Convert_kubeadm_KubeProxy_To_v1alpha2_KubeProxy
(
in
*
kubeadm
.
KubeProxy
,
out
*
KubeProxy
,
s
conversion
.
Scope
)
error
{
return
autoConvert_kubeadm_KubeProxy_To_v1alpha2_KubeProxy
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha2_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
in
*
KubeletConfiguration
,
out
*
kubeadm
.
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
out
.
BaseConfig
=
(
*
v1beta1
.
KubeletConfiguration
)(
unsafe
.
Pointer
(
in
.
BaseConfig
))
return
nil
}
// Convert_v1alpha2_KubeletConfiguration_To_kubeadm_KubeletConfiguration is an autogenerated conversion function.
func
Convert_v1alpha2_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
in
*
KubeletConfiguration
,
out
*
kubeadm
.
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_v1alpha2_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_kubeadm_KubeletConfiguration_To_v1alpha2_KubeletConfiguration
(
in
*
kubeadm
.
KubeletConfiguration
,
out
*
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
out
.
BaseConfig
=
(
*
v1beta1
.
KubeletConfiguration
)(
unsafe
.
Pointer
(
in
.
BaseConfig
))
return
nil
}
// Convert_kubeadm_KubeletConfiguration_To_v1alpha2_KubeletConfiguration is an autogenerated conversion function.
func
Convert_kubeadm_KubeletConfiguration_To_v1alpha2_KubeletConfiguration
(
in
*
kubeadm
.
KubeletConfiguration
,
out
*
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_kubeadm_KubeletConfiguration_To_v1alpha2_KubeletConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha2_LocalEtcd_To_kubeadm_LocalEtcd
(
in
*
LocalEtcd
,
out
*
kubeadm
.
LocalEtcd
,
s
conversion
.
Scope
)
error
{
out
.
Image
=
in
.
Image
out
.
DataDir
=
in
.
DataDir
...
...
@@ -323,15 +277,11 @@ func autoConvert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration(in
if
err
:=
Convert_v1alpha2_API_To_kubeadm_API
(
&
in
.
API
,
&
out
.
API
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_v1alpha2_KubeProxy_To_kubeadm_KubeProxy
(
&
in
.
KubeProxy
,
&
out
.
KubeProxy
,
s
);
err
!=
nil
{
return
err
}
// WARNING: in.KubeProxy requires manual conversion: does not exist in peer-type
if
err
:=
Convert_v1alpha2_Etcd_To_kubeadm_Etcd
(
&
in
.
Etcd
,
&
out
.
Etcd
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_v1alpha2_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
&
in
.
KubeletConfiguration
,
&
out
.
KubeletConfiguration
,
s
);
err
!=
nil
{
return
err
}
// WARNING: in.KubeletConfiguration requires manual conversion: does not exist in peer-type
if
err
:=
Convert_v1alpha2_Networking_To_kubeadm_Networking
(
&
in
.
Networking
,
&
out
.
Networking
,
s
);
err
!=
nil
{
return
err
}
...
...
@@ -354,28 +304,18 @@ func autoConvert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration(in
return
nil
}
// Convert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration is an autogenerated conversion function.
func
Convert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration
(
in
*
MasterConfiguration
,
out
*
kubeadm
.
MasterConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_kubeadm_MasterConfiguration_To_v1alpha2_MasterConfiguration
(
in
*
kubeadm
.
MasterConfiguration
,
out
*
MasterConfiguration
,
s
conversion
.
Scope
)
error
{
out
.
BootstrapTokens
=
*
(
*
[]
BootstrapToken
)(
unsafe
.
Pointer
(
&
in
.
BootstrapTokens
))
if
err
:=
Convert_kubeadm_NodeRegistrationOptions_To_v1alpha2_NodeRegistrationOptions
(
&
in
.
NodeRegistration
,
&
out
.
NodeRegistration
,
s
);
err
!=
nil
{
return
err
}
// WARNING: in.ComponentConfigs requires manual conversion: does not exist in peer-type
if
err
:=
Convert_kubeadm_API_To_v1alpha2_API
(
&
in
.
API
,
&
out
.
API
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_KubeProxy_To_v1alpha2_KubeProxy
(
&
in
.
KubeProxy
,
&
out
.
KubeProxy
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_Etcd_To_v1alpha2_Etcd
(
&
in
.
Etcd
,
&
out
.
Etcd
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_KubeletConfiguration_To_v1alpha2_KubeletConfiguration
(
&
in
.
KubeletConfiguration
,
&
out
.
KubeletConfiguration
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_Networking_To_v1alpha2_Networking
(
&
in
.
Networking
,
&
out
.
Networking
,
s
);
err
!=
nil
{
return
err
}
...
...
@@ -399,11 +339,6 @@ func autoConvert_kubeadm_MasterConfiguration_To_v1alpha2_MasterConfiguration(in
return
nil
}
// Convert_kubeadm_MasterConfiguration_To_v1alpha2_MasterConfiguration is an autogenerated conversion function.
func
Convert_kubeadm_MasterConfiguration_To_v1alpha2_MasterConfiguration
(
in
*
kubeadm
.
MasterConfiguration
,
out
*
MasterConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_kubeadm_MasterConfiguration_To_v1alpha2_MasterConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha2_Networking_To_kubeadm_Networking
(
in
*
Networking
,
out
*
kubeadm
.
Networking
,
s
conversion
.
Scope
)
error
{
out
.
ServiceSubnet
=
in
.
ServiceSubnet
out
.
PodSubnet
=
in
.
PodSubnet
...
...
cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD
View file @
5e6be9de
...
...
@@ -4,6 +4,7 @@ go_library(
name = "go_default_library",
srcs = [
"bootstraptokenstring.go",
"conversion.go",
"defaults.go",
"defaults_unix.go",
"defaults_windows.go",
...
...
@@ -19,8 +20,10 @@ go_library(
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//cmd/kubeadm/app/constants:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig/scheme:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library",
"//pkg/util/pointer:go_default_library",
...
...
cmd/kubeadm/app/apis/kubeadm/v1alpha3/zz_generated.conversion.go
View file @
5e6be9de
...
...
@@ -28,8 +28,6 @@ import (
conversion
"k8s.io/apimachinery/pkg/conversion"
runtime
"k8s.io/apimachinery/pkg/runtime"
kubeadm
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
v1beta1
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
v1alpha1
"k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
)
func
init
()
{
...
...
@@ -54,10 +52,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
Convert_kubeadm_ExternalEtcd_To_v1alpha3_ExternalEtcd
,
Convert_v1alpha3_HostPathMount_To_kubeadm_HostPathMount
,
Convert_kubeadm_HostPathMount_To_v1alpha3_HostPathMount
,
Convert_v1alpha3_KubeProxy_To_kubeadm_KubeProxy
,
Convert_kubeadm_KubeProxy_To_v1alpha3_KubeProxy
,
Convert_v1alpha3_KubeletConfiguration_To_kubeadm_KubeletConfiguration
,
Convert_kubeadm_KubeletConfiguration_To_v1alpha3_KubeletConfiguration
,
Convert_v1alpha3_LocalEtcd_To_kubeadm_LocalEtcd
,
Convert_kubeadm_LocalEtcd_To_v1alpha3_LocalEtcd
,
Convert_v1alpha3_MasterConfiguration_To_kubeadm_MasterConfiguration
,
...
...
@@ -247,46 +241,6 @@ func Convert_kubeadm_HostPathMount_To_v1alpha3_HostPathMount(in *kubeadm.HostPat
return
autoConvert_kubeadm_HostPathMount_To_v1alpha3_HostPathMount
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha3_KubeProxy_To_kubeadm_KubeProxy
(
in
*
KubeProxy
,
out
*
kubeadm
.
KubeProxy
,
s
conversion
.
Scope
)
error
{
out
.
Config
=
(
*
v1alpha1
.
KubeProxyConfiguration
)(
unsafe
.
Pointer
(
in
.
Config
))
return
nil
}
// Convert_v1alpha3_KubeProxy_To_kubeadm_KubeProxy is an autogenerated conversion function.
func
Convert_v1alpha3_KubeProxy_To_kubeadm_KubeProxy
(
in
*
KubeProxy
,
out
*
kubeadm
.
KubeProxy
,
s
conversion
.
Scope
)
error
{
return
autoConvert_v1alpha3_KubeProxy_To_kubeadm_KubeProxy
(
in
,
out
,
s
)
}
func
autoConvert_kubeadm_KubeProxy_To_v1alpha3_KubeProxy
(
in
*
kubeadm
.
KubeProxy
,
out
*
KubeProxy
,
s
conversion
.
Scope
)
error
{
out
.
Config
=
(
*
v1alpha1
.
KubeProxyConfiguration
)(
unsafe
.
Pointer
(
in
.
Config
))
return
nil
}
// Convert_kubeadm_KubeProxy_To_v1alpha3_KubeProxy is an autogenerated conversion function.
func
Convert_kubeadm_KubeProxy_To_v1alpha3_KubeProxy
(
in
*
kubeadm
.
KubeProxy
,
out
*
KubeProxy
,
s
conversion
.
Scope
)
error
{
return
autoConvert_kubeadm_KubeProxy_To_v1alpha3_KubeProxy
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha3_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
in
*
KubeletConfiguration
,
out
*
kubeadm
.
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
out
.
BaseConfig
=
(
*
v1beta1
.
KubeletConfiguration
)(
unsafe
.
Pointer
(
in
.
BaseConfig
))
return
nil
}
// Convert_v1alpha3_KubeletConfiguration_To_kubeadm_KubeletConfiguration is an autogenerated conversion function.
func
Convert_v1alpha3_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
in
*
KubeletConfiguration
,
out
*
kubeadm
.
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_v1alpha3_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_kubeadm_KubeletConfiguration_To_v1alpha3_KubeletConfiguration
(
in
*
kubeadm
.
KubeletConfiguration
,
out
*
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
out
.
BaseConfig
=
(
*
v1beta1
.
KubeletConfiguration
)(
unsafe
.
Pointer
(
in
.
BaseConfig
))
return
nil
}
// Convert_kubeadm_KubeletConfiguration_To_v1alpha3_KubeletConfiguration is an autogenerated conversion function.
func
Convert_kubeadm_KubeletConfiguration_To_v1alpha3_KubeletConfiguration
(
in
*
kubeadm
.
KubeletConfiguration
,
out
*
KubeletConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_kubeadm_KubeletConfiguration_To_v1alpha3_KubeletConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha3_LocalEtcd_To_kubeadm_LocalEtcd
(
in
*
LocalEtcd
,
out
*
kubeadm
.
LocalEtcd
,
s
conversion
.
Scope
)
error
{
out
.
Image
=
in
.
Image
out
.
DataDir
=
in
.
DataDir
...
...
@@ -323,15 +277,11 @@ func autoConvert_v1alpha3_MasterConfiguration_To_kubeadm_MasterConfiguration(in
if
err
:=
Convert_v1alpha3_API_To_kubeadm_API
(
&
in
.
API
,
&
out
.
API
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_v1alpha3_KubeProxy_To_kubeadm_KubeProxy
(
&
in
.
KubeProxy
,
&
out
.
KubeProxy
,
s
);
err
!=
nil
{
return
err
}
// WARNING: in.KubeProxy requires manual conversion: does not exist in peer-type
if
err
:=
Convert_v1alpha3_Etcd_To_kubeadm_Etcd
(
&
in
.
Etcd
,
&
out
.
Etcd
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_v1alpha3_KubeletConfiguration_To_kubeadm_KubeletConfiguration
(
&
in
.
KubeletConfiguration
,
&
out
.
KubeletConfiguration
,
s
);
err
!=
nil
{
return
err
}
// WARNING: in.KubeletConfiguration requires manual conversion: does not exist in peer-type
if
err
:=
Convert_v1alpha3_Networking_To_kubeadm_Networking
(
&
in
.
Networking
,
&
out
.
Networking
,
s
);
err
!=
nil
{
return
err
}
...
...
@@ -354,28 +304,18 @@ func autoConvert_v1alpha3_MasterConfiguration_To_kubeadm_MasterConfiguration(in
return
nil
}
// Convert_v1alpha3_MasterConfiguration_To_kubeadm_MasterConfiguration is an autogenerated conversion function.
func
Convert_v1alpha3_MasterConfiguration_To_kubeadm_MasterConfiguration
(
in
*
MasterConfiguration
,
out
*
kubeadm
.
MasterConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_v1alpha3_MasterConfiguration_To_kubeadm_MasterConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_kubeadm_MasterConfiguration_To_v1alpha3_MasterConfiguration
(
in
*
kubeadm
.
MasterConfiguration
,
out
*
MasterConfiguration
,
s
conversion
.
Scope
)
error
{
out
.
BootstrapTokens
=
*
(
*
[]
BootstrapToken
)(
unsafe
.
Pointer
(
&
in
.
BootstrapTokens
))
if
err
:=
Convert_kubeadm_NodeRegistrationOptions_To_v1alpha3_NodeRegistrationOptions
(
&
in
.
NodeRegistration
,
&
out
.
NodeRegistration
,
s
);
err
!=
nil
{
return
err
}
// WARNING: in.ComponentConfigs requires manual conversion: does not exist in peer-type
if
err
:=
Convert_kubeadm_API_To_v1alpha3_API
(
&
in
.
API
,
&
out
.
API
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_KubeProxy_To_v1alpha3_KubeProxy
(
&
in
.
KubeProxy
,
&
out
.
KubeProxy
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_Etcd_To_v1alpha3_Etcd
(
&
in
.
Etcd
,
&
out
.
Etcd
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_KubeletConfiguration_To_v1alpha3_KubeletConfiguration
(
&
in
.
KubeletConfiguration
,
&
out
.
KubeletConfiguration
,
s
);
err
!=
nil
{
return
err
}
if
err
:=
Convert_kubeadm_Networking_To_v1alpha3_Networking
(
&
in
.
Networking
,
&
out
.
Networking
,
s
);
err
!=
nil
{
return
err
}
...
...
@@ -399,11 +339,6 @@ func autoConvert_kubeadm_MasterConfiguration_To_v1alpha3_MasterConfiguration(in
return
nil
}
// Convert_kubeadm_MasterConfiguration_To_v1alpha3_MasterConfiguration is an autogenerated conversion function.
func
Convert_kubeadm_MasterConfiguration_To_v1alpha3_MasterConfiguration
(
in
*
kubeadm
.
MasterConfiguration
,
out
*
MasterConfiguration
,
s
conversion
.
Scope
)
error
{
return
autoConvert_kubeadm_MasterConfiguration_To_v1alpha3_MasterConfiguration
(
in
,
out
,
s
)
}
func
autoConvert_v1alpha3_Networking_To_kubeadm_Networking
(
in
*
Networking
,
out
*
kubeadm
.
Networking
,
s
conversion
.
Scope
)
error
{
out
.
ServiceSubnet
=
in
.
ServiceSubnet
out
.
PodSubnet
=
in
.
PodSubnet
...
...
cmd/kubeadm/app/apis/kubeadm/validation/BUILD
View file @
5e6be9de
...
...
@@ -12,11 +12,8 @@ go_library(
"//cmd/kubeadm/app/util:go_default_library",
"//pkg/apis/core/validation:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/validation:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig/scheme:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig/validation:go_default_library",
"//pkg/registry/core/service/ipallocator:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
...
...
@@ -34,8 +31,8 @@ go_test(
embed = [":go_default_library"],
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//pkg/kubelet/apis/kubeletconfig
/v1beta1
:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig
/v1alpha1
:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/proxy/apis/kubeproxyconfig:go_default_library",
"//pkg/util/pointer:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
...
...
cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go
View file @
5e6be9de
...
...
@@ -24,8 +24,8 @@ import (
corev1
"k8s.io/api/core/v1"
v1
"k8s.io/apimachinery/pkg/apis/meta/v1"
runtime
"k8s.io/apimachinery/pkg/runtime"
v1beta1
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1
"
v1alpha1
"k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1
"
kubeletconfig
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig
"
kubeproxyconfig
"k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig
"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
...
...
@@ -122,6 +122,32 @@ func (in *BootstrapTokenString) DeepCopy() *BootstrapTokenString {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
ComponentConfigs
)
DeepCopyInto
(
out
*
ComponentConfigs
)
{
*
out
=
*
in
if
in
.
Kubelet
!=
nil
{
in
,
out
:=
&
in
.
Kubelet
,
&
out
.
Kubelet
*
out
=
new
(
kubeletconfig
.
KubeletConfiguration
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
if
in
.
KubeProxy
!=
nil
{
in
,
out
:=
&
in
.
KubeProxy
,
&
out
.
KubeProxy
*
out
=
new
(
kubeproxyconfig
.
KubeProxyConfiguration
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentConfigs.
func
(
in
*
ComponentConfigs
)
DeepCopy
()
*
ComponentConfigs
{
if
in
==
nil
{
return
nil
}
out
:=
new
(
ComponentConfigs
)
in
.
DeepCopyInto
(
out
)
return
out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
Etcd
)
DeepCopyInto
(
out
*
Etcd
)
{
*
out
=
*
in
if
in
.
Local
!=
nil
{
...
...
@@ -185,48 +211,6 @@ func (in *HostPathMount) DeepCopy() *HostPathMount {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
KubeProxy
)
DeepCopyInto
(
out
*
KubeProxy
)
{
*
out
=
*
in
if
in
.
Config
!=
nil
{
in
,
out
:=
&
in
.
Config
,
&
out
.
Config
*
out
=
new
(
v1alpha1
.
KubeProxyConfiguration
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeProxy.
func
(
in
*
KubeProxy
)
DeepCopy
()
*
KubeProxy
{
if
in
==
nil
{
return
nil
}
out
:=
new
(
KubeProxy
)
in
.
DeepCopyInto
(
out
)
return
out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
KubeletConfiguration
)
DeepCopyInto
(
out
*
KubeletConfiguration
)
{
*
out
=
*
in
if
in
.
BaseConfig
!=
nil
{
in
,
out
:=
&
in
.
BaseConfig
,
&
out
.
BaseConfig
*
out
=
new
(
v1beta1
.
KubeletConfiguration
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubeletConfiguration.
func
(
in
*
KubeletConfiguration
)
DeepCopy
()
*
KubeletConfiguration
{
if
in
==
nil
{
return
nil
}
out
:=
new
(
KubeletConfiguration
)
in
.
DeepCopyInto
(
out
)
return
out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
LocalEtcd
)
DeepCopyInto
(
out
*
LocalEtcd
)
{
*
out
=
*
in
if
in
.
ExtraArgs
!=
nil
{
...
...
@@ -271,10 +255,9 @@ func (in *MasterConfiguration) DeepCopyInto(out *MasterConfiguration) {
}
}
in
.
NodeRegistration
.
DeepCopyInto
(
&
out
.
NodeRegistration
)
in
.
ComponentConfigs
.
DeepCopyInto
(
&
out
.
ComponentConfigs
)
out
.
API
=
in
.
API
in
.
KubeProxy
.
DeepCopyInto
(
&
out
.
KubeProxy
)
in
.
Etcd
.
DeepCopyInto
(
&
out
.
Etcd
)
in
.
KubeletConfiguration
.
DeepCopyInto
(
&
out
.
KubeletConfiguration
)
out
.
Networking
=
in
.
Networking
if
in
.
APIServerExtraArgs
!=
nil
{
in
,
out
:=
&
in
.
APIServerExtraArgs
,
&
out
.
APIServerExtraArgs
...
...
cmd/kubeadm/app/phases/kubelet/BUILD
View file @
5e6be9de
...
...
@@ -18,6 +18,7 @@ go_library(
"//cmd/kubeadm/app/util:go_default_library",
"//cmd/kubeadm/app/util/apiclient:go_default_library",
"//pkg/apis/rbac/v1:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library",
"//pkg/util/initsystem:go_default_library",
...
...
@@ -46,7 +47,7 @@ go_test(
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/kubelet/apis/kubeletconfig
/v1beta1
:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/util/version:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1: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