Skip to content

Commit d445f35

Browse files
authored
Merge pull request #12668 from k8s-infra-cherrypick-robot/cherry-pick-12662-to-release-1.11
[release-1.11] 📖 Fix extraArgs examples in v1beta2 migration docs
2 parents ec49873 + 4bacc7d commit d445f35

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

docs/book/src/developer/providers/migrations/v1.10-to-v1.11.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,15 +1608,15 @@ spec:
16081608
apiServer:
16091609
certSANs: [ ... ]
16101610
extraArgs:
1611-
- "v": "5"
1611+
"v": "5"
16121612
extraEnvs: [ ... ]
16131613
extraVolumes: [ ... ]
16141614
timeoutForControlPlane: "25s"
16151615
certificatesDir: ""
16161616
controlPlaneEndpoint: ""
16171617
controllerManager:
16181618
extraArgs:
1619-
- "v": "5"
1619+
"v": "5"
16201620
extraEnvs: [ ... ]
16211621
extraVolumes: [ ... ]
16221622
dns: { ... }
@@ -1625,7 +1625,7 @@ spec:
16251625
local:
16261626
dataDir: ""
16271627
extraArgs:
1628-
- "v": "5"
1628+
"v": "5"
16291629
extraEnvs: [ ... ]
16301630
imageRepository: ""
16311631
imageTag: ""
@@ -1635,7 +1635,7 @@ spec:
16351635
imageRepository: ""
16361636
scheduler:
16371637
extraArgs:
1638-
- "v": "5"
1638+
"v": "5"
16391639
extraEnvs: [ ... ]
16401640
extraVolumes: [ ... ]
16411641
diskSetup: { ... }
@@ -1659,7 +1659,7 @@ spec:
16591659
imagePullPolicy: ""
16601660
imagePullSerial: true
16611661
kubeletExtraArgs:
1662-
- "v": "5"
1662+
"v": "5"
16631663
name: ""
16641664
taints: [ ... ]
16651665
patches: { ... }
@@ -1680,7 +1680,7 @@ spec:
16801680
imagePullPolicy: ""
16811681
imagePullSerial: true
16821682
kubeletExtraArgs:
1683-
- "v": "5"
1683+
"v": "5"
16841684
name: ""
16851685
taints: [ ... ]
16861686
patches: { ...}
@@ -1832,7 +1832,7 @@ status:
18321832

18331833
- KubeadmConfig (and the entire CABPK provider) now implements the v1beta2 Cluster API contract
18341834
- See changes that apply to [all CRDs](#all-crds)
1835-
- Pointers have been removed from various struct fields. See [#12545](https://github.com/kubernetes-sigs/cluster-api/pull/12545) and
1835+
- Pointers have been removed from various struct fields. See [#12545](https://github.com/kubernetes-sigs/cluster-api/pull/12545) and
18361836
[#12560](https://github.com/kubernetes-sigs/cluster-api/pull/12560) for details (drop unnecessary pointers)
18371837
- `extraArg` field types have been changed from `map[string]sting` to `[]Arg`, thus aligning with kubeadm v1beta4 API;
18381838
however, using multiple args with the same name will be enabled only when v1beta1 is removed, tentatively in August 2026
@@ -1864,7 +1864,7 @@ status:
18641864
- `extraArgs`, `extraVolumes`, `extraEnvs` fields have been added to the `spec.clusterConfiguration.apiServer` struct
18651865
- The type of the `spec.clusterConfiguration.controllerManager` field has been changed from `ControlPlaneComponent` to `ControllerManager` (avoid embedding structs)
18661866
- The type of the `spec.clusterConfiguration.scheduler` field has been changed from `ControlPlaneComponent` to `Scheduler` (avoid embedding structs)
1867-
- The type of the `extraEnvs` fields in `spec.clusterConfiguration.apiServer`, `spec.clusterConfiguration.controllerManager`,
1867+
- The type of the `extraEnvs` fields in `spec.clusterConfiguration.apiServer`, `spec.clusterConfiguration.controllerManager`,
18681868
`spec.clusterConfiguration.scheduler` and `spec.clusterConfiguration.etcd.local` has been changed from `[]EnvVar` to `*[]EnvVar` (compliance with K8s API guidelines)
18691869
- The type of the `spec.clusterConfiguration.apiServer.extraVolumes.readOnly`, `spec.clusterConfiguration.controllerManager.extraVolumes.readOnly`
18701870
, `spec.clusterConfiguration.scheduler.extraVolumes.readOnly` fields have been changed from `bool` to `*bool` (compliance with K8s API guidelines)
@@ -1939,15 +1939,15 @@ spec:
19391939
apiServer:
19401940
certSANs: [ ... ]
19411941
extraArgs:
1942-
- "v": "5"
1942+
"v": "5"
19431943
extraEnvs: [ ... ]
19441944
extraVolumes: [ ... ]
19451945
timeoutForControlPlane: "25s"
19461946
certificatesDir: ""
19471947
controlPlaneEndpoint: ""
19481948
controllerManager:
19491949
extraArgs:
1950-
- "v": "5"
1950+
"v": "5"
19511951
extraEnvs: [ ... ]
19521952
extraVolumes: [ ... ]
19531953
dns: { ...}
@@ -1956,7 +1956,7 @@ spec:
19561956
local:
19571957
dataDir: ""
19581958
extraArgs:
1959-
- "v": "5"
1959+
"v": "5"
19601960
extraEnvs: [ ... ]
19611961
imageRepository: ""
19621962
imageTag: ""
@@ -1966,7 +1966,7 @@ spec:
19661966
imageRepository: ""
19671967
scheduler:
19681968
extraArgs:
1969-
- "v": "5"
1969+
"v": "5"
19701970
extraEnvs: [ ... ]
19711971
extraVolumes: [ ... ]
19721972
diskSetup: { ...}
@@ -1990,7 +1990,7 @@ spec:
19901990
imagePullPolicy: ""
19911991
imagePullSerial: true
19921992
kubeletExtraArgs:
1993-
- "v": "5"
1993+
"v": "5"
19941994
name: ""
19951995
taints: [ ... ]
19961996
patches: { ...}
@@ -2011,7 +2011,7 @@ spec:
20112011
imagePullPolicy: ""
20122012
imagePullSerial: true
20132013
kubeletExtraArgs:
2014-
- "v": "5"
2014+
"v": "5"
20152015
name: ""
20162016
taints: [ ... ]
20172017
patches: { ...}
@@ -3047,4 +3047,4 @@ Following table should help to pick the right utils.
30473047
| `status.conditions` of type `[]metav1.Conditions` | `"sigs.k8s.io/cluster-api/util/conditions"` | `"sigs.k8s.io/cluster-api/util/patch"` |
30483048
Important!
30493049
- Please pay special attention to use the correct patch helper import everywhere, because using a wrong
3050-
one could in some cases lead to dropping conditions at runtime while not having compile errors.
3050+
one could in some cases lead to dropping conditions at runtime while not having compile errors.

0 commit comments

Comments
 (0)