github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-21 23:44:13 -07:00 committed by GitHub
commit e47280fca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiserver/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 maximum number of streams in an HTTP/2 connection. "+
"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.

1
staging/src/k8s.io/kube-aggregator/artifacts/hostpath-pods/insecure-etcd-pod.yaml
View File

@ -19,7 +19,6 @@ spec:
- "--proxy-client-key-file=/var/run/auth-proxy-client/client-auth-proxy.key"
- "--tls-cert-file=/var/run/serving-cert/serving-kube-aggregator.crt"
- "--tls-private-key-file=/var/run/serving-cert/serving-kube-aggregator.key"
- "--tls-ca-file=/var/run/serving-ca/server-ca.crt"
- "--client-ca-file=/var/run/client-ca/client-ca.crt"
- "--requestheader-username-headers=X-Remote-User"
- "--requestheader-group-headers=X-Remote-Group"

1
staging/src/k8s.io/kube-aggregator/artifacts/self-contained/kubernetes-discover-pod.yaml
View File

@ -40,7 +40,6 @@ spec:
- "--proxy-client-key-file=/var/run/auth-proxy-client/tls.key"
- "--tls-cert-file=/var/run/serving-cert/tls.crt"
- "--tls-private-key-file=/var/run/serving-cert/tls.key"
- "--tls-ca-file=/var/run/serving-ca/ca.crt"
- "--etcd-servers=https://etcd.kube-public.svc:4001"
- "--etcd-certfile=/var/run/etcd-client-cert/tls.crt"
- "--etcd-keyfile=/var/run/etcd-client-cert/tls.key"