diff --git a/docs/en/create-cluster/bare-metal.mdx b/docs/en/create-cluster/bare-metal.mdx index d08cbb58..0e3c01e6 100644 --- a/docs/en/create-cluster/bare-metal.mdx +++ b/docs/en/create-cluster/bare-metal.mdx @@ -345,26 +345,36 @@ spec: etcd: local: imageTag: + extraArgs: + tls-min-version: TLS1.2 + cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" apiServer: extraArgs: profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" controllerManager: extraArgs: profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" scheduler: extraArgs: profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" initConfiguration: nodeRegistration: kubeletExtraArgs: node-labels: "kube-ovn/role=master" + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" joinConfiguration: nodeRegistration: kubeletExtraArgs: node-labels: "kube-ovn/role=master" + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" --- apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster @@ -636,6 +646,9 @@ spec: etcd: local: imageTag: + extraArgs: + tls-min-version: TLS1.2 + cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" apiServer: extraArgs: audit-log-format: json @@ -646,7 +659,7 @@ spec: audit-log-mode: batch audit-log-path: /etc/kubernetes/audit/audit.log audit-policy-file: /etc/kubernetes/audit/policy.yaml - tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" admission-control-config-file: /etc/kubernetes/admission/psa-config.yaml tls-min-version: VersionTLS12 kubelet-certificate-authority: /etc/kubernetes/pki/ca.crt @@ -660,10 +673,12 @@ spec: bind-address: "::" profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" scheduler: extraArgs: bind-address: "::" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" profiling: "false" initConfiguration: patches: @@ -671,12 +686,16 @@ spec: nodeRegistration: kubeletExtraArgs: node-labels: "kube-ovn/role=master" + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" joinConfiguration: patches: directory: /etc/kubernetes/patches nodeRegistration: kubeletExtraArgs: node-labels: "kube-ovn/role=master" + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" ``` Worker bootstrap is symmetric — see [Managing Nodes on Bare Metal → Bootstrap Template](../manage-nodes/bare-metal.mdx#step-3-configure-bootstrap-template) for the worker `KubeadmConfigTemplate`. diff --git a/docs/en/create-cluster/huawei-cloud-stack.mdx b/docs/en/create-cluster/huawei-cloud-stack.mdx index 1540d1f3..695eca9a 100644 --- a/docs/en/create-cluster/huawei-cloud-stack.mdx +++ b/docs/en/create-cluster/huawei-cloud-stack.mdx @@ -493,6 +493,9 @@ spec: etcd: local: imageTag: + extraArgs: + tls-min-version: TLS1.2 + cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" apiServer: extraArgs: audit-log-format: json @@ -504,6 +507,7 @@ spec: kubelet-certificate-authority: /etc/kubernetes/pki/ca.crt profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" extraVolumes: - name: vol-dir-0 hostPath: /etc/kubernetes @@ -515,11 +519,13 @@ spec: flex-volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" scheduler: extraArgs: bind-address: "::" profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" postKubeadmCommands: - chmod 600 /var/lib/kubelet/config.yaml initConfiguration: @@ -529,6 +535,8 @@ spec: kubeletExtraArgs: node-labels: "kube-ovn/role=master" protect-kernel-defaults: "true" + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" joinConfiguration: patches: @@ -536,6 +544,8 @@ spec: nodeRegistration: kubeletExtraArgs: node-labels: "kube-ovn/role=master" + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" machineTemplate: nodeDrainTimeout: 1m diff --git a/docs/en/create-cluster/huawei-dcs.mdx b/docs/en/create-cluster/huawei-dcs.mdx index 31d5c7af..c7ed1dd5 100644 --- a/docs/en/create-cluster/huawei-dcs.mdx +++ b/docs/en/create-cluster/huawei-dcs.mdx @@ -334,7 +334,22 @@ spec: etcd: local: imageTag: - # ... (apiServer, controllerManager, scheduler) ... + extraArgs: + tls-min-version: TLS1.2 + cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + apiServer: + extraArgs: + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + controllerManager: + extraArgs: + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + scheduler: + extraArgs: + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + # ... (other apiServer, controllerManager, scheduler fields) ... initConfiguration: patches: directory: /etc/kubernetes/patches @@ -342,6 +357,8 @@ spec: kubeletExtraArgs: node-labels: "kube-ovn/role=master" provider-id: PROVIDER_ID + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" protect-kernel-defaults: "true" joinConfiguration: @@ -352,6 +369,8 @@ spec: node-ip: NODE_IP node-labels: "kube-ovn/role=master" provider-id: PROVIDER_ID + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" protect-kernel-defaults: "true" machineTemplate: @@ -780,6 +799,9 @@ spec: etcd: local: imageTag: + extraArgs: + tls-min-version: TLS1.2 + cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" apiServer: extraArgs: audit-log-format: json @@ -790,7 +812,7 @@ spec: audit-log-mode: batch audit-log-path: /etc/kubernetes/audit/audit.log audit-policy-file: /etc/kubernetes/audit/policy.yaml - tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" encryption-provider-config: /etc/kubernetes/encryption-provider.conf admission-control-config-file: /etc/kubernetes/admission/psa-config.yaml tls-min-version: VersionTLS12 @@ -805,11 +827,13 @@ spec: bind-address: "::" profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" flex-volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" scheduler: extraArgs: bind-address: "::" tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" profiling: "false" initConfiguration: patches: @@ -818,6 +842,8 @@ spec: kubeletExtraArgs: node-labels: "kube-ovn/role=master" provider-id: PROVIDER_ID + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" protect-kernel-defaults: "true" joinConfiguration: @@ -828,6 +854,8 @@ spec: node-ip: NODE_IP node-labels: "kube-ovn/role=master" provider-id: PROVIDER_ID + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" protect-kernel-defaults: "true" machineTemplate: diff --git a/docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx b/docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx index 1ad999fd..a6c0b1f2 100644 --- a/docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx +++ b/docs/en/create-cluster/vmware-vsphere/create-cluster-in-global.mdx @@ -961,6 +961,9 @@ spec: etcd: local: imageTag: + extraArgs: + tls-min-version: TLS1.2 + cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 apiServer: extraArgs: admission-control-config-file: /etc/kubernetes/admission/psa-config.yaml @@ -974,7 +977,7 @@ spec: encryption-provider-config: /etc/kubernetes/encryption-provider.conf kubelet-certificate-authority: /etc/kubernetes/pki/ca.crt profiling: "false" - tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 + tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 tls-min-version: VersionTLS12 extraVolumes: - hostPath: /etc/kubernetes @@ -987,11 +990,13 @@ spec: cloud-provider: external profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 scheduler: extraArgs: bind-address: "::" profiling: "false" tls-min-version: VersionTLS12 + tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 initConfiguration: nodeRegistration: criSocket: /var/run/containerd/containerd.sock @@ -1000,6 +1005,8 @@ spec: kubeletExtraArgs: cloud-provider: external node-labels: kube-ovn/role=master + tls-min-version: VersionTLS12 + tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 name: '{{ local_hostname }}' patches: directory: /etc/kubernetes/patches @@ -1011,6 +1018,8 @@ spec: kubeletExtraArgs: cloud-provider: external node-labels: kube-ovn/role=master + tls-min-version: VersionTLS12 + tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" name: '{{ local_hostname }}' patches: @@ -1122,6 +1131,8 @@ spec: - ImagePull kubeletExtraArgs: cloud-provider: external + tls-min-version: VersionTLS12 + tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" name: '{{ local_hostname }}' patches: diff --git a/docs/en/manage-nodes/bare-metal.mdx b/docs/en/manage-nodes/bare-metal.mdx index e361d1bf..edf68913 100644 --- a/docs/en/manage-nodes/bare-metal.mdx +++ b/docs/en/manage-nodes/bare-metal.mdx @@ -113,6 +113,10 @@ spec: joinConfiguration: patches: directory: /etc/kubernetes/patches + nodeRegistration: + kubeletExtraArgs: + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" ``` The provider applies a minimal normalization to bootstrap user-data before writing it into the `reprovision` plan, so leave the following fields out of the template: diff --git a/docs/en/manage-nodes/huawei-cloud-stack.mdx b/docs/en/manage-nodes/huawei-cloud-stack.mdx index 6b294b1e..83226898 100644 --- a/docs/en/manage-nodes/huawei-cloud-stack.mdx +++ b/docs/en/manage-nodes/huawei-cloud-stack.mdx @@ -283,6 +283,8 @@ spec: directory: /etc/kubernetes/patches nodeRegistration: kubeletExtraArgs: + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" ``` diff --git a/docs/en/manage-nodes/huawei-dcs.mdx b/docs/en/manage-nodes/huawei-dcs.mdx index 5b9cfde3..42c3f5f6 100644 --- a/docs/en/manage-nodes/huawei-dcs.mdx +++ b/docs/en/manage-nodes/huawei-dcs.mdx @@ -295,6 +295,8 @@ spec: kubeletExtraArgs: node-ip: NODE_IP provider-id: PROVIDER_ID + tls-min-version: VersionTLS12 + tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/" protect-kernel-defaults: "true" ```