mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
fixing node labels for random tests invocation
addressed Michelle Au's review comments
This commit is contained in:
parent
89cbdc0d6f
commit
948d381418
@ -52,6 +52,9 @@ import (
|
|||||||
|
|
||||||
var _ = utils.SIGDescribe("Volume Disk Format [Feature:vsphere]", func() {
|
var _ = utils.SIGDescribe("Volume Disk Format [Feature:vsphere]", func() {
|
||||||
f := framework.NewDefaultFramework("volume-disk-format")
|
f := framework.NewDefaultFramework("volume-disk-format")
|
||||||
|
const (
|
||||||
|
NodeLabelKey = "vsphere_e2e_label_volume_diskformat"
|
||||||
|
)
|
||||||
var (
|
var (
|
||||||
client clientset.Interface
|
client clientset.Interface
|
||||||
namespace string
|
namespace string
|
||||||
@ -73,15 +76,15 @@ var _ = utils.SIGDescribe("Volume Disk Format [Feature:vsphere]", func() {
|
|||||||
if !isNodeLabeled {
|
if !isNodeLabeled {
|
||||||
nodeLabelValue = "vsphere_e2e_" + string(uuid.NewUUID())
|
nodeLabelValue = "vsphere_e2e_" + string(uuid.NewUUID())
|
||||||
nodeKeyValueLabel = make(map[string]string)
|
nodeKeyValueLabel = make(map[string]string)
|
||||||
nodeKeyValueLabel["vsphere_e2e_label"] = nodeLabelValue
|
nodeKeyValueLabel[NodeLabelKey] = nodeLabelValue
|
||||||
framework.AddOrUpdateLabelOnNode(client, nodeName, "vsphere_e2e_label", nodeLabelValue)
|
framework.AddOrUpdateLabelOnNode(client, nodeName, NodeLabelKey, nodeLabelValue)
|
||||||
isNodeLabeled = true
|
isNodeLabeled = true
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
framework.AddCleanupAction(func() {
|
framework.AddCleanupAction(func() {
|
||||||
// Cleanup actions will be called even when the tests are skipped and leaves namespace unset.
|
// Cleanup actions will be called even when the tests are skipped and leaves namespace unset.
|
||||||
if len(namespace) > 0 && len(nodeLabelValue) > 0 {
|
if len(namespace) > 0 && len(nodeLabelValue) > 0 {
|
||||||
framework.RemoveLabelOffNode(client, nodeName, "vsphere_e2e_label")
|
framework.RemoveLabelOffNode(client, nodeName, NodeLabelKey)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -35,6 +35,9 @@ import (
|
|||||||
|
|
||||||
var _ = utils.SIGDescribe("Volume Placement", func() {
|
var _ = utils.SIGDescribe("Volume Placement", func() {
|
||||||
f := framework.NewDefaultFramework("volume-placement")
|
f := framework.NewDefaultFramework("volume-placement")
|
||||||
|
const (
|
||||||
|
NodeLabelKey = "vsphere_e2e_label_volume_placement"
|
||||||
|
)
|
||||||
var (
|
var (
|
||||||
c clientset.Interface
|
c clientset.Interface
|
||||||
ns string
|
ns string
|
||||||
@ -80,10 +83,10 @@ var _ = utils.SIGDescribe("Volume Placement", func() {
|
|||||||
// Cleanup actions will be called even when the tests are skipped and leaves namespace unset.
|
// Cleanup actions will be called even when the tests are skipped and leaves namespace unset.
|
||||||
if len(ns) > 0 {
|
if len(ns) > 0 {
|
||||||
if len(node1KeyValueLabel) > 0 {
|
if len(node1KeyValueLabel) > 0 {
|
||||||
framework.RemoveLabelOffNode(c, node1Name, "vsphere_e2e_label")
|
framework.RemoveLabelOffNode(c, node1Name, NodeLabelKey)
|
||||||
}
|
}
|
||||||
if len(node2KeyValueLabel) > 0 {
|
if len(node2KeyValueLabel) > 0 {
|
||||||
framework.RemoveLabelOffNode(c, node2Name, "vsphere_e2e_label")
|
framework.RemoveLabelOffNode(c, node2Name, NodeLabelKey)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -339,13 +342,13 @@ func testSetupVolumePlacement(client clientset.Interface, namespace string) (nod
|
|||||||
node2Name = nodes.Items[1].Name
|
node2Name = nodes.Items[1].Name
|
||||||
node1LabelValue := "vsphere_e2e_" + string(uuid.NewUUID())
|
node1LabelValue := "vsphere_e2e_" + string(uuid.NewUUID())
|
||||||
node1KeyValueLabel = make(map[string]string)
|
node1KeyValueLabel = make(map[string]string)
|
||||||
node1KeyValueLabel["vsphere_e2e_label"] = node1LabelValue
|
node1KeyValueLabel[NodeLabelKey] = node1LabelValue
|
||||||
framework.AddOrUpdateLabelOnNode(client, node1Name, "vsphere_e2e_label", node1LabelValue)
|
framework.AddOrUpdateLabelOnNode(client, node1Name, NodeLabelKey, node1LabelValue)
|
||||||
|
|
||||||
node2LabelValue := "vsphere_e2e_" + string(uuid.NewUUID())
|
node2LabelValue := "vsphere_e2e_" + string(uuid.NewUUID())
|
||||||
node2KeyValueLabel = make(map[string]string)
|
node2KeyValueLabel = make(map[string]string)
|
||||||
node2KeyValueLabel["vsphere_e2e_label"] = node2LabelValue
|
node2KeyValueLabel[NodeLabelKey] = node2LabelValue
|
||||||
framework.AddOrUpdateLabelOnNode(client, node2Name, "vsphere_e2e_label", node2LabelValue)
|
framework.AddOrUpdateLabelOnNode(client, node2Name, NodeLabelKey, node2LabelValue)
|
||||||
return node1Name, node1KeyValueLabel, node2Name, node2KeyValueLabel
|
return node1Name, node1KeyValueLabel, node2Name, node2KeyValueLabel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user