Skip to content

Commit 235fdcc

Browse files
Merge pull request #103320 from jpbetz/fix-102749-1.20
Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: 86c8e960eeabd346a92457973d41abd865eccb5f
1 parent 023db45 commit 235fdcc

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ require (
2626
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
2727
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
2828
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
29-
k8s.io/api v0.0.0
30-
k8s.io/apimachinery v0.0.0
29+
k8s.io/api v0.0.0-20210712061735-c542627fda65
30+
k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
3131
k8s.io/klog/v2 v2.4.0
3232
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
3333
sigs.k8s.io/yaml v1.2.0
3434
)
3535

3636
replace (
37-
k8s.io/api => ../api
38-
k8s.io/apimachinery => ../apimachinery
39-
k8s.io/client-go => ../client-go
37+
k8s.io/api => k8s.io/api v0.0.0-20210712061735-c542627fda65
38+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
4039
)

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
425425
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
426426
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
427427
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
428+
k8s.io/api v0.0.0-20210712061735-c542627fda65 h1:hNU7BYfSkjgg4e6RiDnAcmCB0oowEB4KNUuAAYczqZQ=
429+
k8s.io/api v0.0.0-20210712061735-c542627fda65/go.mod h1:46MConCeKv5gXizJs2U/jhw5xCH0WBWbqGc5j5fAnaM=
430+
k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37 h1:rz55eMOF7F/F4281jjtEB75DcQXeCPgjrNJPfcH9Yzc=
431+
k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw=
428432
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
429433
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
430434
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=

0 commit comments

Comments
 (0)