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

Add nodeSelector to e2e storage testing pods

Browse Source 
Signed-off-by: torredil <torredil@amazon.com>
This commit is contained in:
torredil 2023-02-06 16:00:51 +00:00
parent c4ebbeeb74
commit 25389ee0ee
No known key found for this signature in database
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
}

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

@ -165,15 +165,16 @@ func (p *provisioningTestSuite) DefineTests(driver storageframework.TestDriver,
}, l.config.Framework.Namespace.Name)
framework.Logf("In creating storage class object and pvc objects for driver - sc: %v, pvc: %v, src-pvc: %v", l.sc, l.pvc, l.sourcePVC)
l.testCase = &StorageClassTest{
Client: l.config.Framework.ClientSet,
Timeouts: f.Timeouts,
Claim: l.pvc,
SourceClaim: l.sourcePVC,
Class: l.sc,
Provisioner: l.sc.Provisioner,
ClaimSize: claimSize,
ExpectedSize: claimSize,
VolumeMode: pattern.VolMode,
Client: l.config.Framework.ClientSet,
Timeouts: f.Timeouts,
Claim: l.pvc,
SourceClaim: l.sourcePVC,
Class: l.sc,
Provisioner: l.sc.Provisioner,
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(),
}