mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #17577 from swagiaal/fix-emptydir-e2e
Auto commit by PR queue bot
This commit is contained in:
commit
eb0e25f5bd
@ -132,7 +132,6 @@ func doTestSetgidFSGroup(f *Framework, image string, medium api.StorageMedium) {
|
|||||||
fmt.Sprintf("--file_owner=%v", filePath),
|
fmt.Sprintf("--file_owner=%v", filePath),
|
||||||
}
|
}
|
||||||
|
|
||||||
pod.Spec.SecurityContext = &api.PodSecurityContext{}
|
|
||||||
fsGroup := int64(123)
|
fsGroup := int64(123)
|
||||||
pod.Spec.SecurityContext.FSGroup = &fsGroup
|
pod.Spec.SecurityContext.FSGroup = &fsGroup
|
||||||
|
|
||||||
@ -161,7 +160,7 @@ func doTestVolumeModeFSGroup(f *Framework, image string, medium api.StorageMediu
|
|||||||
}
|
}
|
||||||
|
|
||||||
fsGroup := int64(1001)
|
fsGroup := int64(1001)
|
||||||
pod.Spec.SecurityContext = &api.PodSecurityContext{FSGroup: &fsGroup}
|
pod.Spec.SecurityContext.FSGroup = &fsGroup
|
||||||
|
|
||||||
msg := fmt.Sprintf("emptydir volume type on %v", formatMedium(medium))
|
msg := fmt.Sprintf("emptydir volume type on %v", formatMedium(medium))
|
||||||
out := []string{
|
out := []string{
|
||||||
@ -187,7 +186,6 @@ func doTest0644FSGroup(f *Framework, image string, medium api.StorageMedium) {
|
|||||||
fmt.Sprintf("--file_perm=%v", filePath),
|
fmt.Sprintf("--file_perm=%v", filePath),
|
||||||
}
|
}
|
||||||
|
|
||||||
pod.Spec.SecurityContext = &api.PodSecurityContext{}
|
|
||||||
fsGroup := int64(123)
|
fsGroup := int64(123)
|
||||||
pod.Spec.SecurityContext.FSGroup = &fsGroup
|
pod.Spec.SecurityContext.FSGroup = &fsGroup
|
||||||
|
|
||||||
@ -330,6 +328,11 @@ func testPodWithVolume(image, path string, source *api.EmptyDirVolumeSource) *ap
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
SecurityContext: &api.PodSecurityContext{
|
||||||
|
SELinuxOptions: &api.SELinuxOptions{
|
||||||
|
Level: "s0",
|
||||||
|
},
|
||||||
|
},
|
||||||
RestartPolicy: api.RestartPolicyNever,
|
RestartPolicy: api.RestartPolicyNever,
|
||||||
Volumes: []api.Volume{
|
Volumes: []api.Volume{
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user