From e56add874179fe51b54ef824ae36d5543d57ba26 Mon Sep 17 00:00:00 2001 From: ERIK Date: Thu, 28 Nov 2024 20:00:58 +0800 Subject: [PATCH] Revert "add encryptionAlgorithm for ClusterConfigration (#11751)" (#11756) This reverts commit b1b782d8d6acb70e1f0c0e636e31fa375e170923. --- roles/kubernetes/control-plane/defaults/main/main.yml | 5 ----- .../control-plane/templates/kubeadm-config.v1beta4.yaml.j2 | 1 - 2 files changed, 6 deletions(-) diff --git a/roles/kubernetes/control-plane/defaults/main/main.yml b/roles/kubernetes/control-plane/defaults/main/main.yml index 00da94347d7..d3a28bc2154 100644 --- a/roles/kubernetes/control-plane/defaults/main/main.yml +++ b/roles/kubernetes/control-plane/defaults/main/main.yml @@ -236,8 +236,3 @@ kube_apiserver_tracing_sampling_rate_per_million: 100 # Enable kubeadm file discovery if anonymous access has been removed kubeadm_use_file_discovery: "{{ remove_anonymous_access }}" - -# Supported asymmetric encryption algorithm types for the cluster's keys and certificates. -# can be one of RSA-2048(default), RSA-3072, RSA-4096, ECDSA-P256 -# ref: https://kubernetes.io/docs/reference/config-api/kubeadm-config.v1beta4/#kubeadm-k8s-io-v1beta4-ClusterConfiguration -kube_asymmetric_encryption_algorithm: "RSA-2048" diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 index be03b489f54..1d5ac1d8f8f 100644 --- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 +++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 @@ -37,7 +37,6 @@ patches: apiVersion: kubeadm.k8s.io/v1beta4 kind: ClusterConfiguration clusterName: {{ cluster_name }} -encryptionAlgorithm: {{ kube_asymmetric_encryption_algorithm }} etcd: {% if etcd_deployment_type != "kubeadm" %} external: