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

Merge pull request #115443 from torredil/master

Browse Source 
Add windows nodeSelector to e2e storage testing pods
This commit is contained in:
Kubernetes Prow Robot 2023-02-06 18:27:09 -08:00 committed by GitHub
commit e944fc28ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/storage/external/external.go vendored
View File

@ -422,5 +422,12 @@ func (d *driverDefinition) PrepareTest(ctx context.Context, f *framework.Framewo
Framework: f,
ClientNodeSelection: e2epod.NodeSelection{Name: d.ClientNodeName},
}
if framework.NodeOSDistroIs("windows") {
e2econfig.ClientNodeSelection.Selector = map[string]string{"kubernetes.io/os": "windows"}
} else {
e2econfig.ClientNodeSelection.Selector = map[string]string{"kubernetes.io/os": "linux"}
}
return e2econfig
}

1
test/e2e/storage/testsuites/provisioning.go
View File

@ -174,6 +174,7 @@ func (p *provisioningTestSuite) DefineTests(driver storageframework.TestDriver,
ClaimSize: claimSize,
ExpectedSize: claimSize,
VolumeMode: pattern.VolMode,
NodeSelection: l.config.ClientNodeSelection,
}
}

2
test/e2e/storage/testsuites/topology.go
View File

@ -325,7 +325,7 @@ func (t *topologyTestSuite) createResources(ctx context.Context, cs clientset.In
podConfig := e2epod.Config{
NS: l.config.Framework.Namespace.Name,
PVCs: []*v1.PersistentVolumeClaim{l.resource.Pvc},
NodeSelection: e2epod.NodeSelection{Affinity: affinity},
NodeSelection: e2epod.NodeSelection{Affinity: affinity, Selector: l.config.ClientNodeSelection.Selector},
SeLinuxLabel: e2epod.GetLinuxLabel(),
ImageID: e2epod.GetDefaultTestImageID(),
}