diff --git a/Dockerfile b/Dockerfile index 91d322e59..dc8f64bfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Copyright 2020-2026 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 -ARG BUILD_IMAGE=golang:1.26.5@sha256:ae5a2316d12f3e78fd99177dad452e6ad4f240af2d71d57b480c3477f250fec6 +ARG BUILD_IMAGE=golang:1.26.5@sha256:3aff6657219a4d9c14e27fb1d8976c49c29fddb70ba835014f477e1c70636647 ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:f7f8f729987ad0fdf6b05eeeae94b26e6a0f613bdf46feea7fc40f7bd72953e6 # Prepare to cross-compile by always running the build stage in the build platform, not the target platform. diff --git a/go.mod b/go.mod index 0ddba2021..9535e3b5c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/go-jose/go-jose/v3 v3.0.5 github.com/go-jose/go-jose/v4 v4.1.4 github.com/go-ldap/ldap/v3 v3.4.14 - github.com/go-logr/logr v1.4.3 + github.com/go-logr/logr v1.4.4 github.com/go-logr/stdr v1.2.2 github.com/go-logr/zapr v1.3.0 github.com/gofrs/flock v0.13.0 @@ -52,7 +52,7 @@ require ( k8s.io/gengo v0.0.0-20260408192533-25e2208e0dc3 k8s.io/klog/v2 v2.140.0 k8s.io/kube-aggregator v0.36.2 - k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0 + k8s.io/kube-openapi v0.0.0-20260721042612-c26577a1ec9a k8s.io/streaming v0.36.2 k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 sigs.k8s.io/yaml v1.6.0 diff --git a/go.sum b/go.sum index 0a6ca51e1..ec74abd4c 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/go-ldap/ldap/v3 v3.4.14/go.mod h1:S4eJUMUNjDkE0ZJtIZdybwyb03sGGLW6gxX github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= 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= k8s.io/kms v0.36.2/go.mod h1:g91diTD9h0oJCCHkTb00krlF+Qm5HTnkWLi9Q/TpRoc= k8s.io/kube-aggregator v0.36.2 h1:zfeH9Fs16oDquNfBZef3M27dGG3QtJ9/TwkWfBlw1lo= k8s.io/kube-aggregator v0.36.2/go.mod h1:UMrB5DfEhznFTf0bqYW2SV26GDy8HNaxoYakvKVWZ8M= -k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0 h1:CVjOUCTXINUThEmDs25FNSna0+vnGSoTleN+wiJu6hE= -k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0/go.mod h1:rcZ+P5cEvHQB+m154WBOatIGBgOEPjzmLkXjkHfg3ms= +k8s.io/kube-openapi v0.0.0-20260721042612-c26577a1ec9a h1:QkCyIr4f6yciQ8A+ymvRkmr8DMtkqfVlBorj2LlPK7M= +k8s.io/kube-openapi v0.0.0-20260721042612-c26577a1ec9a/go.mod h1:rcZ+P5cEvHQB+m154WBOatIGBgOEPjzmLkXjkHfg3ms= k8s.io/streaming v0.36.2 h1:NSKthPPg9UFSKsRauVJUVGH2Dvn8fhKmY4qrMkw/p98= k8s.io/streaming v0.36.2/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= diff --git a/hack/Dockerfile_fips b/hack/Dockerfile_fips index d3ed8f74a..dad0548d5 100644 --- a/hack/Dockerfile_fips +++ b/hack/Dockerfile_fips @@ -19,7 +19,7 @@ # See https://go.googlesource.com/go/+/dev.boringcrypto/README.boringcrypto.md # and https://kupczynski.info/posts/fips-golang/ for details. -ARG BUILD_IMAGE=golang:1.26.5@sha256:ae5a2316d12f3e78fd99177dad452e6ad4f240af2d71d57b480c3477f250fec6 +ARG BUILD_IMAGE=golang:1.26.5@sha256:3aff6657219a4d9c14e27fb1d8976c49c29fddb70ba835014f477e1c70636647 ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:f7f8f729987ad0fdf6b05eeeae94b26e6a0f613bdf46feea7fc40f7bd72953e6 # This is not currently using --platform to prepare to cross-compile because we use gcc below to build diff --git a/internal/plog/plog_test.go b/internal/plog/plog_test.go index 95496bed8..da4dc96da 100644 --- a/internal/plog/plog_test.go +++ b/internal/plog/plog_test.go @@ -1,4 +1,4 @@ -// Copyright 2022-2025 the Pinniped contributors. All Rights Reserved. +// Copyright 2022-2026 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package plog @@ -545,7 +545,7 @@ func TestPlog(t *testing.T) { testAllPlogMethods(l.withDepth(-2)) }, want: here.Doc(` - {"level":"error","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Error","message":"e","panda":2,"error":"some err"} + {"level":"error","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Error","message":"e","panda":2,"error":"some err"} {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:$plog.pLogger.warningDepth","message":"w","warning":true,"panda":2} {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:$plog.pLogger.warningDepth","message":"we","warning":true,"error":"some err","panda":2} {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:$plog.pLogger.infoDepth","message":"i","panda":2} @@ -554,8 +554,8 @@ func TestPlog(t *testing.T) { {"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:$plog.pLogger.debugDepth","message":"de","error":"some err","panda":2} {"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:$plog.pLogger.traceDepth","message":"t","panda":2} {"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"plog/plog.go:$plog.pLogger.traceDepth","message":"te","error":"some err","panda":2} - {"level":"all","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"all","panda":2} - {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"always","panda":2} + {"level":"all","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"all","panda":2} + {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"always","panda":2} `), }, { @@ -565,14 +565,14 @@ func TestPlog(t *testing.T) { }, want: here.Doc(` {"level":"error","timestamp":"2099-08-08T13:57:36.123456Z","caller":"zapr@v1.3.0/zapr.go:$zapr.(*zapLogger).Error","message":"e","panda":2,"error":"some err"} - {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"w","warning":true,"panda":2} - {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"we","warning":true,"error":"some err","panda":2} - {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"i","panda":2} - {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"ie","error":"some err","panda":2} - {"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"d","panda":2} - {"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"de","error":"some err","panda":2} - {"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"t","panda":2} - {"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.3/logr.go:$logr.Logger.Info","message":"te","error":"some err","panda":2} + {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"w","warning":true,"panda":2} + {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"we","warning":true,"error":"some err","panda":2} + {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"i","panda":2} + {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"ie","error":"some err","panda":2} + {"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"d","panda":2} + {"level":"debug","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"de","error":"some err","panda":2} + {"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"t","panda":2} + {"level":"trace","timestamp":"2099-08-08T13:57:36.123456Z","caller":"logr@v1.4.4/logr.go:$logr.Logger.Info","message":"te","error":"some err","panda":2} {"level":"all","timestamp":"2099-08-08T13:57:36.123456Z","caller":"zapr@v1.3.0/zapr.go:$zapr.(*zapLogger).Info","message":"all","panda":2} {"level":"info","timestamp":"2099-08-08T13:57:36.123456Z","caller":"zapr@v1.3.0/zapr.go:$zapr.(*zapLogger).Info","message":"always","panda":2} `),