Update dependencies to v0.21.4-rc.0 tag

Merge pull request #103319 from jpbetz/fix-102749-1.21
Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: c17d7c574149af1619dc8edd9c48a41dc07695e8
2026-06-19 16:25:23 +00:00 · 2021-07-16 02:43:04 +00:00 · 2021-07-12 06:36:39 +00:00 · 2021-06-29 18:55:34 -07:00
2 changed files with 11 additions and 11 deletions
--- a/go.mod
+++ b/go.mod
@@ -27,15 +27,15 @@ require (
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
-	k8s.io/api v0.21.3-rc.0
-	k8s.io/apimachinery v0.21.3-rc.0
+	k8s.io/api v0.21.4-rc.0
+	k8s.io/apimachinery v0.21.4-rc.0
 	k8s.io/klog/v2 v2.8.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.0
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2
 	sigs.k8s.io/yaml v1.2.0
 )

 replace (
-	k8s.io/api => k8s.io/api v0.21.3-rc.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.21.3-rc.0
+	k8s.io/api => k8s.io/api v0.21.4-rc.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.4-rc.0
 )
--- a/go.sum
+++ b/go.sum
@@ -431,10 +431,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.21.3-rc.0 h1:BIgRAAdeSurF2BxavtdNUXYiS7ilBtdiaKcZb2mwwZs=
-k8s.io/api v0.21.3-rc.0/go.mod h1:ufriI8D8+4mDK3UoSsNRYGgdZpRyFTcD+G38grv9YZA=
-k8s.io/apimachinery v0.21.3-rc.0 h1:ZOMEV72LKc83q56gRXaWHJRckiljAiyniYMRZqH71cw=
-k8s.io/apimachinery v0.21.3-rc.0/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
+k8s.io/api v0.21.4-rc.0 h1:X5hRQ8b7P+rB5PWp+rBUAdj9KDDI8T1Ml4LVN68L9Zo=
+k8s.io/api v0.21.4-rc.0/go.mod h1:GYw3W1bfJIqlH0IH04vrCD9is1+xcwhBl6iBJOim07Q=
+k8s.io/apimachinery v0.21.4-rc.0 h1:7OzW580su2+5g5Hgl59L5dqeIPNOWEv7FLTyoVKM8Eo=
+k8s.io/apimachinery v0.21.4-rc.0/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
@@ -447,7 +447,7 @@ 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=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
+sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
+sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
Author	SHA1	Message	Date
Kubernetes Publisher	4b2319dc3d	Update dependencies to v0.21.4-rc.0 tag	2021-07-16 02:43:04 +00:00
Kubernetes Publisher	fefd2ad85b	Merge pull request #103319 from jpbetz/fix-102749-1.21 Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: c17d7c574149af1619dc8edd9c48a41dc07695e8	2021-07-12 06:36:39 +00:00
Joe Betz	58234552b9	Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: 44d4c4fe69f9fd2ee7bade2d15c8bab6be3ec98e	2021-06-29 18:55:34 -07:00