Add an option for aggregator
This commit is contained in:
@@ -111,10 +111,11 @@ func createAggregatorConfig(
|
||||
SharedInformerFactory: externalInformers,
|
||||
},
|
||||
ExtraConfig: aggregatorapiserver.ExtraConfig{
|
||||
ProxyClientCertFile: commandOptions.ProxyClientCertFile,
|
||||
ProxyClientKeyFile: commandOptions.ProxyClientKeyFile,
|
||||
ServiceResolver: serviceResolver,
|
||||
ProxyTransport: proxyTransport,
|
||||
ProxyClientCertFile: commandOptions.ProxyClientCertFile,
|
||||
ProxyClientKeyFile: commandOptions.ProxyClientKeyFile,
|
||||
ServiceResolver: serviceResolver,
|
||||
ProxyTransport: proxyTransport,
|
||||
RejectForwardingRedirects: commandOptions.AggregatorRejectForwardingRedirects,
|
||||
},
|
||||
}
|
||||
|
||||
|
@@ -76,7 +76,8 @@ type ServerRunOptions struct {
|
||||
ProxyClientCertFile string
|
||||
ProxyClientKeyFile string
|
||||
|
||||
EnableAggregatorRouting bool
|
||||
EnableAggregatorRouting bool
|
||||
AggregatorRejectForwardingRedirects bool
|
||||
|
||||
MasterCount int
|
||||
EndpointReconcilerType string
|
||||
@@ -132,7 +133,8 @@ func NewServerRunOptions() *ServerRunOptions {
|
||||
},
|
||||
HTTPTimeout: time.Duration(5) * time.Second,
|
||||
},
|
||||
ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange,
|
||||
ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange,
|
||||
AggregatorRejectForwardingRedirects: true,
|
||||
}
|
||||
|
||||
// Overwrite the default for storage data format.
|
||||
@@ -244,6 +246,9 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
|
||||
fs.BoolVar(&s.EnableAggregatorRouting, "enable-aggregator-routing", s.EnableAggregatorRouting,
|
||||
"Turns on aggregator routing requests to endpoints IP rather than cluster IP.")
|
||||
|
||||
fs.BoolVar(&s.AggregatorRejectForwardingRedirects, "aggregator-reject-forwarding-redirect", s.AggregatorRejectForwardingRedirects,
|
||||
"Aggregator reject forwarding redirect response back to client.")
|
||||
|
||||
fs.StringVar(&s.ServiceAccountSigningKeyFile, "service-account-signing-key-file", s.ServiceAccountSigningKeyFile, ""+
|
||||
"Path to the file that contains the current private key of the service account token issuer. The issuer will sign issued ID tokens with this private key.")
|
||||
|
||||
|
@@ -318,8 +318,9 @@ func TestAddFlags(t *testing.T) {
|
||||
Traces: &apiserveroptions.TracingOptions{
|
||||
ConfigFile: "/var/run/kubernetes/tracing_config.yaml",
|
||||
},
|
||||
IdentityLeaseDurationSeconds: 3600,
|
||||
IdentityLeaseRenewIntervalSeconds: 10,
|
||||
IdentityLeaseDurationSeconds: 3600,
|
||||
IdentityLeaseRenewIntervalSeconds: 10,
|
||||
AggregatorRejectForwardingRedirects: true,
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(expected, s) {
|
||||
|
Reference in New Issue
Block a user