kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105983 from jiahuif-forks/dep/bump-smd 

Upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.0

Kubernetes-commit: 8e2d7a3d64976eb23e1a4fdc8c068f5210014da6
This commit is contained in:
Kubernetes Publisher 2021-11-03 15:24:32 -07:00
parent 12d3e10550 c628b8bcb0
commit 43ed92b473
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
go.mod
View File

@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20211029201511-cca52a076791
k8s.io/apimachinery v0.0.0-20211028185107-b255da54548a
k8s.io/cli-runtime v0.0.0-20211027005851-fd0a6d95140a
k8s.io/client-go v0.0.0-20211103203847-980663e185ab
k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3
k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4
k8s.io/api v0.0.0-20211104003544-e423bf5bf942
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e
k8s.io/metrics v0.0.0-20211104005934-41e325c1dbcb
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
sigs.k8s.io/kustomize/kustomize/v4 v4.2.0
sigs.k8s.io/kustomize/kyaml v0.11.0
@ -47,12 +47,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211029201511-cca52a076791
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211028185107-b255da54548a
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211027005851-fd0a6d95140a
k8s.io/client-go => k8s.io/client-go v0.0.0-20211103203847-980663e185ab
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211102141458-35fbf2653103
k8s.io/component-base => k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4
k8s.io/metrics => k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e
k8s.io/api => k8s.io/api v0.0.0-20211104003544-e423bf5bf942
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1
k8s.io/client-go => k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211104003136-1003036828ea
k8s.io/component-base => k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37
k8s.io/metrics => k8s.io/metrics v0.0.0-20211104005934-41e325c1dbcb
)

34
go.sum
View File

@ -902,19 +902,19 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
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=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20211029201511-cca52a076791 h1:d7AqOEjufZ9cuB97JXVjyvpwonRKyphG0aLfK7+dBNI=
k8s.io/api v0.0.0-20211029201511-cca52a076791/go.mod h1:dx3B5TOvDwqR2Oqn8muvHae5vt+xIgmxap/fvP+iItQ=
k8s.io/apimachinery v0.0.0-20211028185107-b255da54548a h1:3NA1KMmF0ie/tLSNnA3v1ihGjVX7Z5OmZIyAOm0YmVo=
k8s.io/apimachinery v0.0.0-20211028185107-b255da54548a/go.mod h1:oyH3LcOKLLooQH1NlpHlilzkWxqsiHWETyHgssntcXg=
k8s.io/cli-runtime v0.0.0-20211027005851-fd0a6d95140a h1:6N6d0a80cFO2PI8RssKTsofnWWdzr4LBWKKe0t+1kAk=
k8s.io/cli-runtime v0.0.0-20211027005851-fd0a6d95140a/go.mod h1:C/9bEqryTALzT3y/AJFeg2TqzudoaRZrdr4Zdoeetn0=
k8s.io/client-go v0.0.0-20211103203847-980663e185ab h1:N6JhDz4/SHsR0LnjSTU6ywbLkvg1ZbWWT+V3Wj4k8w0=
k8s.io/client-go v0.0.0-20211103203847-980663e185ab/go.mod h1:AeiEb+/G5s6RA7edXOQ1MJ1JyCAxXwoAYZ7CJhpF0Ow=
k8s.io/code-generator v0.0.0-20211102141458-35fbf2653103/go.mod h1:alK4pz5+y/zKXOPBnND3TvXOC/iF2oYTBDynHO1+qlI=
k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3 h1:Hx2Olj7sA4W9r8veeamsvNiiYf5SMTN/N/1uAMQk13c=
k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3/go.mod h1:7xqZFY7A2hOLqh+cOR9jinp+xJVXp6F5I1rOO+kBKJc=
k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4 h1:8umcjzLRjGapYYFQ4SUIwXCoLi8orNIce0ll3OQ+tmg=
k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4/go.mod h1:FYNL/FrbLSYkD3DokSWxRcQI1yxAQQpeRkJbm+m9jRc=
k8s.io/api v0.0.0-20211104003544-e423bf5bf942 h1:mpDzWVE2CzzB+Gdd47PbeTXsSU6OMA46XtIOkw2I0QE=
k8s.io/api v0.0.0-20211104003544-e423bf5bf942/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo=
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c h1:18i+Svc8AQt2tsHgUJjMgipgIRROqVsdttom0N2URHQ=
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto=
k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1 h1:KR+VHGOl0iye0Eu9fyPtJU3UtOLniYbA352RpzZGBvM=
k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1/go.mod h1:wHnWmk7jRQ9sQtUhrS9Wx9rLB3Uh1NaUPKUNMCAJuLg=
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453 h1:5555+BsEXvnsDKnNtMm4pL5Jf9x4HBN96ZZ9cQ5Wt9c=
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453/go.mod h1:XlENrFN0KamgreLfijzwed9BylToe+dU63vC+0pl4/M=
k8s.io/code-generator v0.0.0-20211104003136-1003036828ea/go.mod h1:wgD40ts/jbentZZcVvzzscrjJ2IoTSNJXfeVJxytQvU=
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8 h1:L6x6ib3sOlNdnNBMWOfb+5sIExv6Fxo2gn3NIhoTePE=
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8/go.mod h1:i3cLNE42Rergf0WtAjvBXeMFMCiM70q8HHLQQjzt13Q=
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37 h1:HChfMuubDXGdPLqEbz5iFrAa85fvlkTzKQsVVEtr4/I=
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37/go.mod h1:qHturFtBnqFM3naRrwJ3vyLHJ4ETBgLkekFc97N2nVc=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -924,8 +924,8 @@ k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 h1:Xxl9TLJ30BJ1pGWfGZnqbpww2rwOt3RAzbSz+omQGtg=
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8/go.mod h1:foAE7XkrXQ1Qo2eWsW/iWksptrVdbl6t+vscSdmmGjk=
k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e h1:xqZB2why0n/Xp6FczpSHRrgfxSFU54Og+sp3zHXnxc0=
k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e/go.mod h1:H2K/8mL6glAaL5f+yLXWa62H3IqRsgNJ9vEWrkTR1bc=
k8s.io/metrics v0.0.0-20211104005934-41e325c1dbcb h1:mLke2/6FIJXCo0vyYGZy9MjWsU6awmOfLL4dWjfBDsU=
k8s.io/metrics v0.0.0-20211104005934-41e325c1dbcb/go.mod h1:tOU+YcbsAgKJd4sUXfnpeQhcSrbMGa8pjrojkZtGEKs=
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
@ -942,7 +942,7 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod h1:MOkR6fmhwG7hEDRXBYELTi5GSFcL
sigs.k8s.io/kustomize/kyaml v0.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA=
sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM=
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.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0=
sigs.k8s.io/structured-merge-diff/v4 v4.2.0/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=