mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 14:07:14 +00:00
Merge pull request #84913 from serathius/metrics-scheduler
Add show-hidden-metrics-for-version to scheduler
This commit is contained in:
commit
5704bff0de
@ -42,6 +42,7 @@ go_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/codec: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/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",
|
"//staging/src/k8s.io/kube-scheduler/config/v1alpha2:go_default_library",
|
||||||
"//vendor/github.com/spf13/pflag:go_default_library",
|
"//vendor/github.com/spf13/pflag:go_default_library",
|
||||||
"//vendor/k8s.io/klog:go_default_library",
|
"//vendor/k8s.io/klog:go_default_library",
|
||||||
|
@ -39,6 +39,7 @@ import (
|
|||||||
"k8s.io/client-go/tools/record"
|
"k8s.io/client-go/tools/record"
|
||||||
cliflag "k8s.io/component-base/cli/flag"
|
cliflag "k8s.io/component-base/cli/flag"
|
||||||
componentbaseconfig "k8s.io/component-base/config"
|
componentbaseconfig "k8s.io/component-base/config"
|
||||||
|
"k8s.io/component-base/metrics"
|
||||||
"k8s.io/klog"
|
"k8s.io/klog"
|
||||||
kubeschedulerconfigv1alpha2 "k8s.io/kube-scheduler/config/v1alpha2"
|
kubeschedulerconfigv1alpha2 "k8s.io/kube-scheduler/config/v1alpha2"
|
||||||
schedulerappconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config"
|
schedulerappconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config"
|
||||||
@ -69,6 +70,8 @@ type Options struct {
|
|||||||
WriteConfigTo string
|
WriteConfigTo string
|
||||||
|
|
||||||
Master string
|
Master string
|
||||||
|
|
||||||
|
ShowHiddenMetricsForVersion string
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewOptions returns default scheduler app options.
|
// NewOptions returns default scheduler app options.
|
||||||
@ -157,6 +160,15 @@ func (o *Options) Flags() (nfs cliflag.NamedFlagSets) {
|
|||||||
leaderelectionconfig.BindFlags(&o.ComponentConfig.LeaderElection.LeaderElectionConfiguration, nfs.FlagSet("leader election"))
|
leaderelectionconfig.BindFlags(&o.ComponentConfig.LeaderElection.LeaderElectionConfiguration, nfs.FlagSet("leader election"))
|
||||||
utilfeature.DefaultMutableFeatureGate.AddFlag(nfs.FlagSet("feature gate"))
|
utilfeature.DefaultMutableFeatureGate.AddFlag(nfs.FlagSet("feature gate"))
|
||||||
|
|
||||||
|
// TODO(RainbowMango): move it to genericoptions before next flag comes.
|
||||||
|
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. "+
|
||||||
|
"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
|
return nfs
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -202,6 +214,9 @@ func (o *Options) ApplyTo(c *schedulerappconfig.Config) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if len(o.ShowHiddenMetricsForVersion) > 0 {
|
||||||
|
metrics.SetShowHidden()
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -218,6 +233,7 @@ func (o *Options) Validate() []error {
|
|||||||
errs = append(errs, o.Authentication.Validate()...)
|
errs = append(errs, o.Authentication.Validate()...)
|
||||||
errs = append(errs, o.Authorization.Validate()...)
|
errs = append(errs, o.Authorization.Validate()...)
|
||||||
errs = append(errs, o.Deprecated.Validate()...)
|
errs = append(errs, o.Deprecated.Validate()...)
|
||||||
|
errs = append(errs, metrics.ValidateShowHiddenMetricsVersion(o.ShowHiddenMetricsForVersion)...)
|
||||||
|
|
||||||
return errs
|
return errs
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user