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

Merge pull request #107565 from jiahuif-forks/deps/structured-merged-diff 

upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: cf18d80d035780739575b8cc889e8f26bf36779f
This commit is contained in:
Kubernetes Publisher 2022-01-14 12:32:26 -08:00
parent 692ead043a
commit c4379b82cc
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
go.mod
View File

@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.7.0 github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20220114212057-37c9308dad1e
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b
k8s.io/cli-runtime v0.0.0 k8s.io/cli-runtime v0.0.0-20220114215615-28aad093b364
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20220114212508-092b54e6e535
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20220114213224-deb8206c5cf5
k8s.io/component-helpers v0.0.0 k8s.io/component-helpers v0.0.0-20220114213410-6878be98cbd9
k8s.io/klog/v2 v2.40.1 k8s.io/klog/v2 v2.40.1
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/metrics v0.0.0 k8s.io/metrics v0.0.0-20220114215422-eef205bb5a80
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
sigs.k8s.io/kustomize/kustomize/v4 v4.4.1 sigs.k8s.io/kustomize/kustomize/v4 v4.4.1
sigs.k8s.io/kustomize/kyaml v0.13.0 sigs.k8s.io/kustomize/kyaml v0.13.0
@ -47,13 +47,12 @@ require (
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20220114212057-37c9308dad1e
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b
k8s.io/cli-runtime => ../cli-runtime k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220114215615-28aad093b364
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20220114212508-092b54e6e535
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220114211509-46b6323b57a2
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20220114213224-deb8206c5cf5
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220114213410-6878be98cbd9
k8s.io/kubectl => ../kubectl k8s.io/metrics => k8s.io/metrics v0.0.0-20220114215422-eef205bb5a80
k8s.io/metrics => ../metrics
) )

15
go.sum
View File

@ -909,6 +909,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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/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-20220114212057-37c9308dad1e h1:yq1koxef1IPugvWJ0datOgWkA3bq6EQ/laIdBCRNV2M=
k8s.io/api v0.0.0-20220114212057-37c9308dad1e/go.mod h1:ydI/EZB8sQSGGgqIugVCax6qT4v8+NZ6Hbduo30cjbo=
k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b h1:7lh+0FnYetRD5shepu42q+Su/LHlUy2VgoeoQN1sd3Y=
k8s.io/apimachinery v0.0.0-20220114211744-3c16f3dcfb0b/go.mod h1:v8xabFQhCZrrX2Lm1DcO0GldEoXSxCi8KODudZ/jv5s=
k8s.io/cli-runtime v0.0.0-20220114215615-28aad093b364 h1:kmAYJ8sgycuYxE1dfbXJ/S4IxmoE4E/xF+eh502eXEM=
k8s.io/cli-runtime v0.0.0-20220114215615-28aad093b364/go.mod h1:K4P9h+mszam8QwMFK5DpvP7+3iGnz6rLl0fgy4xR8Gc=
k8s.io/client-go v0.0.0-20220114212508-092b54e6e535 h1:/CkYObh8SlkqIXC+PTHuj3TaXyAnHhON6XQB4typ9y4=
k8s.io/client-go v0.0.0-20220114212508-092b54e6e535/go.mod h1:QpOMWG81SHGTz7f5+sGRm2wjSzceou61sBI922IVyr0=
k8s.io/code-generator v0.0.0-20220114211509-46b6323b57a2/go.mod h1:13z1JFp2qjcsKGe8Kp3NutZ+fCwNjAsJi5y3sIjOoj0=
k8s.io/component-base v0.0.0-20220114213224-deb8206c5cf5 h1:yvZJ8NYVgrxEsLil/oOJ7MKQxby9iBDjQ/rhICoWVG0=
k8s.io/component-base v0.0.0-20220114213224-deb8206c5cf5/go.mod h1:+7xa73sNdCgJ/cOHyZGnz7O9+gP7EcnPUtd8b9B5Xi4=
k8s.io/component-helpers v0.0.0-20220114213410-6878be98cbd9 h1:NOTchGNlDcvsFxGkdBMw4Bw+wUgdm3ADhRKOUY2Pi6Y=
k8s.io/component-helpers v0.0.0-20220114213410-6878be98cbd9/go.mod h1:ie/gT24Xgdy/UjXRGKf+tv/Kew6/2fWrfWW2YjVxmS8=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@ -919,6 +932,8 @@ k8s.io/klog/v2 v2.40.1/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-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
k8s.io/metrics v0.0.0-20220114215422-eef205bb5a80 h1:1NF7r5OBtj068NEx+bZmvk1PsjfGIAmwXXE2y5ptqm4=
k8s.io/metrics v0.0.0-20220114215422-eef205bb5a80/go.mod h1:S/9XDVLvlQ8mHBsItEepTqle8JBXvg0CdgGX0yKcQVc=
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo= k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo=
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=