Merge pull request #1795 from jsturtevant/fix-windows-dockershim

Use same env variables as Containerd solution
kubernetes-sigs · Oct 27, 2021 · 909f3a0 · 909f3a0
2 parents a2a39e5 + 3f58306
commit 909f3a0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows.yaml
@@ -249,9 +249,8 @@ metadata:
   namespace: default
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${LINUX_WORKER_MACHINE_COUNT:-1}
-  selector:
-    matchLabels: null
+  replicas: ${WORKER_MACHINE_COUNT:-1}
+  selector: {}
   template:
     spec:
       bootstrap:
@@ -403,9 +402,8 @@ metadata:
   namespace: default
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${WORKER_MACHINE_COUNT}
-  selector:
-    matchLabels: null
+  replicas: ${WINDOWS_WORKER_MACHINE_COUNT:-2}
+  selector: {}
   template:
     spec:
       bootstrap:

diff --git a/templates/test/ci/cluster-template-prow-windows.yaml b/templates/test/ci/cluster-template-prow-windows.yaml
@@ -175,9 +175,8 @@ metadata:
   namespace: default
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${LINUX_WORKER_MACHINE_COUNT:-1}
-  selector:
-    matchLabels: null
+  replicas: ${WORKER_MACHINE_COUNT:-1}
+  selector: {}
   template:
     spec:
       bootstrap:
@@ -257,9 +256,8 @@ metadata:
   namespace: default
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${WORKER_MACHINE_COUNT}
-  selector:
-    matchLabels: null
+  replicas: ${WINDOWS_WORKER_MACHINE_COUNT:-2}
+  selector: {}
   template:
     spec:
       bootstrap:

diff --git a/templates/test/ci/prow-windows/kustomization.yaml b/templates/test/ci/prow-windows/kustomization.yaml
@@ -8,6 +8,7 @@ patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/cluster-cni-windows.yaml
   - ../patches/controller-manager.yaml
+  - patches/machine-deployment-worker-counts.yaml
 patches:
 - target:
     group: bootstrap.cluster.x-k8s.io

diff --git a/templates/test/ci/prow-windows/patches/machine-deployment-worker-counts.yaml b/templates/test/ci/prow-windows/patches/machine-deployment-worker-counts.yaml
@@ -0,0 +1,14 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineDeployment
+metadata:
+  name: "${CLUSTER_NAME}-md-win"
+spec:
+  replicas: ${WINDOWS_WORKER_MACHINE_COUNT:-2}
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineDeployment
+metadata:
+  name: "${CLUSTER_NAME}-md-0"
+spec:
+  clusterName: "${CLUSTER_NAME}"
+  replicas: ${WORKER_MACHINE_COUNT:-1}
diff --git a/templates/test/dev/cluster-template-custom-builds-windows.yaml b/templates/test/dev/cluster-template-custom-builds-windows.yaml
@@ -236,9 +236,8 @@ metadata:
   namespace: default
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${LINUX_WORKER_MACHINE_COUNT:-1}
-  selector:
-    matchLabels: null
+  replicas: ${WORKER_MACHINE_COUNT:-1}
+  selector: {}
   template:
     spec:
       bootstrap:
@@ -346,9 +345,8 @@ metadata:
   namespace: default
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${WORKER_MACHINE_COUNT}
-  selector:
-    matchLabels: null
+  replicas: ${WINDOWS_WORKER_MACHINE_COUNT:-2}
+  selector: {}
   template:
     spec:
       bootstrap: