kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move SkipInstall to DockerConfig

This commit is contained in:
Austin Moore 2019-09-17 11:55:08 -04:00
parent 3175ade73f
commit 4695e7d03c
No known key found for this signature in database
GPG Key ID: 41FC800520D33749
13 changed files with 25 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nodeup/pkg/model/docker.go
View File

@ -788,10 +788,8 @@ func (b *DockerBuilder) dockerVersion() string {
// Build is responsible for configuring the docker daemon
func (b *DockerBuilder) Build(c *fi.ModelBuilderContext) error {
di := b.Cluster.Spec.DockerInstall
if di != nil && di.SkipInstall == true {
klog.Infof("SkipDockerInstall is set to true; won't install Docker")
if b.skipInstall() {
klog.Infof("SkipInstall is set to true; won't install Docker")
return nil
}
@ -1149,3 +1147,15 @@ func (b *DockerBuilder) buildSysconfig(c *fi.ModelBuilderContext) error {
return nil
}
// skipInstall determines if kops should skip the installation and configuration of Docker
func (b *DockerBuilder) skipInstall() bool {
d := b.Cluster.Spec.Docker
// don't skip install if the user hasn't specified anything
if d == nil {
return false
}
return d.SkipInstall
}

2
nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml
View File

@ -9,7 +9,7 @@ spec:
channel: stable
cloudProvider: aws
configBase: memfs://clusters.example.com/minimal.example.com
dockerInstall:
docker:
skipInstall: true
etcdClusters:
- etcdMembers:

2
pkg/apis/kops/cluster.go
View File

@ -132,8 +132,6 @@ type ClusterSpec struct {
FileAssets []FileAssetSpec `json:"fileAssets,omitempty"`
// EtcdClusters stores the configuration for each cluster
EtcdClusters []*EtcdClusterSpec `json:"etcdClusters,omitempty"`
// DockerInstall contains configuration for how kops will download and install Docker
DockerInstall *DockerInstallSpec `json:"dockerInstall,omitempty"`
// Component configurations
Docker *DockerConfig `json:"docker,omitempty"`
KubeDNS *KubeDNSConfig `json:"kubeDNS,omitempty"`

7
pkg/apis/kops/dockerconfig.go
View File

@ -56,6 +56,8 @@ type DockerConfig struct {
MTU *int32 `json:"mtu,omitempty" flag:"mtu"`
// RegistryMirrors is a referred list of docker registry mirror
RegistryMirrors []string `json:"registryMirrors,omitempty" flag:"registry-mirror,repeat"`
// SkipInstall when set to true will prevent kops from installing and modifying Docker in any way
SkipInstall bool `json:"skipInstall,omitempty"`
// Storage is the docker storage driver to use
Storage *string `json:"storage,omitempty" flag:"storage-driver"`
// StorageOpts is a series of options passed to the storage driver
@ -65,8 +67,3 @@ type DockerConfig struct {
// Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"`
}
type DockerInstallSpec struct {
// SkipInstall when set to true will prevent kops from installing and modifying Docker in any way
SkipInstall bool `json:"skipInstall,omitempty"`
}

2
pkg/apis/kops/v1alpha1/cluster.go
View File

@ -131,8 +131,6 @@ type ClusterSpec struct {
SSHKeyName string `json:"sshKeyName,omitempty"`
// EtcdClusters stores the configuration for each cluster
EtcdClusters []*EtcdClusterSpec `json:"etcdClusters,omitempty"`
// DockerInstall contains configuration for how kops will download and install Docker
DockerInstall *DockerInstallSpec `json:"dockerInstall,omitempty"`
// Component configurations
Docker *DockerConfig `json:"docker,omitempty"`
KubeDNS *KubeDNSConfig `json:"kubeDNS,omitempty"`

7
pkg/apis/kops/v1alpha1/dockerconfig.go
View File

@ -56,6 +56,8 @@ type DockerConfig struct {
MTU *int32 `json:"mtu,omitempty" flag:"mtu"`
// RegistryMirrors is a referred list of docker registry mirror
RegistryMirrors []string `json:"registryMirrors,omitempty" flag:"registry-mirror,repeat"`
// SkipInstall when set to true will prevent kops from installing and modifying Docker in any way
SkipInstall bool `json:"skipInstall,omitempty"`
// Storage is the docker storage driver to use
Storage *string `json:"storage,omitempty" flag:"storage-driver"`
// StorageOpts is a series of options passed to the storage driver
@ -65,8 +67,3 @@ type DockerConfig struct {
// Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"`
}
type DockerInstallSpec struct {
// SkipInstall when set to true will prevent kops from installing and modifying Docker in any way
SkipInstall bool `json:"skipInstall,omitempty" flag:"skip-docker-install"`
}

50
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -243,16 +243,6 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*DockerInstallSpec)(nil), (*kops.DockerInstallSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha1_DockerInstallSpec_To_kops_DockerInstallSpec(a.(*DockerInstallSpec), b.(*kops.DockerInstallSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*kops.DockerInstallSpec)(nil), (*DockerInstallSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_kops_DockerInstallSpec_To_v1alpha1_DockerInstallSpec(a.(*kops.DockerInstallSpec), b.(*DockerInstallSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*EgressProxySpec)(nil), (*kops.EgressProxySpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha1_EgressProxySpec_To_kops_EgressProxySpec(a.(*EgressProxySpec), b.(*kops.EgressProxySpec), scope)
}); err != nil {
@ -1570,15 +1560,6 @@ func autoConvert_v1alpha1_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
} else {
out.EtcdClusters = nil
}
if in.DockerInstall != nil {
in, out := &in.DockerInstall, &out.DockerInstall
*out = new(kops.DockerInstallSpec)
if err := Convert_v1alpha1_DockerInstallSpec_To_kops_DockerInstallSpec(*in, *out, s); err != nil {
return err
}
} else {
out.DockerInstall = nil
}
if in.Docker != nil {
in, out := &in.Docker, &out.Docker
*out = new(kops.DockerConfig)
@ -1846,15 +1827,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha1_ClusterSpec(in *kops.ClusterSpec,
} else {
out.EtcdClusters = nil
}
if in.DockerInstall != nil {
in, out := &in.DockerInstall, &out.DockerInstall
*out = new(DockerInstallSpec)
if err := Convert_kops_DockerInstallSpec_To_v1alpha1_DockerInstallSpec(*in, *out, s); err != nil {
return err
}
} else {
out.DockerInstall = nil
}
if in.Docker != nil {
in, out := &in.Docker, &out.Docker
*out = new(DockerConfig)
@ -2101,6 +2073,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.SkipInstall = in.SkipInstall
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
@ -2133,6 +2106,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.SkipInstall = in.SkipInstall
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
@ -2145,26 +2119,6 @@ func Convert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfig, o
return autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in, out, s)
}
func autoConvert_v1alpha1_DockerInstallSpec_To_kops_DockerInstallSpec(in *DockerInstallSpec, out *kops.DockerInstallSpec, s conversion.Scope) error {
out.SkipInstall = in.SkipInstall
return nil
}
// Convert_v1alpha1_DockerInstallSpec_To_kops_DockerInstallSpec is an autogenerated conversion function.
func Convert_v1alpha1_DockerInstallSpec_To_kops_DockerInstallSpec(in *DockerInstallSpec, out *kops.DockerInstallSpec, s conversion.Scope) error {
return autoConvert_v1alpha1_DockerInstallSpec_To_kops_DockerInstallSpec(in, out, s)
}
func autoConvert_kops_DockerInstallSpec_To_v1alpha1_DockerInstallSpec(in *kops.DockerInstallSpec, out *DockerInstallSpec, s conversion.Scope) error {
out.SkipInstall = in.SkipInstall
return nil
}
// Convert_kops_DockerInstallSpec_To_v1alpha1_DockerInstallSpec is an autogenerated conversion function.
func Convert_kops_DockerInstallSpec_To_v1alpha1_DockerInstallSpec(in *kops.DockerInstallSpec, out *DockerInstallSpec, s conversion.Scope) error {
return autoConvert_kops_DockerInstallSpec_To_v1alpha1_DockerInstallSpec(in, out, s)
}
func autoConvert_v1alpha1_EgressProxySpec_To_kops_EgressProxySpec(in *EgressProxySpec, out *kops.EgressProxySpec, s conversion.Scope) error {
if err := Convert_v1alpha1_HTTPProxy_To_kops_HTTPProxy(&in.HTTPProxy, &out.HTTPProxy, s); err != nil {
return err

21
pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
View File

@ -654,11 +654,6 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
}
}
}
if in.DockerInstall != nil {
in, out := &in.DockerInstall, &out.DockerInstall
*out = new(DockerInstallSpec)
**out = **in
}
if in.Docker != nil {
in, out := &in.Docker, &out.Docker
*out = new(DockerConfig)
@ -960,22 +955,6 @@ func (in *DockerConfig) DeepCopy() *DockerConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DockerInstallSpec) DeepCopyInto(out *DockerInstallSpec) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerInstallSpec.
func (in *DockerInstallSpec) DeepCopy() *DockerInstallSpec {
if in == nil {
return nil
}
out := new(DockerInstallSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EgressProxySpec) DeepCopyInto(out *EgressProxySpec) {
*out = *in

2
pkg/apis/kops/v1alpha2/cluster.go
View File

@ -132,8 +132,6 @@ type ClusterSpec struct {
FileAssets []FileAssetSpec `json:"fileAssets,omitempty"`
// EtcdClusters stores the configuration for each cluster
EtcdClusters []*EtcdClusterSpec `json:"etcdClusters,omitempty"`
// DockerInstall contains configuration for how kops will download and install Docker
DockerInstall *DockerInstallSpec `json:"dockerInstall,omitempty"`
// Component configurations
Docker *DockerConfig `json:"docker,omitempty"`
KubeDNS *KubeDNSConfig `json:"kubeDNS,omitempty"`

7
pkg/apis/kops/v1alpha2/dockerconfig.go
View File

@ -56,6 +56,8 @@ type DockerConfig struct {
MTU *int32 `json:"mtu,omitempty" flag:"mtu"`
// RegistryMirrors is a referred list of docker registry mirror
RegistryMirrors []string `json:"registryMirrors,omitempty" flag:"registry-mirror,repeat"`
// SkipInstall when set to true will prevent kops from installing and modifying Docker in any way
SkipInstall bool `json:"skipInstall,omitempty"`
// Storage is the docker storage driver to use
Storage *string `json:"storage,omitempty" flag:"storage-driver"`
// StorageOpts is a series of options passed to the storage driver
@ -65,8 +67,3 @@ type DockerConfig struct {
// Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"`
}
type DockerInstallSpec struct {
// SkipInstall when set to true will prevent kops from installing and modifying Docker in any way
SkipInstall bool `json:"skipInstall,omitempty" flag:"skip-docker-install"`
}

50
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -263,16 +263,6 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*DockerInstallSpec)(nil), (*kops.DockerInstallSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_DockerInstallSpec_To_kops_DockerInstallSpec(a.(*DockerInstallSpec), b.(*kops.DockerInstallSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*kops.DockerInstallSpec)(nil), (*DockerInstallSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_kops_DockerInstallSpec_To_v1alpha2_DockerInstallSpec(a.(*kops.DockerInstallSpec), b.(*DockerInstallSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*EgressProxySpec)(nil), (*kops.EgressProxySpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_EgressProxySpec_To_kops_EgressProxySpec(a.(*EgressProxySpec), b.(*kops.EgressProxySpec), scope)
}); err != nil {
@ -1623,15 +1613,6 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
} else {
out.EtcdClusters = nil
}
if in.DockerInstall != nil {
in, out := &in.DockerInstall, &out.DockerInstall
*out = new(kops.DockerInstallSpec)
if err := Convert_v1alpha2_DockerInstallSpec_To_kops_DockerInstallSpec(*in, *out, s); err != nil {
return err
}
} else {
out.DockerInstall = nil
}
if in.Docker != nil {
in, out := &in.Docker, &out.Docker
*out = new(kops.DockerConfig)
@ -1914,15 +1895,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec,
} else {
out.EtcdClusters = nil
}
if in.DockerInstall != nil {
in, out := &in.DockerInstall, &out.DockerInstall
*out = new(DockerInstallSpec)
if err := Convert_kops_DockerInstallSpec_To_v1alpha2_DockerInstallSpec(*in, *out, s); err != nil {
return err
}
} else {
out.DockerInstall = nil
}
if in.Docker != nil {
in, out := &in.Docker, &out.Docker
*out = new(DockerConfig)
@ -2208,6 +2180,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.SkipInstall = in.SkipInstall
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
@ -2240,6 +2213,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.SkipInstall = in.SkipInstall
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
@ -2252,26 +2226,6 @@ func Convert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfig, o
return autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in, out, s)
}
func autoConvert_v1alpha2_DockerInstallSpec_To_kops_DockerInstallSpec(in *DockerInstallSpec, out *kops.DockerInstallSpec, s conversion.Scope) error {
out.SkipInstall = in.SkipInstall
return nil
}
// Convert_v1alpha2_DockerInstallSpec_To_kops_DockerInstallSpec is an autogenerated conversion function.
func Convert_v1alpha2_DockerInstallSpec_To_kops_DockerInstallSpec(in *DockerInstallSpec, out *kops.DockerInstallSpec, s conversion.Scope) error {
return autoConvert_v1alpha2_DockerInstallSpec_To_kops_DockerInstallSpec(in, out, s)
}
func autoConvert_kops_DockerInstallSpec_To_v1alpha2_DockerInstallSpec(in *kops.DockerInstallSpec, out *DockerInstallSpec, s conversion.Scope) error {
out.SkipInstall = in.SkipInstall
return nil
}
// Convert_kops_DockerInstallSpec_To_v1alpha2_DockerInstallSpec is an autogenerated conversion function.
func Convert_kops_DockerInstallSpec_To_v1alpha2_DockerInstallSpec(in *kops.DockerInstallSpec, out *DockerInstallSpec, s conversion.Scope) error {
return autoConvert_kops_DockerInstallSpec_To_v1alpha2_DockerInstallSpec(in, out, s)
}
func autoConvert_v1alpha2_EgressProxySpec_To_kops_EgressProxySpec(in *EgressProxySpec, out *kops.EgressProxySpec, s conversion.Scope) error {
if err := Convert_v1alpha2_HTTPProxy_To_kops_HTTPProxy(&in.HTTPProxy, &out.HTTPProxy, s); err != nil {
return err

21
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View File

@ -627,11 +627,6 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
}
}
}
if in.DockerInstall != nil {
in, out := &in.DockerInstall, &out.DockerInstall
*out = new(DockerInstallSpec)
**out = **in
}
if in.Docker != nil {
in, out := &in.Docker, &out.Docker
*out = new(DockerConfig)
@ -933,22 +928,6 @@ func (in *DockerConfig) DeepCopy() *DockerConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DockerInstallSpec) DeepCopyInto(out *DockerInstallSpec) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerInstallSpec.
func (in *DockerInstallSpec) DeepCopy() *DockerInstallSpec {
if in == nil {
return nil
}
out := new(DockerInstallSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EgressProxySpec) DeepCopyInto(out *EgressProxySpec) {
*out = *in

21
pkg/apis/kops/zz_generated.deepcopy.go
View File

@ -727,11 +727,6 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
}
}
}
if in.DockerInstall != nil {
in, out := &in.DockerInstall, &out.DockerInstall
*out = new(DockerInstallSpec)
**out = **in
}
if in.Docker != nil {
in, out := &in.Docker, &out.Docker
*out = new(DockerConfig)
@ -1056,22 +1051,6 @@ func (in *DockerConfig) DeepCopy() *DockerConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DockerInstallSpec) DeepCopyInto(out *DockerInstallSpec) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerInstallSpec.
func (in *DockerInstallSpec) DeepCopy() *DockerInstallSpec {
if in == nil {
return nil
}
out := new(DockerInstallSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EgressProxySpec) DeepCopyInto(out *EgressProxySpec) {
*out = *in