Skip to content

Commit da61382

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#121552 from pohly/klog-update
klog v2.110.1 update
2 parents 2c53de9 + 4a38060 commit da61382

File tree

93 files changed

+1502
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1502
-665
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/emicklei/go-restful/v3 v3.11.0
3434
github.com/evanphx/json-patch v4.12.0+incompatible
3535
github.com/fsnotify/fsnotify v1.7.0
36-
github.com/go-logr/logr v1.2.4
36+
github.com/go-logr/logr v1.3.0
3737
github.com/godbus/dbus/v5 v5.1.0
3838
github.com/gogo/protobuf v1.3.2
3939
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
@@ -112,7 +112,7 @@ require (
112112
k8s.io/dynamic-resource-allocation v0.0.0
113113
k8s.io/endpointslice v0.0.0
114114
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
115-
k8s.io/klog/v2 v2.100.1
115+
k8s.io/klog/v2 v2.110.1
116116
k8s.io/kms v0.0.0
117117
k8s.io/kube-aggregator v0.0.0
118118
k8s.io/kube-controller-manager v0.0.0

‎go.sum‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,9 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
381381
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
382382
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
383383
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
384-
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
385384
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
386-
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
387-
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
385+
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
386+
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
388387
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
389388
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
390389
github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
@@ -1339,8 +1338,8 @@ k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/s
13391338
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
13401339
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
13411340
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
1342-
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
1343-
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
1341+
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
1342+
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
13441343
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
13451344
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
13461345
k8s.io/system-validators v1.8.0 h1:tq05tdO9zdJZnNF3SXrq6LE7Knc/KfJm5wk68467JDg=

‎pkg/serviceaccount/legacy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ func (v *legacyValidator) patchSecretWithLastUsedDate(ctx context.Context, secre
193193
if lastUsed != today && lastUsed != tomorrow {
194194
patchContent, err := json.Marshal(applyv1.Secret(secret.Name, secret.Namespace).WithUID(secret.UID).WithLabels(map[string]string{LastUsedLabelKey: today}))
195195
if err != nil {
196-
klog.Errorf("Failed to marshal legacy service account token %s/%s tracking labels, err: %w", secret.Name, secret.Namespace, err)
196+
klog.Errorf("Failed to marshal legacy service account token %s/%s tracking labels, err: %v", secret.Name, secret.Namespace, err)
197197
} else {
198198
if _, err := v.secretsWriter.Secrets(secret.Namespace).Patch(ctx, secret.Name, types.MergePatchType, patchContent, metav1.PatchOptions{}); err != nil {
199-
klog.Errorf("Failed to label legacy service account token %s/%s with last-used date, err: %w", secret.Name, secret.Namespace, err)
199+
klog.Errorf("Failed to label legacy service account token %s/%s with last-used date, err: %v", secret.Name, secret.Namespace, err)
200200
}
201201
}
202202
}

‎staging/src/k8s.io/api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212

1313
require (
1414
github.com/davecgh/go-spew v1.1.1 // indirect
15-
github.com/go-logr/logr v1.2.4 // indirect
15+
github.com/go-logr/logr v1.3.0 // indirect
1616
github.com/golang/protobuf v1.5.3 // indirect
1717
github.com/google/go-cmp v0.6.0 // indirect
1818
github.com/google/gofuzz v1.2.0 // indirect
@@ -29,7 +29,7 @@ require (
2929
gopkg.in/inf.v0 v0.9.1 // indirect
3030
gopkg.in/yaml.v2 v2.4.0 // indirect
3131
gopkg.in/yaml.v3 v3.0.1 // indirect
32-
k8s.io/klog/v2 v2.100.1 // indirect
32+
k8s.io/klog/v2 v2.110.1 // indirect
3333
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
3434
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
3535
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

‎staging/src/k8s.io/api/go.sum‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
k8s.io/client-go v0.0.0
3131
k8s.io/code-generator v0.0.0
3232
k8s.io/component-base v0.0.0
33-
k8s.io/klog/v2 v2.100.1
33+
k8s.io/klog/v2 v2.110.1
3434
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
3535
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3636
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
@@ -52,7 +52,7 @@ require (
5252
github.com/dustin/go-humanize v1.0.1 // indirect
5353
github.com/felixge/httpsnoop v1.0.3 // indirect
5454
github.com/fsnotify/fsnotify v1.7.0 // indirect
55-
github.com/go-logr/logr v1.2.4 // indirect
55+
github.com/go-logr/logr v1.3.0 // indirect
5656
github.com/go-logr/stdr v1.2.2 // indirect
5757
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5858
github.com/go-openapi/jsonreference v0.20.2 // indirect

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apimachinery/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
golang.org/x/net v0.17.0
2323
golang.org/x/time v0.3.0
2424
gopkg.in/inf.v0 v0.9.1
25-
k8s.io/klog/v2 v2.100.1
25+
k8s.io/klog/v2 v2.110.1
2626
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
2727
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2828
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
@@ -31,7 +31,7 @@ require (
3131
)
3232

3333
require (
34-
github.com/go-logr/logr v1.2.4 // indirect
34+
github.com/go-logr/logr v1.3.0 // indirect
3535
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3636
github.com/go-openapi/jsonreference v0.20.2 // indirect
3737
github.com/go-openapi/swag v0.22.3 // indirect

‎staging/src/k8s.io/apimachinery/go.sum‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
k8s.io/apimachinery v0.0.0
4747
k8s.io/client-go v0.0.0
4848
k8s.io/component-base v0.0.0
49-
k8s.io/klog/v2 v2.100.1
49+
k8s.io/klog/v2 v2.110.1
5050
k8s.io/kms v0.0.0
5151
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
5252
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
@@ -68,7 +68,7 @@ require (
6868
github.com/davecgh/go-spew v1.1.1 // indirect
6969
github.com/dustin/go-humanize v1.0.1 // indirect
7070
github.com/felixge/httpsnoop v1.0.3 // indirect
71-
github.com/go-logr/logr v1.2.4 // indirect
71+
github.com/go-logr/logr v1.3.0 // indirect
7272
github.com/go-logr/stdr v1.2.2 // indirect
7373
github.com/go-openapi/jsonpointer v0.19.6 // indirect
7474
github.com/go-openapi/jsonreference v0.20.2 // indirect

0 commit comments

Comments
 (0)