Skip to content

Commit

Permalink
Linux nodes are not needed for upstream tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jsturtevant committed Jun 4, 2021
1 parent cdd1f9a commit ef32d45
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 17 deletions.
14 changes: 7 additions & 7 deletions templates/test/ci/cluster-template-prow-ci-version-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ metadata:
name: ${CLUSTER_NAME}-control-plane
namespace: default
spec:
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
kind: AzureMachineTemplate
name: ${CLUSTER_NAME}-control-plane
kubeadmConfigSpec:
clusterConfiguration:
apiServer:
Expand Down Expand Up @@ -198,6 +194,11 @@ spec:
preKubeadmCommands:
- bash -c /tmp/kubeadm-bootstrap.sh
useExperimentalRetryJoin: true
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
kind: AzureMachineTemplate
name: ${CLUSTER_NAME}-control-plane
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
version: ${KUBERNETES_VERSION}
---
Expand Down Expand Up @@ -232,9 +233,8 @@ metadata:
namespace: default
spec:
clusterName: ${CLUSTER_NAME}
replicas: ${WORKER_MACHINE_COUNT}
selector:
matchLabels: null
replicas: "0"
selector: {}
template:
spec:
bootstrap:
Expand Down
5 changes: 2 additions & 3 deletions templates/test/ci/cluster-template-prow-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,8 @@ metadata:
namespace: default
spec:
clusterName: ${CLUSTER_NAME}
replicas: ${WORKER_MACHINE_COUNT}
selector:
matchLabels: null
replicas: "0"
selector: {}
template:
spec:
bootstrap:
Expand Down
1 change: 1 addition & 0 deletions templates/test/ci/prow-windows/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ patchesStrategicMerge:
- ../patches/tags.yaml
- ../patches/cluster-cni-windows.yaml
- ../patches/controller-manager.yaml
- patches/drop-linux-pool.yaml
patchesJson6902:
- target:
group: bootstrap.cluster.x-k8s.io
Expand Down
10 changes: 10 additions & 0 deletions templates/test/ci/prow-windows/patches/drop-linux-pool.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: cluster.x-k8s.io/v1alpha4
kind: MachineDeployment
metadata:
name: ${CLUSTER_NAME}-md-0
namespace: default
spec:
# For upstream prow jobs we don't need Linux pools
# the templates are based off the base windows template
# and kustomize doesn't allow remove resources.
replicas: 0
14 changes: 7 additions & 7 deletions templates/test/dev/cluster-template-custom-builds-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ metadata:
name: ${CLUSTER_NAME}-control-plane
namespace: default
spec:
infrastructureTemplate:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
kind: AzureMachineTemplate
name: ${CLUSTER_NAME}-control-plane
kubeadmConfigSpec:
clusterConfiguration:
apiServer:
Expand Down Expand Up @@ -173,6 +169,11 @@ spec:
preKubeadmCommands:
- bash -c /tmp/replace-k8s-binaries.sh
useExperimentalRetryJoin: true
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
kind: AzureMachineTemplate
name: ${CLUSTER_NAME}-control-plane
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
version: ${KUBERNETES_VERSION}
---
Expand Down Expand Up @@ -207,9 +208,8 @@ metadata:
namespace: default
spec:
clusterName: ${CLUSTER_NAME}
replicas: ${WORKER_MACHINE_COUNT}
selector:
matchLabels: null
replicas: "0"
selector: {}
template:
spec:
bootstrap:
Expand Down

0 comments on commit ef32d45

Please sign in to comment.