diff --git a/pkg/kubelet/apis/resourcemetrics/v1alpha1/config.go b/pkg/kubelet/apis/resourcemetrics/v1alpha1/config.go index 38e5a17f0b3..54d6fc21daa 100644 --- a/pkg/kubelet/apis/resourcemetrics/v1alpha1/config.go +++ b/pkg/kubelet/apis/resourcemetrics/v1alpha1/config.go @@ -24,6 +24,11 @@ import ( "k8s.io/kubernetes/pkg/kubelet/server/stats" ) +// This file contains a series of deprecated metrics which we emit them by endpoint `/metrics/resource/v1alpha1`. +// These metrics have been adapted to new endpoint `/metrics/resource` as well as new `Desc`s. +// In general, we don't need to maintain these deprecated metrics any more. +// TODO(RainbowMango): Remove this file in release 1.20.0+. + // Version is the string representation of the version of this configuration const Version = "v1alpha1" @@ -33,28 +38,28 @@ var ( nil, nil, metrics.ALPHA, - "") + "1.18.0") nodeMemoryUsageDesc = metrics.NewDesc("node_memory_working_set_bytes", "Current working set of the node in bytes", nil, nil, metrics.ALPHA, - "") + "1.18.0") containerCPUUsageDesc = metrics.NewDesc("container_cpu_usage_seconds_total", "Cumulative cpu time consumed by the container in core-seconds", []string{"container", "pod", "namespace"}, nil, metrics.ALPHA, - "") + "1.18.0") containerMemoryUsageDesc = metrics.NewDesc("container_memory_working_set_bytes", "Current working set of the container in bytes", []string{"container", "pod", "namespace"}, nil, metrics.ALPHA, - "") + "1.18.0") ) // getNodeCPUMetrics returns CPU utilization of a node. diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 74eeaf10171..26ab0026557 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -320,6 +320,7 @@ func (s *Server) InstallDefaultHandlers(enableCAdvisorJSONEndpoints bool) { compbasemetrics.HandlerFor(r, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}), ) + // deprecated endpoint which will be removed in release 1.20.0+. v1alpha1ResourceRegistry := compbasemetrics.NewKubeRegistry() v1alpha1ResourceRegistry.CustomMustRegister(stats.NewPrometheusResourceMetricCollector(s.resourceAnalyzer, v1alpha1.Config())) s.restfulCont.Handle(path.Join(resourceMetricsPath, v1alpha1.Version), diff --git a/pkg/kubelet/server/stats/prometheus_resource_metrics.go b/pkg/kubelet/server/stats/prometheus_resource_metrics.go index 701c897126a..7d0c76fc929 100644 --- a/pkg/kubelet/server/stats/prometheus_resource_metrics.go +++ b/pkg/kubelet/server/stats/prometheus_resource_metrics.go @@ -60,7 +60,7 @@ func NewPrometheusResourceMetricCollector(provider SummaryProvider, config Resou nil, nil, metrics.ALPHA, - ""), + "1.18.0"), } }