diff --git a/hack/update-openapi-spec.sh b/hack/update-openapi-spec.sh index 78bb8791c90..ba6ec258c48 100755 --- a/hack/update-openapi-spec.sh +++ b/hack/update-openapi-spec.sh @@ -87,6 +87,7 @@ kube-apiserver \ --service-account-lookup="${SERVICE_ACCOUNT_LOOKUP}" \ --service-account-issuer="https://kubernetes.default.svc" \ --service-account-signing-key-file="${SERVICE_ACCOUNT_KEY}" \ + --enable-logs-handler=true \ --v=2 \ --service-cluster-ip-range="10.0.0.0/24" >"${API_LOGFILE}" 2>&1 & APISERVER_PID=$! diff --git a/pkg/controlplane/apiserver/options/options.go b/pkg/controlplane/apiserver/options/options.go index 2da89f9555d..f21faca2a27 100644 --- a/pkg/controlplane/apiserver/options/options.go +++ b/pkg/controlplane/apiserver/options/options.go @@ -114,7 +114,7 @@ func NewOptions() *Options { Logs: logs.NewOptions(), Traces: genericoptions.NewTracingOptions(), - EnableLogsHandler: true, + EnableLogsHandler: false, EventTTL: 1 * time.Hour, AggregatorRejectForwardingRedirects: true, 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, "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, ""+ "If non-zero, throttle each user connection to this number of bytes/sec. "+ diff --git a/test/e2e/network/networking.go b/test/e2e/network/networking.go index be7f99b077f..82ca6b9b577 100644 --- a/test/e2e/network/networking.go +++ b/test/e2e/network/networking.go @@ -118,9 +118,6 @@ var _ = common.SIGDescribe("Networking", func() { {path: "/version"}, // TODO: test proxy links here } - if !framework.ProviderIs("gke", "skeleton") { - tests = append(tests, struct{ path string }{path: "/logs"}) - } for _, test := range tests { ginkgo.By(fmt.Sprintf("testing: %s", test.path)) data, err := f.ClientSet.CoreV1().RESTClient().Get().