mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-11 13:02:14 +00:00
Merge pull request #117201 from pohly/scheduler-perf-node-labels
test/integration: create nodes directly with kubernetes.io/hostname label
This commit is contained in:
commit
251d4a00e6
@ -22,6 +22,7 @@ import (
|
|||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/api/resource"
|
"k8s.io/apimachinery/pkg/api/resource"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/util/rand"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
testutils "k8s.io/kubernetes/test/utils"
|
testutils "k8s.io/kubernetes/test/utils"
|
||||||
@ -89,7 +90,20 @@ func (p *IntegrationTestNodePreparer) PrepareNodes(ctx context.Context, nextNode
|
|||||||
for i := 0; i < numNodes; i++ {
|
for i := 0; i < numNodes; i++ {
|
||||||
var err error
|
var err error
|
||||||
for retry := 0; retry < retries; retry++ {
|
for retry := 0; retry < retries; retry++ {
|
||||||
_, err = p.client.CoreV1().Nodes().Create(ctx, baseNode, metav1.CreateOptions{})
|
// Create nodes with the usual kubernetes.io/hostname label.
|
||||||
|
// For that we need to know the name in advance, if we want to
|
||||||
|
// do it in one request.
|
||||||
|
node := baseNode.DeepCopy()
|
||||||
|
name := node.Name
|
||||||
|
if name == "" {
|
||||||
|
name = node.GenerateName + rand.String(5)
|
||||||
|
node.Name = name
|
||||||
|
}
|
||||||
|
if node.Labels == nil {
|
||||||
|
node.Labels = make(map[string]string)
|
||||||
|
}
|
||||||
|
node.Labels["kubernetes.io/hostname"] = name
|
||||||
|
_, err = p.client.CoreV1().Nodes().Create(ctx, node, metav1.CreateOptions{})
|
||||||
if err == nil {
|
if err == nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
workloadTemplate:
|
workloadTemplate:
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
countParam: $initNodes
|
countParam: $initNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createNamespaces
|
- opcode: createNamespaces
|
||||||
prefix: sched
|
prefix: sched
|
||||||
count: 2
|
count: 2
|
||||||
@ -198,8 +196,6 @@
|
|||||||
workloadTemplate:
|
workloadTemplate:
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
countParam: $initNodes
|
countParam: $initNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createNamespaces
|
- opcode: createNamespaces
|
||||||
prefix: sched
|
prefix: sched
|
||||||
count: 2
|
count: 2
|
||||||
@ -227,8 +223,6 @@
|
|||||||
workloadTemplate:
|
workloadTemplate:
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
countParam: $initNodes
|
countParam: $initNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createNamespaces
|
- opcode: createNamespaces
|
||||||
prefix: sched
|
prefix: sched
|
||||||
count: 2
|
count: 2
|
||||||
@ -491,8 +485,6 @@
|
|||||||
workloadTemplate:
|
workloadTemplate:
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
countParam: $initNodes
|
countParam: $initNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createNamespaces
|
- opcode: createNamespaces
|
||||||
prefix: init-ns
|
prefix: init-ns
|
||||||
countParam: $initNamespaces
|
countParam: $initNamespaces
|
||||||
@ -524,8 +516,6 @@
|
|||||||
workloadTemplate:
|
workloadTemplate:
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
countParam: $initNodes
|
countParam: $initNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createNamespaces
|
- opcode: createNamespaces
|
||||||
prefix: init-ns
|
prefix: init-ns
|
||||||
countParam: $initNamespaces
|
countParam: $initNamespaces
|
||||||
@ -591,8 +581,6 @@
|
|||||||
workloadTemplate:
|
workloadTemplate:
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
countParam: $initNodes
|
countParam: $initNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createNamespaces
|
- opcode: createNamespaces
|
||||||
prefix: init-ns
|
prefix: init-ns
|
||||||
countParam: $initNamespaces
|
countParam: $initNamespaces
|
||||||
@ -626,13 +614,9 @@
|
|||||||
workloadTemplate:
|
workloadTemplate:
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
countParam: $normalNodes
|
countParam: $normalNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createNodes
|
- opcode: createNodes
|
||||||
nodeTemplatePath: config/node-with-taint.yaml
|
nodeTemplatePath: config/node-with-taint.yaml
|
||||||
countParam: $taintNodes
|
countParam: $taintNodes
|
||||||
uniqueNodeLabelStrategy:
|
|
||||||
labelKey: kubernetes.io/hostname
|
|
||||||
- opcode: createPods
|
- opcode: createPods
|
||||||
countParam: $measurePods
|
countParam: $measurePods
|
||||||
collectMetrics: true
|
collectMetrics: true
|
||||||
|
Loading…
Reference in New Issue
Block a user