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

Merge pull request #4169 from GrupoZapVivaReal/master 

Add live-restore flag to docker config
This commit is contained in:
k8s-ci-robot 2018-02-13 07:12:49 -08:00 committed by GitHub
parent 7015e1f4ad fa2a69dc08
commit 9ca765932f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,4 +48,6 @@ type DockerConfig struct {
StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
// Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"`
// LiveRestore enables live restore of docker when containers are still running
LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
}

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

@ -48,4 +48,6 @@ type DockerConfig struct {
StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
// Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"`
// LiveRestore enables live restore of docker when containers are still running
LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
}

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

@ -1145,6 +1145,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.Version = in.Version
out.LiveRestore = in.LiveRestore
return nil
}
@ -1171,6 +1172,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.Version = in.Version
out.LiveRestore = in.LiveRestore
return nil
}

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

@ -984,6 +984,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
**out = **in
}
}
if in.LiveRestore != nil {
in, out := &in.LiveRestore, &out.LiveRestore
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
return
}

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

@ -48,4 +48,6 @@ type DockerConfig struct {
StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
// Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"`
// LiveRestore enables live restore of docker when containers are still running
LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
}

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

@ -1244,6 +1244,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.Version = in.Version
out.LiveRestore = in.LiveRestore
return nil
}
@ -1270,6 +1271,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
out.Version = in.Version
out.LiveRestore = in.LiveRestore
return nil
}

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

@ -978,6 +978,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
**out = **in
}
}
if in.LiveRestore != nil {
in, out := &in.LiveRestore, &out.LiveRestore
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
return
}

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

@ -1097,6 +1097,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
**out = **in
}
}
if in.LiveRestore != nil {
in, out := &in.LiveRestore, &out.LiveRestore
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
return
}