Merge pull request #107637 from gjkim42/cherry-pick-of-#106473-upstream-release-1.22

Update k/utils to v0.0.0-20211116205334-6203023598ed Kubernetes-commit: b2604798aaa65dcecf94a67ede54c2cf0c3c3e63
Update k/utils to v0.0.0-20211116205334-6203023598ed
2026-02-04 00:06:14 +08:00 · 2022-01-24 18:03:51 +00:00 · 2022-01-19 20:47:53 +09:00 · 2022-01-15 13:47:44 +00:00 · 2022-01-14 10:31:44 -08:00 · 2021-12-13 22:22:06 +00:00
2 changed files with 24 additions and 24 deletions
--- a/go.mod
+++ b/go.mod
@@ -5,16 +5,16 @@ module k8s.io/sample-controller
 go 1.16

 require (
-	k8s.io/api v0.22.3
-	k8s.io/apimachinery v0.22.3
-	k8s.io/client-go v0.22.3
-	k8s.io/code-generator v0.22.3
+	k8s.io/api v0.0.0-20220115132223-0b924f4f7b63
+	k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
+	k8s.io/client-go v0.0.0-20220124172954-be23bb76ca28
+	k8s.io/code-generator v0.0.0-20220124164557-9c63990c847d
 	k8s.io/klog/v2 v2.9.0
 )

 replace (
-	k8s.io/api => k8s.io/api v0.22.3
-	k8s.io/apimachinery => k8s.io/apimachinery v0.22.3
-	k8s.io/client-go => k8s.io/client-go v0.22.3
-	k8s.io/code-generator => k8s.io/code-generator v0.22.3
+	k8s.io/api => k8s.io/api v0.0.0-20220115132223-0b924f4f7b63
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20220124172954-be23bb76ca28
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220124164557-9c63990c847d
 )
--- a/go.sum
+++ b/go.sum
@@ -268,8 +268,8 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE=
-golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -455,14 +455,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.22.3 h1:wOoES2GoSkUsdped2RB4zYypPqWtvprGoKCENTOOjP4=
-k8s.io/api v0.22.3/go.mod h1:azgiXFiXqiWyLCfI62/eYBOu19rj2LKmIhFPP4+33fs=
-k8s.io/apimachinery v0.22.3 h1:mrvBG5CZnEfwgpVqWcrRKvdsYECTrhAR6cApAgdsflk=
-k8s.io/apimachinery v0.22.3/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
-k8s.io/client-go v0.22.3 h1:6onkOSc+YNdwq5zXE0wFXicq64rrym+mXwHu/CPVGO4=
-k8s.io/client-go v0.22.3/go.mod h1:ElDjYf8gvZsKDYexmsmnMQ0DYO8W9RwBjfQ1PI53yow=
-k8s.io/code-generator v0.22.3 h1:24xLuKySzFl1XupMarNBkpt10q0N+73R9dF7wzJO/hE=
-k8s.io/code-generator v0.22.3/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
+k8s.io/api v0.0.0-20220115132223-0b924f4f7b63 h1:ARkTMQaUQg/XAxZGClgPO8jLBGe+0vyHOzkv1klocn4=
+k8s.io/api v0.0.0-20220115132223-0b924f4f7b63/go.mod h1:VZ3awwdNsOtdAUAYPvruiFtrH/OD4gT5qmZHaQmXgxY=
+k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0 h1:SoF7jCfsIaGo2y+PiJGjFnRMeGh4zO4aGEYc0IVGAu4=
+k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU=
+k8s.io/client-go v0.0.0-20220124172954-be23bb76ca28 h1:Hf2c9VP/klVJMovZMzrz3vphiUd/WM6+H65X09RlKYE=
+k8s.io/client-go v0.0.0-20220124172954-be23bb76ca28/go.mod h1:jFEusOjjQIJVgq+/VfcZ7d08ZLyS60tIP1eQ2lf7TVk=
+k8s.io/code-generator v0.0.0-20220124164557-9c63990c847d h1:vr+NOp7vmq4f13E6e1BD9HDYeiBRcvW4PPqw5aaTIMI=
+k8s.io/code-generator v0.0.0-20220124164557-9c63990c847d/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@@ -470,15 +470,15 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 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/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g=
-k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+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-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE=
+k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 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.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/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1/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	f04a3b3a45	Merge pull request #107637 from gjkim42/cherry-pick-of-#106473-upstream-release-1.22 Update k/utils to v0.0.0-20211116205334-6203023598ed Kubernetes-commit: b2604798aaa65dcecf94a67ede54c2cf0c3c3e63	2022-01-24 18:03:51 +00:00
Gunju Kim	6212e6900d	Update k/utils to v0.0.0-20211116205334-6203023598ed Kubernetes-commit: 723c1b334ecf48c43fb9ddf6abf4b45406f1110b	2022-01-19 20:47:53 +09:00
Kubernetes Publisher	735ad8a955	Merge pull request #107568 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.22 Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 487eef699dc8ad07106876e7fb045962606035ec	2022-01-15 13:47:44 +00:00
Jiahui Feng	2960ab5924	generated: ./hack/update-vendor.sh Kubernetes-commit: e0550f5f956b7fac6033bb58c678f733d972c97d	2022-01-14 10:31:44 -08:00
Kubernetes Publisher	ce572a95df	Merge pull request #106960 from cpanato/update-xnet-122t dependencies: Update golang.org/x/net to v0.0.0-20211209124913-491a49abca63 Kubernetes-commit: 603c0de6ea0aae0f9c52013702f0a005a2582a13	2021-12-13 22:22:06 +00:00
Carlos Panato	ee5fb0625f	dependencies: Update golang.org/x/net to v0.0.0-20211209124913-491a49abca63 Signed-off-by: Carlos Panato <ctadeu@gmail.com> Kubernetes-commit: cd6f99f86a383e0146f5c8a72f13545e2a6e25c6	2021-12-10 17:47:44 +01:00
Kubernetes Publisher	75095bf2c4	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 08:31:41 +00:00
Alper Rifat Ulucinar	5371c37a17	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