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

Merge pull request #5357 from gambol99/docker_userns_remap 

Docker Userspace Remapping Options
This commit is contained in:
k8s-ci-robot 2018-06-22 02:17:05 -07:00 committed by GitHub
parent 688d351131 2c7a4d2d97
commit 3489ea317e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 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

@ -50,6 +50,8 @@ type DockerConfig struct {
Storage *string `json:"storage,omitempty" flag:"storage-driver"` Storage *string `json:"storage,omitempty" flag:"storage-driver"`
// StorageOpts is a series of options passed to the storage driver // StorageOpts is a series of options passed to the storage driver
StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"` StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
// UserNamespaceRemap sets the user namespace remapping option for the docker daemon
UserNamespaceRemap string `json:"userNamespaceRemap,omitempty" flag:"userns-remap"`
// Version is consumed by the nodeup and used to pick the docker version // Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"` Version *string `json:"version,omitempty"`
} }

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

@ -50,6 +50,8 @@ type DockerConfig struct {
Storage *string `json:"storage,omitempty" flag:"storage-driver"` Storage *string `json:"storage,omitempty" flag:"storage-driver"`
// StorageOpts is a series of options passed to the storage driver // StorageOpts is a series of options passed to the storage driver
StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"` StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
// UserNamespaceRemap sets the user namespace remapping option for the docker daemon
UserNamespaceRemap string `json:"userNamespaceRemap,omitempty" flag:"userns-remap"`
// Version is consumed by the nodeup and used to pick the docker version // Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"` Version *string `json:"version,omitempty"`
} }

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

@ -1350,6 +1350,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.RegistryMirrors = in.RegistryMirrors out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage out.Storage = in.Storage
out.StorageOpts = in.StorageOpts out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
out.Version = in.Version out.Version = in.Version
return nil return nil
} }
@ -1378,6 +1379,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
out.RegistryMirrors = in.RegistryMirrors out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage out.Storage = in.Storage
out.StorageOpts = in.StorageOpts out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
out.Version = in.Version out.Version = in.Version
return nil return nil
} }

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

@ -50,6 +50,8 @@ type DockerConfig struct {
Storage *string `json:"storage,omitempty" flag:"storage-driver"` Storage *string `json:"storage,omitempty" flag:"storage-driver"`
// StorageOpts is a series of options passed to the storage driver // StorageOpts is a series of options passed to the storage driver
StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"` StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
// UserNamespaceRemap sets the user namespace remapping option for the docker daemon
UserNamespaceRemap string `json:"userNamespaceRemap,omitempty" flag:"userns-remap"`
// Version is consumed by the nodeup and used to pick the docker version // Version is consumed by the nodeup and used to pick the docker version
Version *string `json:"version,omitempty"` Version *string `json:"version,omitempty"`
} }

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

@ -1451,6 +1451,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.RegistryMirrors = in.RegistryMirrors out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage out.Storage = in.Storage
out.StorageOpts = in.StorageOpts out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
out.Version = in.Version out.Version = in.Version
return nil return nil
} }
@ -1479,6 +1480,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
out.RegistryMirrors = in.RegistryMirrors out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage out.Storage = in.Storage
out.StorageOpts = in.StorageOpts out.StorageOpts = in.StorageOpts
out.UserNamespaceRemap = in.UserNamespaceRemap
out.Version = in.Version out.Version = in.Version
return nil return nil
} }