Skip to content

Commit a9c156b

Browse files
authored
Merge pull request kubernetes#125787 from dims/pandaamanda-remove_apiserver_logs_api
kube-apiserver: default --enable-logs-handler flag to false
2 parents fa75b43 + a88dc63 commit a9c156b

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

hack/update-openapi-spec.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ kube-apiserver \
8787
--service-account-lookup="${SERVICE_ACCOUNT_LOOKUP}" \
8888
--service-account-issuer="https://kubernetes.default.svc" \
8989
--service-account-signing-key-file="${SERVICE_ACCOUNT_KEY}" \
90+
--enable-logs-handler=true \
9091
--v=2 \
9192
--service-cluster-ip-range="10.0.0.0/24" >"${API_LOGFILE}" 2>&1 &
9293
APISERVER_PID=$!

pkg/controlplane/apiserver/options/options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func NewOptions() *Options {
114114
Logs: logs.NewOptions(),
115115
Traces: genericoptions.NewTracingOptions(),
116116

117-
EnableLogsHandler: true,
117+
EnableLogsHandler: false,
118118
EventTTL: 1 * time.Hour,
119119
AggregatorRejectForwardingRedirects: true,
120120
SystemNamespaces: []string{metav1.NamespaceSystem, metav1.NamespacePublic, metav1.NamespaceDefault},
@@ -150,7 +150,7 @@ func (s *Options) AddFlags(fss *cliflag.NamedFlagSets) {
150150

151151
fs.BoolVar(&s.EnableLogsHandler, "enable-logs-handler", s.EnableLogsHandler,
152152
"If true, install a /logs handler for the apiserver logs.")
153-
fs.MarkDeprecated("enable-logs-handler", "This flag will be removed in v1.19")
153+
fs.MarkDeprecated("enable-logs-handler", "This flag will be removed in v1.33") //nolint:errcheck
154154

155155
fs.Int64Var(&s.MaxConnectionBytesPerSec, "max-connection-bytes-per-sec", s.MaxConnectionBytesPerSec, ""+
156156
"If non-zero, throttle each user connection to this number of bytes/sec. "+

test/e2e/network/networking.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ var _ = common.SIGDescribe("Networking", func() {
118118
{path: "/version"},
119119
// TODO: test proxy links here
120120
}
121-
if !framework.ProviderIs("gke", "skeleton") {
122-
tests = append(tests, struct{ path string }{path: "/logs"})
123-
}
124121
for _, test := range tests {
125122
ginkgo.By(fmt.Sprintf("testing: %s", test.path))
126123
data, err := f.ClientSet.CoreV1().RESTClient().Get().

0 commit comments

Comments
 (0)