Skip to content

Commit 15d7e48

Browse files
authored
Merge pull request #12029 from k8s-infra-cherrypick-robot/cherry-pick-12028-to-release-1.10
[release-1.10] 🐛 Fix worker machine count in CAPD template
2 parents 599fa93 + dcf289c commit 15d7e48

File tree

3 files changed

+39
-4
lines changed

3 files changed

+39
-4
lines changed

Diff for: docs/book/src/user/quick-start.md

+2
Original file line numberDiff line numberDiff line change
@@ -1549,6 +1549,8 @@ clusterctl generate cluster capi-quickstart --flavor development \
15491549
> capi-quickstart.yaml
15501550
```
15511551
1552+
Note: If you want to use MachinePools use flavor `development-mp`.
1553+
15521554
{{#/tab }}
15531555
{{#tab vcluster}}
15541556
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
apiVersion: cluster.x-k8s.io/v1beta1
2+
kind: Cluster
3+
metadata:
4+
name: "${CLUSTER_NAME}"
5+
namespace: "${NAMESPACE}"
6+
spec:
7+
clusterNetwork:
8+
services:
9+
cidrBlocks: ${SERVICE_CIDR:=["10.128.0.0/12"]}
10+
pods:
11+
cidrBlocks: ${POD_CIDR:=["192.168.0.0/16"]}
12+
serviceDomain: ${SERVICE_DOMAIN:="cluster.local"}
13+
topology:
14+
class: quick-start
15+
controlPlane:
16+
metadata: {}
17+
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
18+
variables:
19+
- name: imageRepository
20+
value: ""
21+
- name: etcdImageTag
22+
value: ""
23+
- name: coreDNSImageTag
24+
value: ""
25+
- name: podSecurityStandard
26+
value:
27+
enabled: ${POD_SECURITY_STANDARD_ENABLED:=true}
28+
enforce: "baseline"
29+
audit: "restricted"
30+
warn: "restricted"
31+
version: ${KUBERNETES_VERSION}
32+
workers:
33+
machinePools:
34+
- class: default-worker
35+
name: mp-0
36+
replicas: ${WORKER_MACHINE_COUNT}
37+
---

Diff for: test/infrastructure/docker/templates/cluster-template-development.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,4 @@ spec:
3434
- class: default-worker
3535
name: md-0
3636
replicas: ${WORKER_MACHINE_COUNT}
37-
machinePools:
38-
- class: default-worker
39-
name: mp-0
40-
replicas: ${WORKER_MACHINE_COUNT}
4137
---

0 commit comments

Comments
 (0)