Skip to content

Commit a0371ac

Browse files
committed
made certSAN into a patch without variable at this time
1 parent 0e7f589 commit a0371ac

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

templates/cluster-template-clusterclass.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,14 @@ spec:
345345
sudo: ALL=(ALL) NOPASSWD:ALL
346346
sshAuthorizedKeys:
347347
- '{{ .sshKey }}'
348+
- op: add
349+
path: /spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer
350+
valueFrom:
351+
template: |
352+
certSANs
353+
- localhost
354+
- 127.0.0.1
355+
- 0.0.0.0
348356
selector:
349357
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
350358
kind: KubeadmControlPlaneTemplate
@@ -604,10 +612,6 @@ spec:
604612
kubeadmConfigSpec:
605613
clusterConfiguration:
606614
apiServer:
607-
certSANs:
608-
- localhost
609-
- 127.0.0.1
610-
- 0.0.0.0
611615
extraArgs:
612616
cloud-provider: external
613617
tls-cipher-suites: ${TLS_CIPHER_SUITES=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256}

templates/clusterclass/clusterclass.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ spec:
9999
sudo: ALL=(ALL) NOPASSWD:ALL
100100
sshAuthorizedKeys:
101101
- '{{ .sshKey }}'
102+
- op: add
103+
path: /spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer
104+
valueFrom:
105+
template: |
106+
certSANs
107+
- localhost
108+
- 127.0.0.1
109+
- 0.0.0.0
102110
- selector:
103111
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
104112
kind: KubeadmConfigTemplate

templates/clusterclass/kcpt.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ spec:
88
kubeadmConfigSpec:
99
clusterConfiguration:
1010
apiServer:
11-
certSANs:
12-
- localhost
13-
- 127.0.0.1
14-
- 0.0.0.0
1511
extraArgs:
1612
cloud-provider: external
1713
tls-cipher-suites: ${TLS_CIPHER_SUITES=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256}

test/e2e/data/infrastructure-nutanix/v1beta1/clusterclass-e2e.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,14 @@ spec:
345345
sudo: ALL=(ALL) NOPASSWD:ALL
346346
sshAuthorizedKeys:
347347
- '{{ .sshKey }}'
348+
- op: add
349+
path: /spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer
350+
valueFrom:
351+
template: |
352+
certSANs
353+
- localhost
354+
- 127.0.0.1
355+
- 0.0.0.0
348356
selector:
349357
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
350358
kind: KubeadmControlPlaneTemplate
@@ -604,10 +612,6 @@ spec:
604612
kubeadmConfigSpec:
605613
clusterConfiguration:
606614
apiServer:
607-
certSANs:
608-
- localhost
609-
- 127.0.0.1
610-
- 0.0.0.0
611615
extraArgs:
612616
cloud-provider: external
613617
tls-cipher-suites: ${TLS_CIPHER_SUITES=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256}

0 commit comments

Comments
 (0)