-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This patch introduces two new flags to configure TLS options on the managers: 1. --tls-min-version which is used to set the minimum TLS version in use by the webhook server. 2. --tls-cipher-suites which is used to set the TLS cipher suites in use by the webhook server. The minimum TLS version defaults to 1.2 Signed-off-by: Sagar Muchhal <muchhals@vmware.com>
- Loading branch information
Showing
4 changed files
with
109 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // Package flags implements the webhook server TLS options utilities. | ||
| package flags | ||
|
|
||
| import ( | ||
| "crypto/tls" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/spf13/pflag" | ||
| cliflag "k8s.io/component-base/cli/flag" | ||
| ) | ||
|
|
||
| // SecureWebhookOptions has the options to configure the TLS settings for a webhook server. | ||
| type SecureWebhookOptions struct { | ||
| TLSMinVersion string | ||
| TLSCipherSuites []string | ||
| } | ||
|
|
||
| // AddSecureWebhookFlags adds the webhook server TLS configuration flags | ||
| // to the default flag set. | ||
| func AddSecureWebhookFlags(fs *pflag.FlagSet, options *SecureWebhookOptions) { | ||
| fs.StringVar(&options.TLSMinVersion, "tls-min-version", "", | ||
| "The minimum TLS version in use by the webhook server.\n"+ | ||
| fmt.Sprintf("Possible values are %s.", strings.Join(cliflag.TLSPossibleVersions(), ", ")), | ||
| ) | ||
|
|
||
| tlsCipherPreferredValues := cliflag.PreferredTLSCipherNames() | ||
| tlsCipherInsecureValues := cliflag.InsecureTLSCipherNames() | ||
| fs.StringSliceVar(&options.TLSCipherSuites, "tls-cipher-suites", []string{}, | ||
| "Comma-separated list of cipher suites for the webhook server. "+ | ||
| "If omitted, the default Go cipher suites will be used. \n"+ | ||
| "Preferred values: "+strings.Join(tlsCipherPreferredValues, ", ")+". \n"+ | ||
| "Insecure values: "+strings.Join(tlsCipherInsecureValues, ", ")+".") | ||
| } | ||
|
|
||
| // CalculateTLSOpts returns a list of TLS configuration overrides | ||
| // to be used when setting the webhook server. | ||
| func CalculateTLSOpts(options SecureWebhookOptions) ([]func(*tls.Config), error) { | ||
| var tlsOptions []func(config *tls.Config) | ||
| tlsVersion, err := cliflag.TLSVersion(options.TLSMinVersion) | ||
| if err != nil { | ||
| return tlsOptions, err | ||
| } | ||
| tlsOptions = append(tlsOptions, func(cfg *tls.Config) { | ||
| cfg.MinVersion = tlsVersion | ||
| }) | ||
|
|
||
| if len(options.TLSCipherSuites) != 0 { | ||
| suites, err := cliflag.TLSCipherSuites(options.TLSCipherSuites) | ||
| if err != nil { | ||
| return tlsOptions, err | ||
| } | ||
| tlsOptions = append(tlsOptions, func(cfg *tls.Config) { | ||
| cfg.CipherSuites = suites | ||
| }) | ||
| } | ||
| return tlsOptions, nil | ||
| } |