github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #124575 from sttts/sttts-unused-peerca

Browse Source 
kube-apiserver/aggregator: remove unused PeerCAFile in config
This commit is contained in:
Kubernetes Prow Robot
2024-04-26 15:24:36 -07:00
committed by GitHub
parent 563885e4bd 7e0fea2331
commit a5753f60d6
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-apiserver/app/aggregator.go
View File

@@ -115,7 +115,6 @@ func createAggregatorConfig(
ExtraConfig: aggregatorapiserver.ExtraConfig{ ExtraConfig: aggregatorapiserver.ExtraConfig{
ProxyClientCertFile: commandOptions.ProxyClientCertFile, ProxyClientCertFile: commandOptions.ProxyClientCertFile,
ProxyClientKeyFile: commandOptions.ProxyClientKeyFile, ProxyClientKeyFile: commandOptions.ProxyClientKeyFile,
PeerCAFile: commandOptions.PeerCAFile,
PeerAdvertiseAddress: commandOptions.PeerAdvertiseAddress, PeerAdvertiseAddress: commandOptions.PeerAdvertiseAddress,
ServiceResolver: serviceResolver, ServiceResolver: serviceResolver,
ProxyTransport: proxyTransport, ProxyTransport: proxyTransport,

4
pkg/controlplane/instance.go
View File

@@ -162,10 +162,6 @@ type Extra struct {
PeerProxy utilpeerproxy.Interface PeerProxy utilpeerproxy.Interface
// PeerEndpointLeaseReconciler updates the peer endpoint leases // PeerEndpointLeaseReconciler updates the peer endpoint leases
PeerEndpointLeaseReconciler peerreconcilers.PeerEndpointLeaseReconciler PeerEndpointLeaseReconciler peerreconcilers.PeerEndpointLeaseReconciler
// PeerCAFile is the ca bundle used by this kube-apiserver to verify peer apiservers'
// serving certs when routing a request to the peer in the case the request can not be served
// locally due to version skew.
PeerCAFile string
// PeerAdvertiseAddress is the IP for this kube-apiserver which is used by peer apiservers to route a request // PeerAdvertiseAddress is the IP for this kube-apiserver which is used by peer apiservers to route a request
// to this apiserver. This happens in cases where the peer is not able to serve the request due to // to this apiserver. This happens in cases where the peer is not able to serve the request due to
// version skew. If unset, AdvertiseAddress/BindAddress will be used. // version skew. If unset, AdvertiseAddress/BindAddress will be used.

5
staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
View File

@@ -77,11 +77,6 @@ const (
// ExtraConfig represents APIServices-specific configuration // ExtraConfig represents APIServices-specific configuration
type ExtraConfig struct { type ExtraConfig struct {
// PeerCAFile is the ca bundle used by this kube-apiserver to verify peer apiservers'
// serving certs when routing a request to the peer in the case the request can not be served
// locally due to version skew.
PeerCAFile string
// PeerAdvertiseAddress is the IP for this kube-apiserver which is used by peer apiservers to route a request // PeerAdvertiseAddress is the IP for this kube-apiserver which is used by peer apiservers to route a request
// to this apiserver. This happens in cases where the peer is not able to serve the request due to // to this apiserver. This happens in cases where the peer is not able to serve the request due to
// version skew. If unset, AdvertiseAddress/BindAddress will be used. // version skew. If unset, AdvertiseAddress/BindAddress will be used.