Skip to content

K
k3s
Commit 3484ae9e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51888 from tengqm/fix-api-server-help

Automatic merge from submit-queue (batch tested with PRs 51031, 51705, 51888, 51727, 51684). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Avoid hard-coding location for auto-generated cert files **What this PR does / why we need it**: This fixes the confusing/incorrect help message for "--tls-cert-file" in apiserver package. **Which issue this PR fixes**: fixes #51887 **Special notes for your reviewer**: Please advise if a release note is needed. **Release note**: ```release-note NONE ```
parents 815b894d acad7467
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
staging/src/k8s.io/apiserver/pkg/server/options/serving.go
View file @ 3484ae9e
......@@ -116,7 +116,7 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) {
"File containing the default x509 Certificate for HTTPS. (CA cert, if any, concatenated "+
"after server cert). If HTTPS serving is enabled, and --tls-cert-file and "+
"--tls-private-key-file are not provided, a self-signed certificate and key "+
"are generated for the public address and saved to /var/run/kubernetes.")
"are generated for the public address and saved to the directory specified by --cert-dir.")
fs.StringVar(&s.ServerCert.CertKey.KeyFile, "tls-private-key-file", s.ServerCert.CertKey.KeyFile,
"File containing the default x509 private key matching --tls-cert-file.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment