mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-04 09:49:50 +00:00
Merge pull request #125787 from dims/pandaamanda-remove_apiserver_logs_api
kube-apiserver: default --enable-logs-handler flag to false
This commit is contained in:
commit
a9c156baef
@ -87,6 +87,7 @@ kube-apiserver \
|
|||||||
--service-account-lookup="${SERVICE_ACCOUNT_LOOKUP}" \
|
--service-account-lookup="${SERVICE_ACCOUNT_LOOKUP}" \
|
||||||
--service-account-issuer="https://kubernetes.default.svc" \
|
--service-account-issuer="https://kubernetes.default.svc" \
|
||||||
--service-account-signing-key-file="${SERVICE_ACCOUNT_KEY}" \
|
--service-account-signing-key-file="${SERVICE_ACCOUNT_KEY}" \
|
||||||
|
--enable-logs-handler=true \
|
||||||
--v=2 \
|
--v=2 \
|
||||||
--service-cluster-ip-range="10.0.0.0/24" >"${API_LOGFILE}" 2>&1 &
|
--service-cluster-ip-range="10.0.0.0/24" >"${API_LOGFILE}" 2>&1 &
|
||||||
APISERVER_PID=$!
|
APISERVER_PID=$!
|
||||||
|
@ -114,7 +114,7 @@ func NewOptions() *Options {
|
|||||||
Logs: logs.NewOptions(),
|
Logs: logs.NewOptions(),
|
||||||
Traces: genericoptions.NewTracingOptions(),
|
Traces: genericoptions.NewTracingOptions(),
|
||||||
|
|
||||||
EnableLogsHandler: true,
|
EnableLogsHandler: false,
|
||||||
EventTTL: 1 * time.Hour,
|
EventTTL: 1 * time.Hour,
|
||||||
AggregatorRejectForwardingRedirects: true,
|
AggregatorRejectForwardingRedirects: true,
|
||||||
SystemNamespaces: []string{metav1.NamespaceSystem, metav1.NamespacePublic, metav1.NamespaceDefault},
|
SystemNamespaces: []string{metav1.NamespaceSystem, metav1.NamespacePublic, metav1.NamespaceDefault},
|
||||||
@ -150,7 +150,7 @@ func (s *Options) AddFlags(fss *cliflag.NamedFlagSets) {
|
|||||||
|
|
||||||
fs.BoolVar(&s.EnableLogsHandler, "enable-logs-handler", s.EnableLogsHandler,
|
fs.BoolVar(&s.EnableLogsHandler, "enable-logs-handler", s.EnableLogsHandler,
|
||||||
"If true, install a /logs handler for the apiserver logs.")
|
"If true, install a /logs handler for the apiserver logs.")
|
||||||
fs.MarkDeprecated("enable-logs-handler", "This flag will be removed in v1.19")
|
fs.MarkDeprecated("enable-logs-handler", "This flag will be removed in v1.33") //nolint:errcheck
|
||||||
|
|
||||||
fs.Int64Var(&s.MaxConnectionBytesPerSec, "max-connection-bytes-per-sec", s.MaxConnectionBytesPerSec, ""+
|
fs.Int64Var(&s.MaxConnectionBytesPerSec, "max-connection-bytes-per-sec", s.MaxConnectionBytesPerSec, ""+
|
||||||
"If non-zero, throttle each user connection to this number of bytes/sec. "+
|
"If non-zero, throttle each user connection to this number of bytes/sec. "+
|
||||||
|
@ -118,9 +118,6 @@ var _ = common.SIGDescribe("Networking", func() {
|
|||||||
{path: "/version"},
|
{path: "/version"},
|
||||||
// TODO: test proxy links here
|
// TODO: test proxy links here
|
||||||
}
|
}
|
||||||
if !framework.ProviderIs("gke", "skeleton") {
|
|
||||||
tests = append(tests, struct{ path string }{path: "/logs"})
|
|
||||||
}
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
ginkgo.By(fmt.Sprintf("testing: %s", test.path))
|
ginkgo.By(fmt.Sprintf("testing: %s", test.path))
|
||||||
data, err := f.ClientSet.CoreV1().RESTClient().Get().
|
data, err := f.ClientSet.CoreV1().RESTClient().Get().
|
||||||
|
Loading…
Reference in New Issue
Block a user