Add "--selinux-enabled" flag for Docker

This commit is contained in:
Ciprian Hacman 2020-06-11 12:45:58 +03:00
parent eedd4af438
commit 51ebd187f0
6 changed files with 19 additions and 0 deletions

View File

@ -555,6 +555,9 @@ spec:
items:
type: string
type: array
selinuxEnabled:
description: SelinuxEnabled enables SELinux support
type: boolean
skipInstall:
description: SkipInstall when set to true will prevent kops from
installing and modifying Docker in any way

View File

@ -60,6 +60,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"`
// SelinuxEnabled enables SELinux support
SelinuxEnabled *bool `json:"selinuxEnabled,omitempty" flag:"selinux-enabled"`
// 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

View File

@ -60,6 +60,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"`
// SelinuxEnabled enables SELinux support
SelinuxEnabled *bool `json:"selinuxEnabled,omitempty" flag:"selinux-enabled"`
// 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

View File

@ -2566,6 +2566,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.SelinuxEnabled = in.SelinuxEnabled
out.SkipInstall = in.SkipInstall
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts
@ -2601,6 +2602,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.SelinuxEnabled = in.SelinuxEnabled
out.SkipInstall = in.SkipInstall
out.Storage = in.Storage
out.StorageOpts = in.StorageOpts

View File

@ -1108,6 +1108,11 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.SelinuxEnabled != nil {
in, out := &in.SelinuxEnabled, &out.SelinuxEnabled
*out = new(bool)
**out = **in
}
if in.Storage != nil {
in, out := &in.Storage, &out.Storage
*out = new(string)

View File

@ -1231,6 +1231,11 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.SelinuxEnabled != nil {
in, out := &in.SelinuxEnabled, &out.SelinuxEnabled
*out = new(bool)
**out = **in
}
if in.Storage != nil {
in, out := &in.Storage, &out.Storage
*out = new(string)