Update dependencies to v0.21.7-rc.0 tag

Merge pull request #102601 from jonesbr17/automated-cherry-pick-of-#102409-upstream-release-1.21
Automated cherry pick of #102409: Bump golang.org/x/text to v0.3.6 Kubernetes-commit: e010ed4d8e511e931166d209dc63a79199cfcd58
2026-06-22 01:36:12 +00:00 · 2021-10-28 04:59:20 +00:00 · 2021-10-06 16:45:48 +00:00 · 2021-10-06 12:51:54 +00:00 · 2021-10-01 11:35:04 -07:00 · 2021-09-26 23:48:23 -07:00
3 changed files with 14 additions and 14 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.6-rc.0
-	k8s.io/apimachinery v0.21.6-rc.0
-	k8s.io/klog/v2 v2.8.0
+	k8s.io/api v0.21.7-rc.0
+	k8s.io/apimachinery v0.21.7-rc.0
+	k8s.io/klog/v2 v2.9.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	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.6-rc.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.21.6-rc.0
+	k8s.io/api => k8s.io/api v0.21.7-rc.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.7-rc.0
 )
--- a/go.sum
+++ b/go.sum
@@ -302,8 +302,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=
@@ -416,14 +416,14 @@ 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.6-rc.0 h1:z9hL6JUE9zylhrNsgwXY/Iy5d/DGfah2PAHrvlVWsPo=
-k8s.io/api v0.21.6-rc.0/go.mod h1:NkJP0QZdwx/FlvoEG+M+vX1gtSjM9M8Cpz7YS7FosLo=
-k8s.io/apimachinery v0.21.6-rc.0 h1:fdizoFGqQvodY5Gsp8ktY2tMUopQH45dfBwwHNxBdJg=
-k8s.io/apimachinery v0.21.6-rc.0/go.mod h1:3PfBV+4PPXNs0aueD+7fHcGyhdkFFYqXeshQtsKCi+4=
+k8s.io/api v0.21.7-rc.0 h1:bkogqWxkTYx6rTN5TNsGJjuqYcTg9b/wPpWkIUgV6N0=
+k8s.io/api v0.21.7-rc.0/go.mod h1:9RwFbqCFbObxyUL/QKpGPepb0gY4QuVMOVC6x2lN0Cc=
+k8s.io/apimachinery v0.21.7-rc.0 h1:VIftz/EsHs1h57F8mdIJMCuOetTGVQlZENCia2WN7cA=
+k8s.io/apimachinery v0.21.7-rc.0/go.mod h1:cIJZ64G7RXojne0VMbraJhyZENr8Bep45PAX1zJlfLQ=
 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=
-k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
+k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
+k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
--- 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	a9a7c2e281	Update dependencies to v0.21.7-rc.0 tag	2021-10-28 04:59:20 +00:00
Kubernetes Publisher	cd49ed727a	Merge pull request #102601 from jonesbr17/automated-cherry-pick-of-#102409-upstream-release-1.21 Automated cherry pick of #102409: Bump golang.org/x/text to v0.3.6 Kubernetes-commit: e010ed4d8e511e931166d209dc63a79199cfcd58	2021-10-06 16:45:48 +00:00
Kubernetes Publisher	b01669a62d	Merge pull request #105407 from ehashman/bump-klog-1.21 Bump klog to v2.9.0 Kubernetes-commit: 3f8595c92359d6113fd1e353213d9965e90aa288	2021-10-06 12:51:54 +00:00
Elana Hashman	58e9421085	Bump klog to v2.9.0 Kubernetes-commit: 33ddb9afe22ecbca6d968104db7c64af65ae9a34	2021-10-01 11:35:04 -07:00
Kubernetes Publisher	1d060b21fe	Merge pull request #104989 from liggitt/automated-cherry-pick-of-#104969-upstream-release-1.21 Automated cherry pick of #104969: Propagate conversion errors Kubernetes-commit: 1f8ce710b8a41163cec5eb819646366c5896b911	2021-09-26 23:48:23 -07:00
Jordan Liggitt	9ab290c347	Propagate conversion errors Kubernetes-commit: b9adf66929f09712f931d975034a2ef3940b3ec0	2021-09-13 11:49:17 -04:00
Davanum Srinivas	8a0dae8e62	Bump golang.org/x/text to v0.3.6 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 9385a0fac743ac57b1bd77a45c18caa0a8464f4e	2021-05-28 11:07:25 -04:00