Update dependencies to v0.20.13-rc.0 tag

Merge pull request #102602 from jonesbr17/automated-cherry-pick-of-#102409-upstream-release-1.20
Automated cherry pick of #102409: Bump golang.org/x/text to v0.3.6 Kubernetes-commit: 4aceb6799141cb2ed8195a6fa6f028e571eec935
2026-06-21 09:14:59 +00:00 · 2021-10-28 04:56:47 +00:00 · 2021-10-06 16:39:48 +00:00 · 2021-09-26 23:34:23 -07:00 · 2021-09-13 11:49:17 -04:00 · 2021-05-28 11:07:25 -04:00
3 changed files with 11 additions and 11 deletions
--- a/go.mod
+++ b/go.mod
@@ -26,14 +26,14 @@ require (
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
-	k8s.io/api v0.20.12-rc.0
-	k8s.io/apimachinery v0.20.12-rc.0
+	k8s.io/api v0.20.13-rc.0
+	k8s.io/apimachinery v0.20.13-rc.0
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/yaml v1.2.0
 )

 replace (
-	k8s.io/api => k8s.io/api v0.20.12-rc.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.20.12-rc.0
+	k8s.io/api => k8s.io/api v0.20.13-rc.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.13-rc.0
 )
--- a/go.sum
+++ b/go.sum
@@ -305,8 +305,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -425,10 +425,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.20.12-rc.0 h1:SHMu+QwbyPC1E3PJfd8W22MkIZqmXJF5B/PJw7MXdas=
-k8s.io/api v0.20.12-rc.0/go.mod h1:Vco2AeUUl4GJUFY5qzp95huOrAbwRxlxptfHJrTDEtA=
-k8s.io/apimachinery v0.20.12-rc.0 h1:9WcdektpEzWTSvSEjwAQv5QjRNuzrR0MttLU71yLqeU=
-k8s.io/apimachinery v0.20.12-rc.0/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw=
+k8s.io/api v0.20.13-rc.0 h1:+fomwsm124HT7mOpuRfDrcwIL3QPdD93Lckg+TEEbpg=
+k8s.io/api v0.20.13-rc.0/go.mod h1:DiPTJ402zNmmXlHcgl0wxeF59khkh8FesrBoXcUKARY=
+k8s.io/apimachinery v0.20.13-rc.0 h1:JSfZ/w3m/vopspH7PmzxdcujLiL3wn2z3VDKCaNCpKU=
+k8s.io/apimachinery v0.20.13-rc.0/go.mod h1:uM7hCI0NyBymUwgshMgZyte475lxhr+QH6h3cvdnzEc=
 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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
--- a/tools/clientcmd/api/v1/conversion.go
+++ b/tools/clientcmd/api/v1/conversion.go
@@ -165,7 +165,7 @@ func Convert_Map_string_To_runtime_Object_To_Slice_v1_NamedExtension(in *map[str
 		newExtension := (*in)[key]
 		oldExtension := runtime.RawExtension{}
 		if err := runtime.Convert_runtime_Object_To_runtime_RawExtension(&newExtension, &oldExtension, s); err != nil {
-			return nil
+			return err
 		}
 		namedExtension := NamedExtension{key, oldExtension}
 		*out = append(*out, namedExtension)
Author	SHA1	Message	Date
Kubernetes Publisher	3355712e6b	Update dependencies to v0.20.13-rc.0 tag	2021-10-28 04:56:47 +00:00
Kubernetes Publisher	3fc097df6b	Merge pull request #102602 from jonesbr17/automated-cherry-pick-of-#102409-upstream-release-1.20 Automated cherry pick of #102409: Bump golang.org/x/text to v0.3.6 Kubernetes-commit: 4aceb6799141cb2ed8195a6fa6f028e571eec935	2021-10-06 16:39:48 +00:00
Kubernetes Publisher	68daa7cdd6	Merge pull request #104990 from liggitt/automated-cherry-pick-of-#104969-upstream-release-1.20 Automated cherry pick of #104969: Propagate conversion errors Kubernetes-commit: 7ffe8e83b4fd7c2ba911debae510ed2fddd5c56b	2021-09-26 23:34:23 -07:00
Jordan Liggitt	2f46a8a991	Propagate conversion errors Kubernetes-commit: e3b54a4470e8124b58d900af397081bd18766a13	2021-09-13 11:49:17 -04:00
Davanum Srinivas	1930bf4db5	Bump golang.org/x/text to v0.3.6 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 8aab198bc611999c889d8f629028a98a598f1d45	2021-05-28 11:07:25 -04:00