From 9c0803e14c0d76e2e8225db546c0d2ce0b522ab7 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Tue, 20 Mar 2018 15:26:31 +0800 Subject: [PATCH] remove unused rls-ca-file flag --- staging/src/k8s.io/apiserver/pkg/server/options/serving.go | 5 ----- .../artifacts/hostpath-pods/insecure-etcd-pod.yaml | 1 - .../artifacts/self-contained/kubernetes-discover-pod.yaml | 1 - 3 files changed, 7 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/serving.go b/staging/src/k8s.io/apiserver/pkg/server/options/serving.go index c4c2bf9865f..27536571382 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/serving.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/serving.go @@ -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. diff --git a/staging/src/k8s.io/kube-aggregator/artifacts/hostpath-pods/insecure-etcd-pod.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/hostpath-pods/insecure-etcd-pod.yaml index 4cc60730324..cbd45fde759 100644 --- a/staging/src/k8s.io/kube-aggregator/artifacts/hostpath-pods/insecure-etcd-pod.yaml +++ b/staging/src/k8s.io/kube-aggregator/artifacts/hostpath-pods/insecure-etcd-pod.yaml @@ -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" diff --git a/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/kubernetes-discover-pod.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/kubernetes-discover-pod.yaml index f109310dff1..d8ec0137fe9 100644 --- a/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/kubernetes-discover-pod.yaml +++ b/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/kubernetes-discover-pod.yaml @@ -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"