mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-08 03:33:56 +00:00
Merge pull request #115399 from 3u13r/feat/documentTLS13Exception
Add note about TLS 1.3 cipher suites
This commit is contained in:
commit
779abe6ebe
@ -1061,6 +1061,12 @@ func InitializeTLS(kf *options.KubeletFlags, kc *kubeletconfiginternal.KubeletCo
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if minTLSVersion == tls.VersionTLS13 {
|
||||||
|
if len(tlsCipherSuites) != 0 {
|
||||||
|
klog.InfoS("Warning: TLS 1.3 cipher suites are not configurable, ignoring --tls-cipher-suites")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tlsOptions := &server.TLSOptions{
|
tlsOptions := &server.TLSOptions{
|
||||||
Config: &tls.Config{
|
Config: &tls.Config{
|
||||||
MinVersion: minTLSVersion,
|
MinVersion: minTLSVersion,
|
||||||
|
2
pkg/generated/openapi/zz_generated.openapi.go
generated
2
pkg/generated/openapi/zz_generated.openapi.go
generated
@ -58160,7 +58160,7 @@ func schema_k8sio_kubelet_config_v1beta1_KubeletConfiguration(ref common.Referen
|
|||||||
},
|
},
|
||||||
"tlsCipherSuites": {
|
"tlsCipherSuites": {
|
||||||
SchemaProps: spec.SchemaProps{
|
SchemaProps: spec.SchemaProps{
|
||||||
Description: "tlsCipherSuites is the list of allowed cipher suites for the server. Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants). Default: nil",
|
Description: "tlsCipherSuites is the list of allowed cipher suites for the server. Note that TLS 1.3 ciphersuites are not configurable. Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants). Default: nil",
|
||||||
Type: []string{"array"},
|
Type: []string{"array"},
|
||||||
Items: &spec.SchemaOrArray{
|
Items: &spec.SchemaOrArray{
|
||||||
Schema: &spec.Schema{
|
Schema: &spec.Schema{
|
||||||
|
@ -123,6 +123,7 @@ type KubeletConfiguration struct {
|
|||||||
// tlsPrivateKeyFile is the file containing x509 private key matching tlsCertFile
|
// tlsPrivateKeyFile is the file containing x509 private key matching tlsCertFile
|
||||||
TLSPrivateKeyFile string
|
TLSPrivateKeyFile string
|
||||||
// TLSCipherSuites is the list of allowed cipher suites for the server.
|
// TLSCipherSuites is the list of allowed cipher suites for the server.
|
||||||
|
// Note that TLS 1.3 ciphersuites are not configurable.
|
||||||
// Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants).
|
// Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants).
|
||||||
TLSCipherSuites []string
|
TLSCipherSuites []string
|
||||||
// TLSMinVersion is the minimum TLS version supported.
|
// TLSMinVersion is the minimum TLS version supported.
|
||||||
|
@ -150,6 +150,7 @@ type KubeletConfiguration struct {
|
|||||||
// +optional
|
// +optional
|
||||||
TLSPrivateKeyFile string `json:"tlsPrivateKeyFile,omitempty"`
|
TLSPrivateKeyFile string `json:"tlsPrivateKeyFile,omitempty"`
|
||||||
// tlsCipherSuites is the list of allowed cipher suites for the server.
|
// tlsCipherSuites is the list of allowed cipher suites for the server.
|
||||||
|
// Note that TLS 1.3 ciphersuites are not configurable.
|
||||||
// Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants).
|
// Values are from tls package constants (https://golang.org/pkg/crypto/tls/#pkg-constants).
|
||||||
// Default: nil
|
// Default: nil
|
||||||
// +optional
|
// +optional
|
||||||
|
Loading…
Reference in New Issue
Block a user