Skip to content

Commit 07ac8fe

Browse files
Merge remote-tracking branch 'origin/master' into release-1.26
Kubernetes-commit: 713b671a8a3fb526ba616a26953a91026c77611f
1 parent 566ee01 commit 07ac8fe

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Diff for: go.mod

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

1313
require (
@@ -34,7 +34,4 @@ require (
3434
sigs.k8s.io/yaml v1.3.0 // indirect
3535
)
3636

37-
replace (
38-
k8s.io/api => ../api
39-
k8s.io/apimachinery => ../apimachinery
40-
)
37+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7

Diff for: go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
8181
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
8282
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
8383
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
84+
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7 h1:6WftyyXbOkaz1aO+YA8Z5774ZvYeQOUk1JUkvPaOTvE=
85+
k8s.io/apimachinery v0.0.0-20221208055745-5d4cdd22b0f7/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
8486
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
8587
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
8688
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=

0 commit comments

Comments
 (0)