Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add show-hidden-metrics-for-version to scheduler #84913

Merged
merged 1 commit into from Feb 26, 2020
Merged

Add show-hidden-metrics-for-version to scheduler #84913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/kube-scheduler/app/options/BUILD
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ go_library(
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
"//staging/src/k8s.io/component-base/codec:go_default_library",
"//staging/src/k8s.io/component-base/config:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library",
"//staging/src/k8s.io/kube-scheduler/config/v1alpha2:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
Expand Down
16 changes: 16 additions & 0 deletions cmd/kube-scheduler/app/options/options.go
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@ import (
"k8s.io/client-go/tools/record"
cliflag "k8s.io/component-base/cli/flag"
componentbaseconfig "k8s.io/component-base/config"
"k8s.io/component-base/metrics"
"k8s.io/klog"
kubeschedulerconfigv1alpha2 "k8s.io/kube-scheduler/config/v1alpha2"
schedulerappconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config"
Expand Down Expand Up @@ -68,6 +69,8 @@ type Options struct {
WriteConfigTo string

Master string

ShowHiddenMetricsForVersion string
}

// NewOptions returns default scheduler app options.
Expand Down Expand Up @@ -154,6 +157,15 @@ func (o *Options) Flags() (nfs cliflag.NamedFlagSets) {
leaderelectionconfig.BindFlags(&o.ComponentConfig.LeaderElection.LeaderElectionConfiguration, nfs.FlagSet("leader election"))
utilfeature.DefaultMutableFeatureGate.AddFlag(nfs.FlagSet("feature gate"))

// TODO(RainbowMango): move it to genericoptions before next flag comes.
serathius marked this conversation as resolved.
Show resolved Hide resolved
mfs := nfs.FlagSet("metrics")
mfs.StringVar(&o.ShowHiddenMetricsForVersion, "show-hidden-metrics-for-version", o.ShowHiddenMetricsForVersion,
"The previous version for which you want to show hidden metrics. "+
"Only the previous minor version is meaningful, other values will not be allowed. "+
serathius marked this conversation as resolved.
Show resolved Hide resolved
"Accepted format of version is <major>.<minor>, e.g.: '1.16'. "+
"The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, "+
"rather than being surprised when they are permanently removed in the release after that.")

return nfs
}

Expand Down Expand Up @@ -199,6 +211,9 @@ func (o *Options) ApplyTo(c *schedulerappconfig.Config) error {
return err
}
}
if len(o.ShowHiddenMetricsForVersion) > 0 {
metrics.SetShowHidden()
}

return nil
}
Expand All @@ -215,6 +230,7 @@ func (o *Options) Validate() []error {
errs = append(errs, o.Authentication.Validate()...)
errs = append(errs, o.Authorization.Validate()...)
errs = append(errs, o.Deprecated.Validate()...)
errs = append(errs, metrics.ValidateShowHiddenMetricsVersion(o.ShowHiddenMetricsForVersion)...)

return errs
}
Expand Down