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

Jump to bottom

Update e2e storage tests for Windows cluster #93589

Merged
merged 1 commit into from Aug 2, 2020
Merged

Update e2e storage tests for Windows cluster #93589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions test/e2e/framework/pod/create.go
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ package pod
import (
"context"
"fmt"
"runtime"
"time"

v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions test/e2e/storage/testpatterns/testpattern.go
View file
Open in desktop
Expand Up @@ -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
Expand Down