From 45c337bb1fa199aa188f083e9e1b2464d55340e9 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 12 Jan 2023 01:40:22 +0000 Subject: [PATCH] Pass through default tls-cipher-suites Signed-off-by: Brad Davidson --- pkg/cli/server/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go index 0076d97dc3..e19a03421b 100644 --- a/pkg/cli/server/server.go +++ b/pkg/cli/server/server.go @@ -372,7 +372,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont serverConfig.ControlConfig.Disables["ccm"] = true } - tlsMinVersionArg := getArgValueFromList("tls-min-version", cfg.ExtraAPIArgs) + tlsMinVersionArg := getArgValueFromList("tls-min-version", serverConfig.ControlConfig.ExtraAPIArgs) serverConfig.ControlConfig.TLSMinVersion, err = kubeapiserverflag.TLSVersion(tlsMinVersionArg) if err != nil { return errors.Wrap(err, "invalid tls-min-version") @@ -386,7 +386,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont // TLS config based on mozilla ssl-config generator // https://ssl-config.mozilla.org/#server=golang&version=1.13.6&config=intermediate&guideline=5.4 // Need to disable the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 Cipher for TLS1.2 - tlsCipherSuitesArg := getArgValueFromList("tls-cipher-suites", cfg.ExtraAPIArgs) + tlsCipherSuitesArg := getArgValueFromList("tls-cipher-suites", serverConfig.ControlConfig.ExtraAPIArgs) tlsCipherSuites := strings.Split(tlsCipherSuitesArg, ",") for i := range tlsCipherSuites { tlsCipherSuites[i] = strings.TrimSpace(tlsCipherSuites[i]) @@ -400,6 +400,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", } + serverConfig.ControlConfig.ExtraAPIArgs = append(serverConfig.ControlConfig.ExtraAPIArgs, "tls-cipher-suites="+strings.Join(tlsCipherSuites, ",")) } serverConfig.ControlConfig.TLSCipherSuites, err = kubeapiserverflag.TLSCipherSuites(tlsCipherSuites) if err != nil {