kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61386 from hzxuzhonghu/remove-tls-ca-file 

Automatic merge from submit-queue (batch tested with PRs 61354, 61366, 61386, 61394, 60755). 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>.

remove unused tls-ca-file flag

**What this PR does / why we need it**:

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
Remove `--tls-ca-file` flag.
```

Kubernetes-commit: e47280fca9c4c3c6eff9f7dc3cf7436c8abdffd2
This commit is contained in:
Kubernetes Publisher 2018-03-21 23:44:13 -07:00
parent bd919879bd 240b9cf032
commit f46ec09bda
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/options/serving.go
View File

@ -156,11 +156,6 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) {
"The limit that the server gives to clients for "+ "The limit that the server gives to clients for "+
"the maximum number of streams in an HTTP/2 connection. "+ "the maximum number of streams in an HTTP/2 connection. "+
"Zero means to use golang's default.") "Zero means to use golang's default.")
// TODO remove this flag in 1.11. The flag had no effect before this will prevent scripts from immediately failing on upgrade.
fs.String("tls-ca-file", "", "This flag has no effect.")
fs.MarkDeprecated("tls-ca-file", "This flag has no effect.")
} }
// ApplyTo fills up serving information in the server configuration. // ApplyTo fills up serving information in the server configuration.