github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Add --logging-format flag for kube-apiserver

Browse Source
This commit is contained in:
tahsinrahman 2020-05-28 00:26:22 +08:00 committed by tahsinrahman
parent 87473a5d27
commit 201f869c66
5 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/options/BUILD
View File

@ -34,6 +34,7 @@ go_library(
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
"//staging/src/k8s.io/component-base/logs:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library",
"//staging/src/k8s.io/kube-aggregator/pkg/apiserver/scheme:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/apiserver/scheme:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library",
@ -66,6 +67,7 @@ go_test(
"//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
"//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
"//staging/src/k8s.io/component-base/logs:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library",
"//vendor/github.com/google/go-cmp/cmp:go_default_library", "//vendor/github.com/google/go-cmp/cmp:go_default_library",
"//vendor/github.com/google/go-cmp/cmp/cmpopts:go_default_library", "//vendor/github.com/google/go-cmp/cmp/cmpopts:go_default_library",

4
cmd/kube-apiserver/app/options/options.go
View File

@ -26,6 +26,7 @@ import (
genericoptions "k8s.io/apiserver/pkg/server/options" genericoptions "k8s.io/apiserver/pkg/server/options"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
cliflag "k8s.io/component-base/cli/flag" cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
"k8s.io/component-base/metrics" "k8s.io/component-base/metrics"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
_ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates _ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
@ -51,6 +52,7 @@ type ServerRunOptions struct {
APIEnablement *genericoptions.APIEnablementOptions APIEnablement *genericoptions.APIEnablementOptions
EgressSelector *genericoptions.EgressSelectorOptions EgressSelector *genericoptions.EgressSelectorOptions
Metrics *metrics.Options Metrics *metrics.Options
Logs *logs.Options
AllowPrivileged bool AllowPrivileged bool
EnableLogsHandler bool EnableLogsHandler bool
@ -100,6 +102,7 @@ func NewServerRunOptions() *ServerRunOptions {
APIEnablement: genericoptions.NewAPIEnablementOptions(), APIEnablement: genericoptions.NewAPIEnablementOptions(),
EgressSelector: genericoptions.NewEgressSelectorOptions(), EgressSelector: genericoptions.NewEgressSelectorOptions(),
Metrics: metrics.NewOptions(), Metrics: metrics.NewOptions(),
Logs: logs.NewOptions(),
EnableLogsHandler: true, EnableLogsHandler: true,
EventTTL: 1 * time.Hour, EventTTL: 1 * time.Hour,
@ -149,6 +152,7 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
s.EgressSelector.AddFlags(fss.FlagSet("egress selector")) s.EgressSelector.AddFlags(fss.FlagSet("egress selector"))
s.Admission.AddFlags(fss.FlagSet("admission")) s.Admission.AddFlags(fss.FlagSet("admission"))
s.Metrics.AddFlags(fss.FlagSet("metrics")) s.Metrics.AddFlags(fss.FlagSet("metrics"))
s.Logs.AddFlags(fss.FlagSet("logs"))
// Note: the weird ""+ in below lines seems to be the only way to get gofmt to // Note: the weird ""+ in below lines seems to be the only way to get gofmt to
// arrange these text blocks sensibly. Grrr. // arrange these text blocks sensibly. Grrr.

2
cmd/kube-apiserver/app/options/options_test.go
View File

@ -25,6 +25,7 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/component-base/logs"
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
apiserveroptions "k8s.io/apiserver/pkg/server/options" apiserveroptions "k8s.io/apiserver/pkg/server/options"
@ -309,6 +310,7 @@ func TestAddFlags(t *testing.T) {
ProxyClientKeyFile: "/var/run/kubernetes/proxy.key", ProxyClientKeyFile: "/var/run/kubernetes/proxy.key",
ProxyClientCertFile: "/var/run/kubernetes/proxy.crt", ProxyClientCertFile: "/var/run/kubernetes/proxy.crt",
Metrics: &metrics.Options{}, Metrics: &metrics.Options{},
Logs: logs.NewOptions(),
} }
if !reflect.DeepEqual(expected, s) { if !reflect.DeepEqual(expected, s) {

1
cmd/kube-apiserver/app/options/validation.go
View File

@ -174,6 +174,7 @@ func (s *ServerRunOptions) Validate() []error {
errs = append(errs, s.APIEnablement.Validate(legacyscheme.Scheme, apiextensionsapiserver.Scheme, aggregatorscheme.Scheme)...) errs = append(errs, s.APIEnablement.Validate(legacyscheme.Scheme, apiextensionsapiserver.Scheme, aggregatorscheme.Scheme)...)
errs = append(errs, validateTokenRequest(s)...) errs = append(errs, validateTokenRequest(s)...)
errs = append(errs, s.Metrics.Validate()...) errs = append(errs, s.Metrics.Validate()...)
errs = append(errs, s.Logs.Validate()...)
return errs return errs
} }

2
cmd/kube-apiserver/app/server.go
View File

@ -302,6 +302,8 @@ func CreateKubeAPIServerConfig(
s.Metrics.Apply() s.Metrics.Apply()
serviceaccount.RegisterMetrics() serviceaccount.RegisterMetrics()
s.Logs.Apply()
serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange) serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange)
if err != nil { if err != nil {
return nil, nil, nil, nil, err return nil, nil, nil, nil, err