github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100540 from mauriciopoppe/remove-selinuxoptions

Browse Source 
Remove SELinuxOptions double setup in pod spec
This commit is contained in:
Kubernetes Prow Robot 2021-03-24 18:01:28 -07:00 committed by GitHub
commit bcab4c35d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/framework/pod/create.go
View File

@ -249,9 +249,6 @@ func MakePodSpec(podConfig *Config) *v1.PodSpec {
podSpec.Containers[0].VolumeMounts = volumeMounts podSpec.Containers[0].VolumeMounts = volumeMounts
podSpec.Containers[0].VolumeDevices = volumeDevices podSpec.Containers[0].VolumeDevices = volumeDevices
podSpec.Volumes = volumes podSpec.Volumes = volumes
if runtime.GOOS != "windows" {
podSpec.SecurityContext.SELinuxOptions = podConfig.SeLinuxLabel
}
SetNodeSelection(podSpec, podConfig.NodeSelection) SetNodeSelection(podSpec, podConfig.NodeSelection)
return podSpec return podSpec