diff --git a/clusterloader2/testing/node-throughput/config.yaml b/clusterloader2/testing/node-throughput/config.yaml index cd37971538..f2ff3e615b 100644 --- a/clusterloader2/testing/node-throughput/config.yaml +++ b/clusterloader2/testing/node-throughput/config.yaml @@ -7,6 +7,7 @@ {{$CONTAINER_IMAGE := DefaultParam .CONTAINER_IMAGE "k8s.gcr.io/pause:3.1"}} {{$POD_STARTUP_LATENCY_THRESHOLD := DefaultParam .POD_STARTUP_LATENCY_THRESHOLD "5s"}} {{$OPERATION_TIMEOUT := DefaultParam .OPERATION_TIMEOUT "15m"}} +{{$WINDOWS_NODE_TEST := DefaultParam .WINDOWS_NODE_TEST false}} name: node-throughput automanagedNamespaces: {{$POD_COUNT}} @@ -48,6 +49,7 @@ steps: Replicas: 1 Group: latency Image: {{$CONTAINER_IMAGE}} + WindowsNodeTest: {{$WINDOWS_NODE_TEST}} - measurements: - Identifier: WaitForRunningLatencyRCs Method: WaitForControlledPodsRunning diff --git a/clusterloader2/testing/node-throughput/rc.yaml b/clusterloader2/testing/node-throughput/rc.yaml index e0688f338c..48239e4b4a 100644 --- a/clusterloader2/testing/node-throughput/rc.yaml +++ b/clusterloader2/testing/node-throughput/rc.yaml @@ -16,6 +16,10 @@ spec: spec: # Do not automount default service account, to eliminate its impact. automountServiceAccountToken: false + {{if .WindowsNodeTest}} + nodeSelector: + kubernetes.io/os: windows + {{end}} containers: - image: {{.Image}} imagePullPolicy: IfNotPresent @@ -24,6 +28,11 @@ spec: # Add not-ready/unreachable tolerations for 15 minutes so that node # failure doesn't trigger pod deletion. tolerations: + {{if .WindowsNodeTest}} + - key: "node.kubernetes.io/os" + operator: "Exists" + effect: "NoSchedule" + {{end}} - key: "node.kubernetes.io/not-ready" operator: "Exists" effect: "NoExecute" diff --git a/clusterloader2/testing/node-throughput/windows_override.yaml b/clusterloader2/testing/node-throughput/windows_override.yaml index 233a840e36..40bd8ccaac 100644 --- a/clusterloader2/testing/node-throughput/windows_override.yaml +++ b/clusterloader2/testing/node-throughput/windows_override.yaml @@ -1,5 +1,6 @@ +WINDOWS_NODE_TEST: true POD_COUNT: 80 POD_THROUGHPUT: 0.03 -CONTAINER_IMAGE: gcr.io/gke-release/pause-win:1.0.0 +CONTAINER_IMAGE: gcr.io/gke-release/pause-win:1.1.0 OPERATION_TIMEOUT: 90m POD_STARTUP_LATENCY_THRESHOLD: 60m