Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "--selinux-enabled" flag for Docker #9334

Merged
merged 4 commits into from
Jun 16, 2020
Merged

Add "--selinux-enabled" flag for Docker #9334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51ebd18
Add "--selinux-enabled" flag for Docker
Jun 11, 2020
1bd7f63
Update override flag for Docker SELinux
Jun 11, 2020
0b1f01b
Set the default log level for Docker to "info"
Jun 11, 2020
d888b1f
Update integration tests
Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/dockerconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/dockerconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions pkg/commands/set_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,15 @@ func SetClusterFields(fields []string, cluster *api.Cluster, instanceGroups []*a
cluster.Spec.Kubelet.AuthenticationTokenWebhook = &v
case "cluster.spec.nodePortAccess":
cluster.Spec.NodePortAccess = append(cluster.Spec.NodePortAccess, kv[1])
case "spec.docker.execOpt":
case "spec.docker.selinuxEnabled":
v, err := strconv.ParseBool(kv[1])
if err != nil {
return fmt.Errorf("unknown boolean value: %q", kv[1])
}
if cluster.Spec.Docker == nil {
cluster.Spec.Docker = &api.DockerConfig{}
}
cluster.Spec.Docker.ExecOpt = append(cluster.Spec.Docker.ExecOpt, kv[1])
cluster.Spec.Docker.SelinuxEnabled = &v
case "spec.kubernetesVersion":
cluster.Spec.KubernetesVersion = kv[1]
case "spec.masterPublicName":
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec.Docker.LogOpt = append(clusterSpec.Docker.LogOpt, "max-file=5")
}

docker.LogLevel = fi.String("warn")
docker.LogLevel = fi.String("info")
docker.IPTables = fi.Bool(false)
docker.IPMasq = fi.Bool(false)

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersadditionalcidrexamplecom.Prop
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -453,7 +453,7 @@ Resources.AWSEC2LaunchTemplatenodesadditionalcidrexamplecom.Properties.LaunchTem
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...r/data/aws_launch_template_master-us-test-1a.masters.additionalcidr.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...r/data/aws_launch_template_master-us-test-1b.masters.additionalcidr.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...r/data/aws_launch_template_master-us-test-1c.masters.additionalcidr.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...uster/additional_cidr/data/aws_launch_template_nodes.additionalcidr.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersadditionaluserdataexamplecom.
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -482,7 +482,7 @@ Resources.AWSEC2LaunchTemplatenodesadditionaluserdataexamplecom.Properties.Launc
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...s_zone/data/aws_launch_template_master-us-test-1a.masters.crosszone.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...cluster/api_elb_cross_zone/data/aws_launch_template_nodes.crosszone.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -455,7 +455,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion .../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -453,7 +453,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -453,7 +453,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...le_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...le_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...le_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/update_cluster/launch_templates/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -455,7 +455,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -760,7 +760,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -1065,7 +1065,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom.Proper
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion .../aws_launch_configuration_master-us-test-1a.masters.launchtemplates.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion .../aws_launch_configuration_master-us-test-1b.masters.launchtemplates.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion .../aws_launch_configuration_master-us-test-1c.masters.launchtemplates.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
2 changes: 1 addition & 1 deletion ...aunch_templates/data/aws_launch_configuration_nodes.launchtemplates.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ docker:
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down Expand Up @@ -453,7 +453,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
ipMasq: false
ipTables: false
logDriver: json-file
logLevel: warn
logLevel: info
logOpt:
- max-size=10m
- max-file=5
Expand Down
Loading