Merge pull request #113115 from logicalhan/x509

actually resolve the computations for buckets for static analysis

Kubernetes-commit: 5075ca03dd0e0d7ebe6b239231d8d619e618f475
This commit is contained in:
Kubernetes Publisher 2022-10-17 16:59:29 -07:00
commit a9ade696e6
3 changed files with 17 additions and 17 deletions

4
go.mod
View File

@ -44,7 +44,7 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20221012115127-0184bd884c5e k8s.io/api v0.0.0-20221012115127-0184bd884c5e
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef
k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640 k8s.io/client-go v0.0.0-20221018035516-42a0e1ca70c4
k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb
k8s.io/klog/v2 v2.80.1 k8s.io/klog/v2 v2.80.1
k8s.io/kms v0.0.0-20221014080727-25ac69204108 k8s.io/kms v0.0.0-20221014080727-25ac69204108
@ -124,7 +124,7 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20221012115127-0184bd884c5e k8s.io/api => k8s.io/api v0.0.0-20221012115127-0184bd884c5e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef
k8s.io/client-go => k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640 k8s.io/client-go => k8s.io/client-go v0.0.0-20221018035516-42a0e1ca70c4
k8s.io/component-base => k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb k8s.io/component-base => k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb
k8s.io/kms => k8s.io/kms v0.0.0-20221014080727-25ac69204108 k8s.io/kms => k8s.io/kms v0.0.0-20221014080727-25ac69204108
) )

4
go.sum
View File

@ -986,8 +986,8 @@ k8s.io/api v0.0.0-20221012115127-0184bd884c5e h1:N2+121lkGMNfLeos4/AlwuujPJd5xJf
k8s.io/api v0.0.0-20221012115127-0184bd884c5e/go.mod h1:Q2jmki3lhHeeAyYtbIiEe/2JoGg2Ge1cJoMgpFkjtzg= k8s.io/api v0.0.0-20221012115127-0184bd884c5e/go.mod h1:Q2jmki3lhHeeAyYtbIiEe/2JoGg2Ge1cJoMgpFkjtzg=
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef h1:4lKLUMgwg9xi0UV4qjwS2NHmxBU2llLMdfO7czD9gUg= k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef h1:4lKLUMgwg9xi0UV4qjwS2NHmxBU2llLMdfO7czD9gUg=
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef/go.mod h1:/x4E+/xaA5ap3q0tWNh5IPFt63dzY1I2qP8zT4sr5Yg= k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef/go.mod h1:/x4E+/xaA5ap3q0tWNh5IPFt63dzY1I2qP8zT4sr5Yg=
k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640 h1:NBR6De5c0hN5LUmjNrE4Y06uDawa8fcMJZejh/XYyGs= k8s.io/client-go v0.0.0-20221018035516-42a0e1ca70c4 h1:c2OVHhALzI2exr09upcz5xYJJJIYE7/CvAmj7UuTiIg=
k8s.io/client-go v0.0.0-20221017235941-b6d3c8d37640/go.mod h1:r+Jiu2RH1zXcJsmml1qRHg9oBq4sHHcMRaiEV0GN0ME= k8s.io/client-go v0.0.0-20221018035516-42a0e1ca70c4/go.mod h1:r+Jiu2RH1zXcJsmml1qRHg9oBq4sHHcMRaiEV0GN0ME=
k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb h1:xi+Q1olbNRt1UKQO/NTBEwCql1vBI7y48dUACoSnYMc= k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb h1:xi+Q1olbNRt1UKQO/NTBEwCql1vBI7y48dUACoSnYMc=
k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb/go.mod h1:C6bKv2+Cn5xLxGAlDAFSkSqGtDiPEUrEA4y0BKdUO2I= k8s.io/component-base v0.0.0-20221017200238-034e08cbfdfb/go.mod h1:C6bKv2+Cn5xLxGAlDAFSkSqGtDiPEUrEA4y0BKdUO2I=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=

View File

@ -49,19 +49,19 @@ var clientCertificateExpirationHistogram = metrics.NewHistogram(
Help: "Distribution of the remaining lifetime on the certificate used to authenticate a request.", Help: "Distribution of the remaining lifetime on the certificate used to authenticate a request.",
Buckets: []float64{ Buckets: []float64{
0, 0,
(30 * time.Minute).Seconds(), 1800, // 30 minutes
(1 * time.Hour).Seconds(), 3600, // 1 hour
(2 * time.Hour).Seconds(), 7200, // 2 hours
(6 * time.Hour).Seconds(), 21600, // 6 hours
(12 * time.Hour).Seconds(), 43200, // 12 hours
(24 * time.Hour).Seconds(), 86400, // 1 day
(2 * 24 * time.Hour).Seconds(), 172800, // 2 days
(4 * 24 * time.Hour).Seconds(), 345600, // 4 days
(7 * 24 * time.Hour).Seconds(), 604800, // 1 week
(30 * 24 * time.Hour).Seconds(), 2592000, // 1 month
(3 * 30 * 24 * time.Hour).Seconds(), 7776000, // 3 months
(6 * 30 * 24 * time.Hour).Seconds(), 15552000, // 6 months
(12 * 30 * 24 * time.Hour).Seconds(), 31104000, // 1 year
}, },
StabilityLevel: metrics.ALPHA, StabilityLevel: metrics.ALPHA,
}, },