Merge pull request #103318 from jpbetz/fix-102749

Bump SMD to v4.1.2 to pick up #102749 fix

Kubernetes-commit: 0dad7d1c47c41f232b21cdd5c21be6683e545e9d
This commit is contained in:
Kubernetes Publisher 2021-06-30 14:03:03 -07:00
commit b83b2ec7d1
2 changed files with 32 additions and 32 deletions

30
go.mod
View File

@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20210629170440-b71fde3beeb9
k8s.io/apimachinery v0.0.0-20210624234137-a4b8a5f324ca
k8s.io/cli-runtime v0.0.0-20210619073704-985493538305
k8s.io/client-go v0.0.0-20210628114532-e68c673b3cae
k8s.io/component-base v0.0.0-20210625194720-aff3fba93d8f
k8s.io/component-helpers v0.0.0-20210619072503-e49d357536d8
k8s.io/api v0.0.0-20210630214335-e14d3f91c1fb
k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1
k8s.io/cli-runtime v0.0.0-20210630220546-4af40b7960d5
k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1
k8s.io/component-base v0.0.0-20210630215151-284cd21cb037
k8s.io/component-helpers v0.0.0-20210630215251-b2e047e6ebdb
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/metrics v0.0.0-20210619073559-44cd595986d4
k8s.io/metrics v0.0.0-20210630220437-9c336cb4cc37
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
sigs.k8s.io/kustomize/api v0.8.10
sigs.k8s.io/kustomize/kustomize/v4 v4.1.3
@ -47,12 +47,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210629170440-b71fde3beeb9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210624234137-a4b8a5f324ca
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210619073704-985493538305
k8s.io/client-go => k8s.io/client-go v0.0.0-20210628114532-e68c673b3cae
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210628114000-53a4e859cc97
k8s.io/component-base => k8s.io/component-base v0.0.0-20210625194720-aff3fba93d8f
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210619072503-e49d357536d8
k8s.io/metrics => k8s.io/metrics v0.0.0-20210619073559-44cd595986d4
k8s.io/api => k8s.io/api v0.0.0-20210630214335-e14d3f91c1fb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210630220546-4af40b7960d5
k8s.io/client-go => k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210630214009-43f2a02b1abe
k8s.io/component-base => k8s.io/component-base v0.0.0-20210630215151-284cd21cb037
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210630215251-b2e047e6ebdb
k8s.io/metrics => k8s.io/metrics v0.0.0-20210630220437-9c336cb4cc37
)

34
go.sum
View File

@ -733,19 +733,19 @@ 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-20210629170440-b71fde3beeb9 h1:IVpgBlCXeap+jp2EBh6wotG12yTDblgfr9oTbNrauxY=
k8s.io/api v0.0.0-20210629170440-b71fde3beeb9/go.mod h1:iTIQV8axBOG5ekbRIjyIuBa1YF0kPgqd/8e1rXhfOl4=
k8s.io/apimachinery v0.0.0-20210624234137-a4b8a5f324ca h1:Rhwv9/llB72sYX254T1Be2ak+CMVvZellTv/HZxAXto=
k8s.io/apimachinery v0.0.0-20210624234137-a4b8a5f324ca/go.mod h1:KrFIbDnxb/YcngqIe3ro6X24QG9xTL5O3a3cX7+XaWg=
k8s.io/cli-runtime v0.0.0-20210619073704-985493538305 h1:iRyXwVV4BkkOogRbA6AFcRdQSCaA2Fi8ciz67rcGsV8=
k8s.io/cli-runtime v0.0.0-20210619073704-985493538305/go.mod h1:BsWyikDaPFBOJgKXwUz58lbPhfKV6IwPX5rxDhwkd/E=
k8s.io/client-go v0.0.0-20210628114532-e68c673b3cae h1:unWupEn5TqUxZ45OaKzodzi56XPGg16ns2HfV27fzWs=
k8s.io/client-go v0.0.0-20210628114532-e68c673b3cae/go.mod h1:pyZ8aUDXgM3TTdtQXq4TFMguULL9Jbiwv9oeiEDtG5I=
k8s.io/code-generator v0.0.0-20210628114000-53a4e859cc97/go.mod h1:lBZLjrQ5bAwlmQalYYgV0gH3G7SS+Z2d33ijEte85FY=
k8s.io/component-base v0.0.0-20210625194720-aff3fba93d8f h1:y71uOAfhLNA1kwpu3TMAjHO4kIC55DSrUWKFKr7gqnw=
k8s.io/component-base v0.0.0-20210625194720-aff3fba93d8f/go.mod h1:9BniViIiRSsJjg/POKQID1Fo3Up+mpsVj7/76FnHg48=
k8s.io/component-helpers v0.0.0-20210619072503-e49d357536d8 h1:2lLBd4w3G25pR+Yaj7ovkqCAoo7dUVXCzNfm8qKdFXU=
k8s.io/component-helpers v0.0.0-20210619072503-e49d357536d8/go.mod h1:vtfAP2UOLenMKKAc7hlwzp3oRY+A5X8InKaiHgo9f5U=
k8s.io/api v0.0.0-20210630214335-e14d3f91c1fb h1:5gLwTuhudEs0MG9K6WSBu+ZU20B/S14sP0LSH8Vvhpk=
k8s.io/api v0.0.0-20210630214335-e14d3f91c1fb/go.mod h1:QUF4odb7cdl7zfuvctTckDbkEtvkCYAh3dFFz2L9tKM=
k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1 h1:7OgDmfxP0iHGe53HMiXFEPPju/kG6nQG8ygS3teYDsI=
k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1/go.mod h1:nl5vA2gQ1rZlqYe97ozT8wfbPFvI1zFQ1kilS6u/8Ks=
k8s.io/cli-runtime v0.0.0-20210630220546-4af40b7960d5 h1:LvCoQrgaYDWLcRqzp5AZ9yaQDsrZzQwX9zYQoJ3Q3oA=
k8s.io/cli-runtime v0.0.0-20210630220546-4af40b7960d5/go.mod h1:NKAakm6IRN6m8rStcHXJasYs2urjSCyVlgDJLcltqfE=
k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1 h1:vjdVCk7BRYgpyhtwbDUSKdd50Lvga7aHcLEP8fzPFl8=
k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1/go.mod h1:y7pYxLEebfazKsc0Y4PfxgDxDGKL3ICTTL53cr55ay8=
k8s.io/code-generator v0.0.0-20210630214009-43f2a02b1abe/go.mod h1:2tmenVqpDiATFt9sJrjuDwoQGcKjMBylWs2kMhEUBlU=
k8s.io/component-base v0.0.0-20210630215151-284cd21cb037 h1:WyX8Vx493iNqK8fbvH2OLotuD14nub2/v7GC3HTvvHY=
k8s.io/component-base v0.0.0-20210630215151-284cd21cb037/go.mod h1:3WGDFbwm/gsCYsIHucVkTm/+nQakZ/zfRYIGKbACVC8=
k8s.io/component-helpers v0.0.0-20210630215251-b2e047e6ebdb h1:OjDZQf6eq6cCMy3GhfIXKXRavDs6chJAkbsaPwIb+dI=
k8s.io/component-helpers v0.0.0-20210630215251-b2e047e6ebdb/go.mod h1:Ug5GO1j4gXG8O6zNAf6RHomsdHw9UvHzyuN4RQfCDS8=
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=
@ -754,8 +754,8 @@ 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-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/metrics v0.0.0-20210619073559-44cd595986d4 h1:wUBxdX9pZjutzFQwCeogburaZviz4d4SLW15giZdjcQ=
k8s.io/metrics v0.0.0-20210619073559-44cd595986d4/go.mod h1:o1qXl3NC4wuQBqXRtzEoPrmz+YVcYZouonJawyB9qIE=
k8s.io/metrics v0.0.0-20210630220437-9c336cb4cc37 h1:olOpdq6Nd80i1F3XZG0SkMi0YgkHQNljJRdk4mUVM8g=
k8s.io/metrics v0.0.0-20210630220437-9c336cb4cc37/go.mod h1:BzUgka4M03AVzP6bzVaxA2KkOpJqhL18CNI70akGnA0=
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=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
@ -769,7 +769,7 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.1.3/go.mod h1:Zw+pVPW6cHyb0zkOb24HU6NjJziq
sigs.k8s.io/kustomize/kyaml v0.10.20 h1:L9JNKvJfCBpmYFr4tP0igpfj/pXP7nW2aXOWNtF5k1g=
sigs.k8s.io/kustomize/kyaml v0.10.20/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/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/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/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=