github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113057 from Richabanker/kube-proxy-metrics-slis

Browse Source 
add metrics/slis to kube-proxy health checks
This commit is contained in:
Kubernetes Prow Robot 2022-10-15 06:49:05 -07:00 committed by GitHub
commit b6e8dfec61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kube-proxy/app/server.go
View File

@ -57,7 +57,9 @@ import (
componentbaseconfig "k8s.io/component-base/config" componentbaseconfig "k8s.io/component-base/config"
"k8s.io/component-base/configz" "k8s.io/component-base/configz"
"k8s.io/component-base/logs" "k8s.io/component-base/logs"
metricsfeatures "k8s.io/component-base/metrics/features"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
"k8s.io/component-base/metrics/prometheus/slis"
"k8s.io/component-base/version" "k8s.io/component-base/version"
"k8s.io/component-base/version/verflag" "k8s.io/component-base/version/verflag"
"k8s.io/klog/v2" "k8s.io/klog/v2"
@ -86,6 +88,10 @@ import (
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
) )
func init() {
utilruntime.Must(metricsfeatures.AddFeatureGates(utilfeature.DefaultMutableFeatureGate))
}
// proxyRun defines the interface to run a specified ProxyServer // proxyRun defines the interface to run a specified ProxyServer
type proxyRun interface { type proxyRun interface {
Run() error Run() error
@ -607,6 +613,9 @@ func serveMetrics(bindAddress string, proxyMode kubeproxyconfig.ProxyMode, enabl
proxyMux := mux.NewPathRecorderMux("kube-proxy") proxyMux := mux.NewPathRecorderMux("kube-proxy")
healthz.InstallHandler(proxyMux) healthz.InstallHandler(proxyMux)
if utilfeature.DefaultFeatureGate.Enabled(metricsfeatures.ComponentSLIs) {
slis.SLIMetricsWithReset{}.Install(proxyMux)
}
proxyMux.HandleFunc("/proxyMode", func(w http.ResponseWriter, r *http.Request) { proxyMux.HandleFunc("/proxyMode", func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.Header().Set("Content-Type", "text/plain; charset=utf-8")
w.Header().Set("X-Content-Type-Options", "nosniff") w.Header().Set("X-Content-Type-Options", "nosniff")