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

Update structured-merge-diff to v4.1.1 

Kubernetes-commit: 5f1b146852124e6c5ebfc2b69aee7dfa4fe6d158
This commit is contained in:
Kevin Delgado 2021-04-02 17:42:54 +00:00 committed by Kubernetes Publisher
parent 316f1b3dd0
commit 6ba57e45cb
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
go.mod
View File

@ -33,15 +33,15 @@ require (
github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20210408231833-e32abb16c84d
k8s.io/apimachinery v0.0.0-20210408225951-74cf9d365d5e
k8s.io/cli-runtime v0.0.0-20210324233727-c2f4736118ac
k8s.io/client-go v0.0.0-20210409032105-064bf3ddb9f5
k8s.io/component-base v0.0.0-20210324071744-e913a9709153
k8s.io/component-helpers v0.0.0-20210313031811-38d994307f22
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
k8s.io/metrics v0.0.0-20210313034850-5ca43742ab93
k8s.io/metrics v0.0.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/kustomize/api v0.8.5
sigs.k8s.io/kustomize/kustomize/v4 v4.0.5
@ -49,12 +49,13 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210408231833-e32abb16c84d
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210408225951-74cf9d365d5e
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210324233727-c2f4736118ac
k8s.io/client-go => k8s.io/client-go v0.0.0-20210409032105-064bf3ddb9f5
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210408230000-3112572d2fa0
k8s.io/component-base => k8s.io/component-base v0.0.0-20210324071744-e913a9709153
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210313031811-38d994307f22
k8s.io/metrics => k8s.io/metrics v0.0.0-20210313034850-5ca43742ab93
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
)

12
go.sum
View File

@ -721,13 +721,6 @@ 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-20210408231833-e32abb16c84d/go.mod h1:qWBQaP6/XkVq3wtewQmaEEUxdGD1f/HstASE9fJtjns=
k8s.io/apimachinery v0.0.0-20210408225951-74cf9d365d5e/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/cli-runtime v0.0.0-20210324233727-c2f4736118ac/go.mod h1:Ulb9RafJ//G4NCfGurCaocWo9XVj+KrbRnJ9Ryc0COI=
k8s.io/client-go v0.0.0-20210409032105-064bf3ddb9f5/go.mod h1:vrSe4BaYXu8a9KjSA3kIlQSuwWshJLlMzgEiqg+69zQ=
k8s.io/code-generator v0.0.0-20210408230000-3112572d2fa0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
k8s.io/component-base v0.0.0-20210324071744-e913a9709153/go.mod h1:9MPVmiPTmiZvJVCLRxzzagwGC6u7pOXNi7xM+3cwghk=
k8s.io/component-helpers v0.0.0-20210313031811-38d994307f22/go.mod h1:6cBGPXFQcY4ftKGLKTHHouDmx3shHM0CGYvxMTggJ6Q=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -736,7 +729,6 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
k8s.io/metrics v0.0.0-20210313034850-5ca43742ab93/go.mod h1:BzhqzU6zRteBg1wC1b6SBARahYFm9N1H9px3O5o8VCk=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
@ -750,7 +742,7 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.0.5/go.mod h1:C7rYla7sI8EnxHE/xEhRBSHMNfcL
sigs.k8s.io/kustomize/kyaml v0.10.15 h1:dSLgG78KyaxN4HylPXdK+7zB3k7sW6q3IcCmcfKA+aI=
sigs.k8s.io/kustomize/kyaml v0.10.15/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4cPcfUVt5Hg=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8=
sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.1.1 h1:nYqY2A6oy37sKLYuSBXuQhbj4JVclzJK13BOIvJG5XU=
sigs.k8s.io/structured-merge-diff/v4 v4.1.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=