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

Update e2e storage tests for Windows cluster

Browse Source 
This PR fixes a few things for e2e storage suite to run on Windows
cluster.
1. increaes timeout due to longer pod startup time for windows
2. Only set SELinuxOptions or fsGroup if os is not windows
3. Add VolumeSnapshot delete policy for windows3. Add VolumeSnapshot
delete policy for windows3. Add VolumeSnapshot delete policy for windows
This commit is contained in:
Jing Xu 2020-07-30 15:54:46 -07:00
parent d3c1e81d5e
commit 015f2998e5
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ package pod
import (
"context"
"fmt"
"runtime"
"time"
v1 "k8s.io/api/core/v1"
@ -179,7 +180,7 @@ func MakeSecPod(podConfig *Config) (*v1.Pod, error) {
podConfig.Command = "trap exit TERM; while true; do sleep 1; done"
}
podName := "pod-" + string(uuid.NewUUID())
if podConfig.FsGroup == nil {
if podConfig.FsGroup == nil && runtime.GOOS != "windows" {
podConfig.FsGroup = func(i int64) *int64 {
return &i
}(1000)
@ -239,7 +240,9 @@ func MakeSecPod(podConfig *Config) (*v1.Pod, error) {
podSpec.Spec.Containers[0].VolumeMounts = volumeMounts
podSpec.Spec.Containers[0].VolumeDevices = volumeDevices
podSpec.Spec.Volumes = volumes
podSpec.Spec.SecurityContext.SELinuxOptions = podConfig.SeLinuxLabel
if runtime.GOOS != "windows" {
podSpec.Spec.SecurityContext.SELinuxOptions = podConfig.SeLinuxLabel
}
SetNodeSelection(&podSpec.Spec, podConfig.NodeSelection)
return podSpec, nil

11
test/e2e/storage/testpatterns/testpattern.go
View File

@ -248,12 +248,13 @@ var (
FsType: "ntfs",
FeatureTag: "[sig-windows]",
}
// NtfsDynamicPV is TestPattern for "Dynamic PV (xfs)"
// NtfsDynamicPV is TestPattern for "Dynamic PV (ntfs)"
NtfsDynamicPV = TestPattern{
Name: "Dynamic PV (ntfs)",
VolType: DynamicPV,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
Name: "Dynamic PV (ntfs)",
VolType: DynamicPV,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
SnapshotDeletionPolicy: DeleteSnapshot,
}
// Definitions for Filesystem volume mode