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

Merge pull request #88314 from bertinatto/remove-node-labels-csimock

Browse Source 
Avoid adding labels to nodes in CSI mock driver
This commit is contained in:
Kubernetes Prow Robot 2020-02-24 19:07:15 -08:00 committed by GitHub
commit 74c0fca37e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/e2e/storage/csi_mock_volume.go
View File

@ -64,7 +64,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
registerDriver bool registerDriver bool
podInfo *bool podInfo *bool
scName string scName string
nodeSelectorKey string
enableResizing bool // enable resizing for both CSI mock driver and storageClass. enableResizing bool // enable resizing for both CSI mock driver and storageClass.
enableNodeExpansion bool // enable node expansion for CSI mock driver enableNodeExpansion bool // enable node expansion for CSI mock driver
// just disable resizing on driver it overrides enableResizing flag for CSI mock driver // just disable resizing on driver it overrides enableResizing flag for CSI mock driver
@ -79,7 +78,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
pvcs []*v1.PersistentVolumeClaim pvcs []*v1.PersistentVolumeClaim
sc map[string]*storagev1.StorageClass sc map[string]*storagev1.StorageClass
driver testsuites.TestDriver driver testsuites.TestDriver
nodeLabel map[string]string
provisioner string provisioner string
tp testParameters tp testParameters
} }
@ -116,13 +114,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
m.config = config m.config = config
m.provisioner = config.GetUniqueDriverName() m.provisioner = config.GetUniqueDriverName()
if tp.nodeSelectorKey != "" {
framework.AddOrUpdateLabelOnNode(m.cs, m.config.ClientNodeSelection.Name, tp.nodeSelectorKey, f.Namespace.Name)
m.nodeLabel = map[string]string{
tp.nodeSelectorKey: f.Namespace.Name,
}
}
if tp.registerDriver { if tp.registerDriver {
err = waitForCSIDriver(cs, m.config.GetUniqueDriverName()) err = waitForCSIDriver(cs, m.config.GetUniqueDriverName())
framework.ExpectNoError(err, "Failed to get CSIDriver : %v", err) framework.ExpectNoError(err, "Failed to get CSIDriver : %v", err)
@ -138,7 +129,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
if dDriver, ok := m.driver.(testsuites.DynamicPVTestDriver); ok { if dDriver, ok := m.driver.(testsuites.DynamicPVTestDriver); ok {
sc = dDriver.GetDynamicProvisionStorageClass(m.config, "") sc = dDriver.GetDynamicProvisionStorageClass(m.config, "")
} }
nodeName := m.config.ClientNodeSelection.Name
scTest := testsuites.StorageClassTest{ scTest := testsuites.StorageClassTest{
Name: m.driver.GetDriverInfo().Name, Name: m.driver.GetDriverInfo().Name,
Provisioner: sc.Provisioner, Provisioner: sc.Provisioner,
@ -154,15 +144,8 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
scTest.AllowVolumeExpansion = true scTest.AllowVolumeExpansion = true
} }
nodeSelection := e2epod.NodeSelection{ // The mock driver only works when everything runs on a single node.
// The mock driver only works when everything runs on a single node. nodeSelection := m.config.ClientNodeSelection
Name: nodeName,
}
if len(m.nodeLabel) > 0 {
nodeSelection = e2epod.NodeSelection{
Selector: m.nodeLabel,
}
}
if ephemeral { if ephemeral {
pod = startPausePodInline(f.ClientSet, scTest, nodeSelection, f.Namespace.Name) pod = startPausePodInline(f.ClientSet, scTest, nodeSelection, f.Namespace.Name)
if pod != nil { if pod != nil {
@ -184,15 +167,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
} }
createPodWithPVC := func(pvc *v1.PersistentVolumeClaim) (*v1.Pod, error) { createPodWithPVC := func(pvc *v1.PersistentVolumeClaim) (*v1.Pod, error) {
nodeName := m.config.ClientNodeSelection.Name nodeSelection := m.config.ClientNodeSelection
nodeSelection := e2epod.NodeSelection{
Name: nodeName,
}
if len(m.nodeLabel) > 0 {
nodeSelection = e2epod.NodeSelection{
Selector: m.nodeLabel,
}
}
pod, err := startPausePodWithClaim(m.cs, pvc, nodeSelection, f.Namespace.Name) pod, err := startPausePodWithClaim(m.cs, pvc, nodeSelection, f.Namespace.Name)
if pod != nil { if pod != nil {
m.pods = append(m.pods, pod) m.pods = append(m.pods, pod)
@ -229,10 +204,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
cleanupFunc() cleanupFunc()
} }
if len(m.nodeLabel) > 0 && len(m.tp.nodeSelectorKey) > 0 {
framework.RemoveLabelOffNode(m.cs, m.config.ClientNodeSelection.Name, m.tp.nodeSelectorKey)
}
err := utilerrors.NewAggregate(errs) err := utilerrors.NewAggregate(errs)
framework.ExpectNoError(err, "while cleaning up after test") framework.ExpectNoError(err, "while cleaning up after test")
} }
@ -387,8 +358,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
// define volume limit to be 2 for this test // define volume limit to be 2 for this test
var err error var err error
nodeSelectorKey := fmt.Sprintf("attach-limit-csi-%s", f.Namespace.Name) init(testParameters{attachLimit: 2})
init(testParameters{nodeSelectorKey: nodeSelectorKey, attachLimit: 2})
defer cleanup() defer cleanup()
nodeName := m.config.ClientNodeSelection.Name nodeName := m.config.ClientNodeSelection.Name
driverName := m.config.GetUniqueDriverName() driverName := m.config.GetUniqueDriverName()
@ -719,14 +689,7 @@ func startPausePodWithVolumeSource(cs clientset.Interface, volumeSource v1.Volum
}, },
}, },
} }
e2epod.SetNodeSelection(pod, node)
if node.Name != "" {
pod.Spec.NodeName = node.Name
}
if len(node.Selector) != 0 {
pod.Spec.NodeSelector = node.Selector
}
return cs.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{}) return cs.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})
} }