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

Updated usage of certificate.Manager to use new rotation metric

Browse Source
This commit is contained in:
Samuel Davidson 2019-10-29 12:02:59 -07:00
parent 7adb181200
commit 3e817d17a5
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/kubelet/certificate/kubelet.go
View File

@ -25,7 +25,7 @@ import (
"sort" "sort"
certificates "k8s.io/api/certificates/v1beta1" certificates "k8s.io/api/certificates/v1beta1"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
@ -52,17 +52,38 @@ func NewKubeletServerCertificateManager(kubeClient clientset.Interface, kubeCfg
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to initialize server certificate store: %v", err) return nil, fmt.Errorf("failed to initialize server certificate store: %v", err)
} }
var certificateExpiration = compbasemetrics.NewGauge( certificateExpiration := compbasemetrics.NewGauge(
&compbasemetrics.GaugeOpts{ &compbasemetrics.GaugeOpts{
Namespace: metrics.KubeletSubsystem, Subsystem: metrics.KubeletSubsystem,
Subsystem: "certificate_manager", Name: "certificate_manager_server_expiration_seconds",
Name: "server_expiration_seconds",
Help: "Gauge of the lifetime of a certificate. The value is the date the certificate will expire in seconds since January 1, 1970 UTC.", Help: "Gauge of the lifetime of a certificate. The value is the date the certificate will expire in seconds since January 1, 1970 UTC.",
StabilityLevel: compbasemetrics.ALPHA, StabilityLevel: compbasemetrics.ALPHA,
}, },
) )
legacyregistry.MustRegister(certificateExpiration) legacyregistry.MustRegister(certificateExpiration)
certificateRotationAge := compbasemetrics.NewHistogram(
&compbasemetrics.HistogramOpts{
Subsystem: metrics.KubeletSubsystem,
Name: "certificate_manager_server_rotation_seconds",
Help: "Histogram of the number of seconds the previous certificate lived before being rotated.",
Buckets: []float64{
60, // 1 minute
3600, // 1 hour
14400, // 4 hours
86400, // 1 day
604800, // 1 week
2592000, // 1 month
7776000, // 3 months
15552000, // 6 months
31104000, // 1 year
124416000, // 4 years
},
StabilityLevel: compbasemetrics.ALPHA,
},
)
legacyregistry.MustRegister(certificateRotationAge)
getTemplate := func() *x509.CertificateRequest { getTemplate := func() *x509.CertificateRequest {
hostnames, ips := addressesToHostnamesAndIPs(getAddresses()) hostnames, ips := addressesToHostnamesAndIPs(getAddresses())
// don't return a template if we have no addresses to request for // don't return a template if we have no addresses to request for
@ -100,6 +121,7 @@ func NewKubeletServerCertificateManager(kubeClient clientset.Interface, kubeCfg
}, },
CertificateStore: certificateStore, CertificateStore: certificateStore,
CertificateExpiration: certificateExpiration, CertificateExpiration: certificateExpiration,
CertificateRotation: certificateRotationAge,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to initialize server certificate manager: %v", err) return nil, fmt.Errorf("failed to initialize server certificate manager: %v", err)