From 26686d6b94bb72eb94b5eab4fd585cae2265a037 Mon Sep 17 00:00:00 2001
From: Pinny <pinniped-ci-bot@users.noreply.github.com>
Date: Wed, 19 Jul 2023 08:04:49 +0000
Subject: [PATCH 1/2] Bump go.mod direct dependencies

---
 go.mod | 4 ++--
 go.sum | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index e8e92cff..dc7e14db 100644
--- a/go.mod
+++ b/go.mod
@@ -49,8 +49,8 @@ require (
 	k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kube-aggregator v0.27.3
-	k8s.io/kube-openapi v0.0.0-20230614213217-ba0abe644833
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106
+	k8s.io/kube-openapi v0.0.0-20230718181711-3c0fae5ee9fd
+	k8s.io/utils v0.0.0-20230711102312-30195339c3c7
 	sigs.k8s.io/yaml v1.3.0
 )
 
diff --git a/go.sum b/go.sum
index f35fdb38..92216daf 100644
--- a/go.sum
+++ b/go.sum
@@ -1044,8 +1044,8 @@ k8s.io/kube-aggregator v0.27.3 h1:0o/Q30C84hHvhUef7OOTHMhO2eCySOPHKOUUrhBwpfo=
 k8s.io/kube-aggregator v0.27.3/go.mod h1:zbx67NbFee9cqjbXjib89/oOyrXdOq3UYStIBGazv08=
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
-k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
-k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc=
+k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

From 38c281331a2f970971b83ecd9f6a400cd87fc4ed Mon Sep 17 00:00:00 2001
From: Joshua Casey <joshuatcasey@gmail.com>
Date: Wed, 19 Jul 2023 13:25:57 -0500
Subject: [PATCH 2/2] Bump base images to go1.20.6 in Dockerfiles

---
 Dockerfile           | 2 +-
 hack/Dockerfile_fips | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be40fe8f..1a645021 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 # Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.20.5 as build-env
+FROM golang:1.20.6 as build-env
 
 WORKDIR /work
 COPY . .
diff --git a/hack/Dockerfile_fips b/hack/Dockerfile_fips
index 17c4140d..7a57e883 100644
--- a/hack/Dockerfile_fips
+++ b/hack/Dockerfile_fips
@@ -15,7 +15,7 @@
 # hidden behind a `GOEXPERIMENT=boringcrypto` env var.
 # See https://go.googlesource.com/go/+/dev.boringcrypto/README.boringcrypto.md
 # and https://kupczynski.info/posts/fips-golang/ for details.
-FROM golang:1.20.5 as build-env
+FROM golang:1.20.6 as build-env
 
 WORKDIR /work
 COPY . .