File tree Expand file tree Collapse file tree 5 files changed +30
-27
lines changed Expand file tree Collapse file tree 5 files changed +30
-27
lines changed Original file line number Diff line number Diff line change 18
18
patches :
19
19
- name : audit-policy
20
20
external :
21
- generateExtension : " auditpolicypatch .capi-runtime-extensions"
21
+ generateExtension : " clusterconfigpatch .capi-runtime-extensions"
22
22
` ` `
23
23
24
24
Applying this configuration will result in new bootstrap files on the ` KubeadmControlPlaneTemplate`.
Original file line number Diff line number Diff line change 15
15
patches :
16
16
- name : image-registry
17
17
external :
18
- generateExtension : " etcdpatch .capi-runtime-extensions"
19
- discoverVariablesExtension : " etcdvars .capi-runtime-extensions"
18
+ generateExtension : " clusterconfigpatch .capi-runtime-extensions"
19
+ discoverVariablesExtension : " clusterconfigvars .capi-runtime-extensions"
20
20
` ` `
21
21
22
22
On the cluster resource then specify desired etcd image repository and/or image tag values:
@@ -29,11 +29,12 @@ metadata:
29
29
spec :
30
30
topology :
31
31
variables :
32
- - name : etcd
33
- values :
34
- image :
35
- repository : my-registry.io/my-org/my-repo
36
- tag : " v3.5.99_custom.0"
32
+ - name : clusterConfig
33
+ value :
34
+ etcd :
35
+ image :
36
+ repository : my-registry.io/my-org/my-repo
37
+ tag : " v3.5.99_custom.0"
37
38
` ` `
38
39
39
40
Applying this configuration will result in the following value being set:
Original file line number Diff line number Diff line change 17
17
patches :
18
18
- name : apiserver-cert-sans
19
19
external :
20
- generateExtension : " extraapiservercertsanspatch .capi-runtime-extensions"
21
- discoverVariablesExtension : " extraapiservercertsansvars .capi-runtime-extensions"
20
+ generateExtension : " clusterconfigpatch .capi-runtime-extensions"
21
+ discoverVariablesExtension : " clusterconfigvars .capi-runtime-extensions"
22
22
` ` `
23
23
24
24
On the cluster resource then specify desired certificate SANs values:
@@ -31,10 +31,11 @@ metadata:
31
31
spec :
32
32
topology :
33
33
variables :
34
- - name : extraAPIServerCertSANs
34
+ - name : clusterConfig
35
35
value :
36
- - a.b.c.example.com
37
- - d.e.f.example.com
36
+ extraAPIServerCertSANs :
37
+ - a.b.c.example.com
38
+ - d.e.f.example.com
38
39
` ` `
39
40
40
41
Applying this configuration will result in the certificate SANs being correctly set in the
Original file line number Diff line number Diff line change 17
17
patches :
18
18
- name : http-proxy
19
19
external :
20
- generateExtension : " httpproxypatch .capi-runtime-extensions"
21
- discoverVariablesExtension : " httpproxyvars .capi-runtime-extensions"
20
+ generateExtension : " clusterconfigpatch .capi-runtime-extensions"
21
+ discoverVariablesExtension : " clusterconfigvars .capi-runtime-extensions"
22
22
` ` `
23
23
24
24
On the cluster resource then specify desired HTTP proxy values:
@@ -31,13 +31,14 @@ metadata:
31
31
spec :
32
32
topology :
33
33
variables :
34
- - name : proxy
34
+ - name : clusterConfig
35
35
value :
36
- http : http://example.com
37
- https : http://example.com
38
- additionalNo :
39
- - no-proxy-1.example.com
40
- - no-proxy-2.example.com
36
+ proxy :
37
+ http : http://example.com
38
+ https : https://example.com
39
+ additionalNo :
40
+ - no-proxy-1.example.com
41
+ - no-proxy-2.example.com
41
42
` ` `
42
43
43
44
The ` additionalNo` list will be added to default pre-calculated values that apply on k8s networking
Original file line number Diff line number Diff line change 15
15
patches :
16
16
- name : image-repository
17
17
external :
18
- generateExtension : " imagerepositorypatch .capi-runtime-extensions"
19
- discoverVariablesExtension : " imagerepositoryvars .capi-runtime-extensions"
18
+ generateExtension : " clusterconfigpatch .capi-runtime-extensions"
19
+ discoverVariablesExtension : " clusterconfigvars .capi-runtime-extensions"
20
20
` ` `
21
21
22
22
On the cluster resource then specify desired Kubernetes image repository value:
@@ -27,10 +27,10 @@ kind: Cluster
27
27
metadata :
28
28
name : <NAME>
29
29
spec :
30
- topology :
31
- variables :
32
- - name : kubernetesImageRepository
33
- value : " my-registry.io/my-org/my-repo"
30
+ variables :
31
+ - name : clusterConfig
32
+ value :
33
+ imageRepository : my-registry.io/my-org/my-repo
34
34
` ` `
35
35
36
36
Applying this configuration will result in the following value being set:
You can’t perform that action at this time.
0 commit comments