Skip to content

Commit f979c95

Browse files
cfryanrcfryanr
authored
Merge pull request #3202 from vmware/pinny/bump-deps
Bump dependencies
2 parents 9079ca7 + 3f760fd commit f979c95

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright 2020-2026 the Pinniped contributors. All Rights Reserved.
44
# SPDX-License-Identifier: Apache-2.0
55

6-
ARG BUILD_IMAGE=golang:1.26.5@sha256:ae5a2316d12f3e78fd99177dad452e6ad4f240af2d71d57b480c3477f250fec6
6+
ARG BUILD_IMAGE=golang:1.26.5@sha256:3aff6657219a4d9c14e27fb1d8976c49c29fddb70ba835014f477e1c70636647
77
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:f7f8f729987ad0fdf6b05eeeae94b26e6a0f613bdf46feea7fc40f7bd72953e6
88

99
# Prepare to cross-compile by always running the build stage in the build platform, not the target platform.

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/go-jose/go-jose/v3 v3.0.5
1515
github.com/go-jose/go-jose/v4 v4.1.4
1616
github.com/go-ldap/ldap/v3 v3.4.14
17-
github.com/go-logr/logr v1.4.3
17+
github.com/go-logr/logr v1.4.4
1818
github.com/go-logr/stdr v1.2.2
1919
github.com/go-logr/zapr v1.3.0
2020
github.com/gofrs/flock v0.13.0
@@ -52,7 +52,7 @@ require (
5252
k8s.io/gengo v0.0.0-20260408192533-25e2208e0dc3
5353
k8s.io/klog/v2 v2.140.0
5454
k8s.io/kube-aggregator v0.36.2
55-
k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0
55+
k8s.io/kube-openapi v0.0.0-20260721042612-c26577a1ec9a
5656
k8s.io/streaming v0.36.2
5757
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3
5858
sigs.k8s.io/yaml v1.6.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ github.com/go-ldap/ldap/v3 v3.4.14/go.mod h1:S4eJUMUNjDkE0ZJtIZdybwyb03sGGLW6gxX
145145
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
146146
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
147147
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
148-
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
149-
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
148+
github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
149+
github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
150150
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
151151
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
152152
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -1108,8 +1108,8 @@ k8s.io/kms v0.36.2 h1:o0l8zMRecm38k5NyRnO/3+2YA/MR6TMGcc3KQZA76hI=
11081108
k8s.io/kms v0.36.2/go.mod h1:g91diTD9h0oJCCHkTb00krlF+Qm5HTnkWLi9Q/TpRoc=
11091109
k8s.io/kube-aggregator v0.36.2 h1:zfeH9Fs16oDquNfBZef3M27dGG3QtJ9/TwkWfBlw1lo=
11101110
k8s.io/kube-aggregator v0.36.2/go.mod h1:UMrB5DfEhznFTf0bqYW2SV26GDy8HNaxoYakvKVWZ8M=
1111-
k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0 h1:CVjOUCTXINUThEmDs25FNSna0+vnGSoTleN+wiJu6hE=
1112-
k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0/go.mod h1:rcZ+P5cEvHQB+m154WBOatIGBgOEPjzmLkXjkHfg3ms=
1111+
k8s.io/kube-openapi v0.0.0-20260721042612-c26577a1ec9a h1:QkCyIr4f6yciQ8A+ymvRkmr8DMtkqfVlBorj2LlPK7M=
1112+
k8s.io/kube-openapi v0.0.0-20260721042612-c26577a1ec9a/go.mod h1:rcZ+P5cEvHQB+m154WBOatIGBgOEPjzmLkXjkHfg3ms=
11131113
k8s.io/streaming v0.36.2 h1:NSKthPPg9UFSKsRauVJUVGH2Dvn8fhKmY4qrMkw/p98=
11141114
k8s.io/streaming v0.36.2/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
11151115
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE=

‎hack/Dockerfile_fips‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# See https://go.googlesource.com/go/+/dev.boringcrypto/README.boringcrypto.md
2020
# and https://kupczynski.info/posts/fips-golang/ for details.
2121

22-
ARG BUILD_IMAGE=golang:1.26.5@sha256:ae5a2316d12f3e78fd99177dad452e6ad4f240af2d71d57b480c3477f250fec6
22+
ARG BUILD_IMAGE=golang:1.26.5@sha256:3aff6657219a4d9c14e27fb1d8976c49c29fddb70ba835014f477e1c70636647
2323
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:f7f8f729987ad0fdf6b05eeeae94b26e6a0f613bdf46feea7fc40f7bd72953e6
2424

2525
# This is not currently using --platform to prepare to cross-compile because we use gcc below to build

‎internal/plog/plog_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2025 the Pinniped contributors. All Rights Reserved.
1+
// Copyright 2022-2026 the Pinniped contributors. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

44
package plog
@@ -545,7 +545,7 @@ func TestPlog(t *testing.T) {
545545
testAllPlogMethods(l.withDepth(-2))
546546
},
547547
want: here.Doc(`
548-
{"level":"error","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Error","message":"e","panda":2,"error":"some err"}
548+
{"level":"error","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Error","message":"e","panda":2,"error":"some err"}
549549
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:<line>$plog.pLogger.warningDepth","message":"w","warning":true,"panda":2}
550550
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:<line>$plog.pLogger.warningDepth","message":"we","warning":true,"error":"some err","panda":2}
551551
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:<line>$plog.pLogger.infoDepth","message":"i","panda":2}
@@ -554,8 +554,8 @@ func TestPlog(t *testing.T) {
554554
{"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:<line>$plog.pLogger.debugDepth","message":"de","error":"some err","panda":2}
555555
{"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:<line>$plog.pLogger.traceDepth","message":"t","panda":2}
556556
{"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:<line>$plog.pLogger.traceDepth","message":"te","error":"some err","panda":2}
557-
{"level":"all","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"all","panda":2}
558-
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"always","panda":2}
557+
{"level":"all","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"all","panda":2}
558+
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"always","panda":2}
559559
`),
560560
},
561561
{
@@ -565,14 +565,14 @@ func TestPlog(t *testing.T) {
565565
},
566566
want: here.Doc(`
567567
{"level":"error","timestamp":"2099-08-08T13:57:36.123456Z","caller":"zapr@v1.3.0/zapr.go:<line>$zapr.(*zapLogger).Error","message":"e","panda":2,"error":"some err"}
568-
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"w","warning":true,"panda":2}
569-
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"we","warning":true,"error":"some err","panda":2}
570-
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"i","panda":2}
571-
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"ie","error":"some err","panda":2}
572-
{"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"d","panda":2}
573-
{"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"de","error":"some err","panda":2}
574-
{"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"t","panda":2}
575-
{"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:<line>$logr.Logger.Info","message":"te","error":"some err","panda":2}
568+
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"w","warning":true,"panda":2}
569+
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"we","warning":true,"error":"some err","panda":2}
570+
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"i","panda":2}
571+
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"ie","error":"some err","panda":2}
572+
{"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"d","panda":2}
573+
{"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"de","error":"some err","panda":2}
574+
{"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"t","panda":2}
575+
{"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:<line>$logr.Logger.Info","message":"te","error":"some err","panda":2}
576576
{"level":"all","timestamp":"2099-08-08T13:57:36.123456Z","caller":"zapr@v1.3.0/zapr.go:<line>$zapr.(*zapLogger).Info","message":"all","panda":2}
577577
{"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"zapr@v1.3.0/zapr.go:<line>$zapr.(*zapLogger).Info","message":"always","panda":2}
578578
`),

0 commit comments

Comments
 (0)