Skip to content

Commit 3454cd2

Browse files
authored
feat: Support certificate validity period config in kubeadm v1beta4 (#12272)
Signed-off-by: bo.jiang <[email protected]>
1 parent c7c3d2b commit 3454cd2

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

roles/kubernetes/control-plane/defaults/main/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,3 +255,9 @@ kubeadm_image_pull_serial: true
255255
# can be one of RSA-2048(default), RSA-3072, RSA-4096, ECDSA-P256
256256
# ref: https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/#kubeadm-k8s-io-v1beta4-ClusterConfiguration
257257
kube_asymmetric_encryption_algorithm: "RSA-2048"
258+
259+
# certificates validity period configuration
260+
# non-CA certificate validity period, default 1 year (365d × 24h = 8760h)
261+
kube_cert_validity_period: 8760h
262+
# CA certificate validity period, default 10 years (365d × 24h × 10 = 87600h)
263+
kube_ca_cert_validity_period: 87600h

roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ apiVersion: kubeadm.k8s.io/v1beta4
4040
kind: ClusterConfiguration
4141
clusterName: {{ cluster_name }}
4242
encryptionAlgorithm: {{ kube_asymmetric_encryption_algorithm }}
43+
certificateValidityPeriod: {{ kube_cert_validity_period }}
44+
caCertificateValidityPeriod: {{ kube_ca_cert_validity_period }}
4345
etcd:
4446
{% if etcd_deployment_type != "kubeadm" %}
4547
external:

0 commit comments

Comments
 (0)