Merge pull request #108666 from cyclinder/update_go_mod_for_1.21

update go.mod for golang.org/x/crypto to v0.0.0-20211202192323 Kubernetes-commit: c91e435f72048eeb846973297746b0883dd500cd
update go.mod for golang.org/x/crypto to v0.0.0-20211202192323-5770296d904e
2026-02-04 00:06:14 +08:00 · 2022-03-28 17:41:02 +00:00 · 2022-03-12 18:06:57 +08:00 · 2022-02-24 22:33:11 +00:00 · 2022-02-24 11:33:32 -06:00 · 2022-01-15 06:34:16 +00:00
2 changed files with 24 additions and 25 deletions
--- a/go.mod
+++ b/go.mod
@@ -5,16 +5,16 @@ module k8s.io/sample-controller
 go 1.16

 require (
-	k8s.io/api v0.21.8
-	k8s.io/apimachinery v0.21.8
-	k8s.io/client-go v0.21.8
-	k8s.io/code-generator v0.21.8
+	k8s.io/api v0.0.0-20220328171320-4624a1cdc1b2
+	k8s.io/apimachinery v0.0.0-20220328170958-67c29d29c4cd
+	k8s.io/client-go v0.0.0-20220328171824-1110612dc6e5
+	k8s.io/code-generator v0.0.0-20220328170653-60693c8668bd
 	k8s.io/klog/v2 v2.9.0
 )

 replace (
-	k8s.io/api => k8s.io/api v0.21.8
-	k8s.io/apimachinery => k8s.io/apimachinery v0.21.8
-	k8s.io/client-go => k8s.io/client-go v0.21.8
-	k8s.io/code-generator => k8s.io/code-generator v0.21.8
+	k8s.io/api => k8s.io/api v0.0.0-20220328171320-4624a1cdc1b2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220328170958-67c29d29c4cd
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20220328171824-1110612dc6e5
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220328170653-60693c8668bd
 )
--- a/go.sum
+++ b/go.sum
@@ -196,7 +196,7 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -251,6 +251,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/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-20211112202133-69e39bad7dc2/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=
@@ -278,7 +279,6 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -292,9 +292,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs=
-golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -421,14 +420,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.8 h1:wVK5Jr4RnUIpjejuFnslXminUMdxa31bxi6zaUOILI4=
-k8s.io/api v0.21.8/go.mod h1:4A6eY7AJ+cAgEws3bGRIP2Wyia6VYmHbwIoQu83yyok=
-k8s.io/apimachinery v0.21.8 h1:crvdCfg/ueRHOPWReO+DukFvtGBoxyJdV61xkO6RhJU=
-k8s.io/apimachinery v0.21.8/go.mod h1:VdCLtKQwpSUQEWDaRsWR5ESDRqqhY2NeVzo9KCQ9uy0=
-k8s.io/client-go v0.21.8 h1:okz2KT8eM2VrRRXQMqS205hulPOfGE112HdFFvwgy+E=
-k8s.io/client-go v0.21.8/go.mod h1:FcrKJITUrWtQSX3SCmqswlETK8AcVDTTA5PxDPxNtcg=
-k8s.io/code-generator v0.21.8 h1:ajS/EvClGPP9svtZbXFK5n2kdakaWHJZOcpzF8jh8MM=
-k8s.io/code-generator v0.21.8/go.mod h1:py8RM46Y1+H0IWM1oO9pOGz60GhD9uW2SFlnXI5jZno=
+k8s.io/api v0.0.0-20220328171320-4624a1cdc1b2 h1:mQQxbuGfhjtJRzO5jygLAOSeKBqmryaxgzJgODXvp60=
+k8s.io/api v0.0.0-20220328171320-4624a1cdc1b2/go.mod h1:dLJRDXHdcY5R7QBidJt4iEHtydjJKpY6SV56pk/WYbY=
+k8s.io/apimachinery v0.0.0-20220328170958-67c29d29c4cd h1:cFe0+pEzt4nF+B4HArGtSIp/Z5H7MfXW8UZzgCEWBBg=
+k8s.io/apimachinery v0.0.0-20220328170958-67c29d29c4cd/go.mod h1:NI5S3z6+ZZ6Da3whzPF+MnJCjU1NyLuTq9WnKIj5I20=
+k8s.io/client-go v0.0.0-20220328171824-1110612dc6e5 h1:t+hfkGq9eLq6nkUZB9bEpXNHfA5XuFqZOUtpuuCyyAU=
+k8s.io/client-go v0.0.0-20220328171824-1110612dc6e5/go.mod h1:2+UZE1aeMy8RLxq203VzMitsvGrQyEUHuusSxtJpBSc=
+k8s.io/code-generator v0.0.0-20220328170653-60693c8668bd h1:fAOSr3aGC207RZknOgcgwIQcrbZarziDf0rXUnXh3gY=
+k8s.io/code-generator v0.0.0-20220328170653-60693c8668bd/go.mod h1:81hFjkYbF/UaE/v1TOUrQ9/QtaBvnAxNqMTWO9CQLs0=
 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=
@@ -438,13 +437,13 @@ 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-20211110012726-3cc51fd1e909 h1:s77MRc/+/eQjsF89MB12JssAlsoi9mnNoaacRqibeAU=
 k8s.io/kube-openapi v0.0.0-20211110012726-3cc51fd1e909/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
-k8s.io/utils v0.0.0-20210521133846-da695404a2bc h1:dx6VGe+PnOW/kD/2UV4aUSsRfJGd7+lcqgJ6Xg0HwUs=
-k8s.io/utils v0.0.0-20210521133846-da695404a2bc/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+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	6d7cafdc2a	Merge pull request #108666 from cyclinder/update_go_mod_for_1.21 update go.mod for golang.org/x/crypto to v0.0.0-20211202192323 Kubernetes-commit: c91e435f72048eeb846973297746b0883dd500cd	2022-03-28 17:41:02 +00:00
cyclinder	0b355c9170	update go.mod for golang.org/x/crypto to v0.0.0-20211202192323-5770296d904e Signed-off-by: cyclinder <qifeng.guo@daocloud.io> Kubernetes-commit: 3c75662c8687029bcc0241462bd4673098de3dba	2022-03-12 18:06:57 +08:00
Kubernetes Publisher	7dfa437d37	Merge pull request #108335 from rphillips/backport/107637 [release-1.21] backports k/utils bump (PR#107637) to 1.21 Kubernetes-commit: 9947659f9f39cc847cf9780ae8935686be01016b	2022-02-24 22:33:11 +00:00
Ryan Phillips	d693022320	update vendor Kubernetes-commit: 7022f3c4165908cf49409cf19ad3e8c7c1c9340d	2022-02-24 11:33:32 -06:00
Kubernetes Publisher	f858f0b7ec	Merge pull request #107569 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.21 Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b	2022-01-15 06:34:16 +00:00
Jiahui Feng	c3e9f6dc1a	generated: ./hack/update-vendor.sh Kubernetes-commit: cea8bad2c6f0591527747a54c379eab3838b3cce	2022-01-14 10:31:44 -08:00