github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2026-05-16 20:37:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107569 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.21

Browse Source 
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b
This commit is contained in:
Kubernetes Publisher
2022-01-14 20:46:27 -08:00
parent 414618c60b 8cbaa2fa3a
commit b3fbf6e096
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
go.mod
View File

@@ -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.0.0-20211213212415-b0823650fd24
k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f
k8s.io/api v0.0.0-20220115052846-e18a4d4fc464
k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98
k8s.io/klog/v2 v2.9.0
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
sigs.k8s.io/structured-merge-diff/v4 v4.1.2
sigs.k8s.io/structured-merge-diff/v4 v4.2.1
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211213212415-b0823650fd24
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f
k8s.io/api => k8s.io/api v0.0.0-20220115052846-e18a4d4fc464
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98
)

12
go.sum
View File

@@ -417,10 +417,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.0.0-20211213212415-b0823650fd24 h1:qKDdirI4QY7AWXRUxc7e4lStVbiKWZiIDsiBEnwQPbQ=
k8s.io/api v0.0.0-20211213212415-b0823650fd24/go.mod h1:BGU4u94MF1y/vcHtu5OQCkZTp3e+byTeTkUVPmxFy7o=
k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f h1:uWz5BkD3edSncqlTdY1u90s2oOSzyHfDOYjOQEHEvO8=
k8s.io/apimachinery v0.0.0-20211213211846-5ef28cc1b58f/go.mod h1:VdCLtKQwpSUQEWDaRsWR5ESDRqqhY2NeVzo9KCQ9uy0=
k8s.io/api v0.0.0-20220115052846-e18a4d4fc464 h1:zYUcImzLfRgIQsp4xwYBORc3oXjMyyPzmJN8cEf6+uA=
k8s.io/api v0.0.0-20220115052846-e18a4d4fc464/go.mod h1:1rXHa5F5YY7BxmZm5XoXjqq5GH54ggnxTlrxLwHlhU4=
k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 h1:mf2T8QRJGaH7h0qKnSq22AW9lUrPhWZoFILJQHjo/y8=
k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98/go.mod h1:USs+ifLG6ZUgHGA/9lGxjdHzCB3hUO3fG1VBOwi0IHo=
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=
@@ -433,7 +433,7 @@ 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=