Update dependencies to v0.22.4 tag

Merge pull request #106250 from ulucinar/bump-k-openapi-1.22
Manual cherry pick of kube-openapi changes for release-1.22 Kubernetes-commit: b01dafb504ddb82292ba0bd521a5053bacfebc05
2026-06-26 11:44:28 +00:00 · 2021-11-17 23:48:57 +00:00 · 2021-11-11 07:51:25 +00:00 · 2021-11-09 10:53:33 +03:00 · 2021-09-27 02:51:36 -07:00 · 2021-09-13 11:49:17 -04:00
3 changed files with 11 additions and 11 deletions
--- a/go.mod
+++ b/go.mod
@@ -30,8 +30,8 @@ require (
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
 	google.golang.org/protobuf v1.26.0
-	k8s.io/api v0.22.3-rc.0
-	k8s.io/apimachinery v0.22.3-rc.0
+	k8s.io/api v0.22.4
+	k8s.io/apimachinery v0.22.4
 	k8s.io/klog/v2 v2.9.0
 	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2
@@ -39,6 +39,6 @@ require (
 )

 replace (
-	k8s.io/api => k8s.io/api v0.22.3-rc.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.22.3-rc.0
+	k8s.io/api => k8s.io/api v0.22.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.22.4
 )
--- a/go.sum
+++ b/go.sum
@@ -444,16 +444,16 @@ 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.22.3-rc.0 h1:ilUf4zuy74DnoWTozELvxj7Ed6XLOD6VZ7gcwP1Sirc=
-k8s.io/api v0.22.3-rc.0/go.mod h1:ab7Bh4ypD3bw6kLGoURVDKSfb4vkmyxSVyD8YWOmn5I=
-k8s.io/apimachinery v0.22.3-rc.0 h1:3Exc1iahYy0DkHcDvc9Nr7R3TKG/EOaRJyzN3kdp1LI=
-k8s.io/apimachinery v0.22.3-rc.0/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
+k8s.io/api v0.22.4 h1:UvyHW0ezB2oIgHAxlYoo6UJQObYXU7awuNarwoHEOjw=
+k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk=
+k8s.io/apimachinery v0.22.4 h1:9uwcvPpukBw/Ri0EUmWz+49cnFtaoiyEhQTK+xOe7Ck=
+k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0=
 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.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-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
-k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
+k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80=
+k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
--- 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	29f81448d7	Update dependencies to v0.22.4 tag	2021-11-17 23:48:57 +00:00
Kubernetes Publisher	362cd0f884	Merge pull request #106250 from ulucinar/bump-k-openapi-1.22 Manual cherry pick of kube-openapi changes for release-1.22 Kubernetes-commit: b01dafb504ddb82292ba0bd521a5053bacfebc05	2021-11-11 07:51:25 +00:00
Alper Rifat Ulucinar	2064e72179	Manual cherry pick of kube-openapi changes for release-1.22 Bump kube-openapi against kube-openapi/release-1.22 branch Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com> Kubernetes-commit: 0c7332355b4c4fb0d3bf3cf95eb0875e535e7236	2021-11-09 10:53:33 +03:00
Kubernetes Publisher	36ef169787	Merge pull request #104988 from liggitt/automated-cherry-pick-of-#104969-upstream-release-1.22 Automated cherry pick of #104969: Propagate conversion errors Kubernetes-commit: 39a3dc822461a2d2d9457af383ce7dfba23e726c	2021-09-27 02:51:36 -07:00
Jordan Liggitt	528ab4ff65	Propagate conversion errors Kubernetes-commit: aeff924339a6f34e424a654227a8073e88a70b89	2021-09-13 11:49:17 -04:00