Merge pull request #45087 from sttts/sttts-sni-key-cert

Automatic merge from submit-queue apiserver: fix --tls-sni-cert-key doc string Fixes #43961.

Merge pull request #45087 from sttts/sttts-sni-key-cert
3a81a860 · Kubernetes Submit Queue · GitHub · 1780a527 · 53365880 · 3a81a860
Commit 3a81a860 authored May 08, 2017 by Kubernetes Submit Queue Committed by GitHub May 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

serving.go staging/src/k8s.io/apiserver/pkg/server/options/serving.go +1 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/options/serving.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/serving.go
@@ -125,7 +125,7 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) {
 		"extracted. Non-wildcard matches trump over wildcard matches, explicit domain patterns "+
 		"trump over extracted names. For multiple key/certificate pairs, use the "+
 		"--tls-sni-cert-key multiple times. "+
-		"Examples: \"example.key,example.crt\" or \"*.foo.com,foo.com:foo.key,foo.crt\".")
+		"Examples: \"example.crt,example.key\" or \"foo.crt,foo.key:*.foo.com,foo.com\".")
 }

 func (s *SecureServingOptions) AddDeprecatedFlags(fs *pflag.FlagSet) {