Skip to content

Commit e718350

Browse files
Merge pull request #103319 from jpbetz/fix-102749-1.21
Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: c17d7c574149af1619dc8edd9c48a41dc07695e8
1 parent aa60858 commit e718350

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

go.mod

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ go 1.16
77
require (
88
github.com/gogo/protobuf v1.3.2
99
github.com/stretchr/testify v1.6.1
10-
k8s.io/apimachinery v0.0.0
10+
k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8
1111
)
1212

13-
replace (
14-
k8s.io/api => ../api
15-
k8s.io/apimachinery => ../apimachinery
16-
)
13+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie
199199
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
200200
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
201201
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
202+
k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8 h1:1OmwvcyF2eOmfatOSyhLzDgk+oq+TuO7w0iQIQA53AY=
203+
k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI=
202204
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
203205
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
204206
k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=

0 commit comments

Comments
 (0)