Skip to content

Commit 25466f4

Browse files
Merge pull request #121575 from apelisse/update-smd
Update sigs.k8s.io/structured-merge-diff to v4.4.0 Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df
2 parents fc58c4d + 5624cd2 commit 25466f4

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ require (
99
github.com/google/go-cmp v0.6.0
1010
github.com/stretchr/testify v1.8.4
1111
google.golang.org/grpc v1.58.2
12-
k8s.io/api v0.0.0-20231027172135-b5946e690808
13-
k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2
14-
k8s.io/client-go v0.0.0-20231027173027-30eba26adb82
12+
k8s.io/api v0.0.0-20231101011356-6106c48f363d
13+
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
14+
k8s.io/client-go v0.0.0-20231101011735-7523a344f785
1515
k8s.io/klog/v2 v2.100.1
16-
k8s.io/kubelet v0.0.0-20231031014202-31168adbb52c
16+
k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193
1717
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
1818
)
1919

@@ -52,16 +52,16 @@ require (
5252
gopkg.in/yaml.v3 v3.0.1 // indirect
5353
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
5454
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
55-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
55+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
5656
sigs.k8s.io/yaml v1.3.0 // indirect
5757
)
5858

5959
replace (
60-
k8s.io/api => k8s.io/api v0.0.0-20231027172135-b5946e690808
61-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2
62-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231030212541-17d270f3cf34
63-
k8s.io/client-go => k8s.io/client-go v0.0.0-20231027173027-30eba26adb82
64-
k8s.io/component-base => k8s.io/component-base v0.0.0-20231027174419-7eefecff8918
60+
k8s.io/api => k8s.io/api v0.0.0-20231101011356-6106c48f363d
61+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
62+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231101013206-c78de1fe6c83
63+
k8s.io/client-go => k8s.io/client-go v0.0.0-20231101011735-7523a344f785
64+
k8s.io/component-base => k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115
6565
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20231027184618-f11c0b9770d2
66-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20231031014202-31168adbb52c
66+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193
6767
)

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,23 +145,23 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
145145
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
146146
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
147147
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
148-
k8s.io/api v0.0.0-20231027172135-b5946e690808 h1:PsNn101YgL4iLA6+r0S1SVxL7sE+lbEh5gHZs+Fig00=
149-
k8s.io/api v0.0.0-20231027172135-b5946e690808/go.mod h1:85jITVjKQiZ2494QUKUFq0g8dT584SMJydVlt8/fKwU=
150-
k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2 h1:IK+ucSMFzgZA5Obph+lJ5U64hB1SqywIJSojJg8eZZ8=
151-
k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2/go.mod h1:w0F2e93v67dkDnVXN80UeHkHMV8q0UIPd3JmttbIV2M=
152-
k8s.io/client-go v0.0.0-20231027173027-30eba26adb82 h1:VAIBmcvsYJjOy3wSkIhfRQ/LWnEP3DHSxkdgqUSaQ18=
153-
k8s.io/client-go v0.0.0-20231027173027-30eba26adb82/go.mod h1:tvNs9oJ+I4BmXdfQFadxavDpbC4ErR1mr3QrCKxvQXI=
148+
k8s.io/api v0.0.0-20231101011356-6106c48f363d h1:UGmDzNqOmVt+OcwK8zqQY+Rt7jex0EqP8teb11hhVNo=
149+
k8s.io/api v0.0.0-20231101011356-6106c48f363d/go.mod h1:lBfRF4cZnQAE1dC8eo5d+GYNg4AVK8XhcdF7OeZP3vw=
150+
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8 h1:ZmtmO/iO+jAzN4d6CitAv4GcBeoL900OIyD8hQH+BOY=
151+
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8/go.mod h1:Jstex+Vd1bLMOri3JGwKux2G++hIIH+6+/Gbrq+DhOQ=
152+
k8s.io/client-go v0.0.0-20231101011735-7523a344f785 h1:RCG2X8THR9tj0NKW3r7e6WuC4O9PZTw0RVKBntWjVUw=
153+
k8s.io/client-go v0.0.0-20231101011735-7523a344f785/go.mod h1:cTK5cDp0KQpzCXVivM3YixBMwcJdet4JFzdnwWQfgKk=
154154
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
155155
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
156156
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
157157
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
158-
k8s.io/kubelet v0.0.0-20231031014202-31168adbb52c h1:c7HdQ/NLST7YgTrw4bUL9Z+QDYhG7XfR30H0HVttSag=
159-
k8s.io/kubelet v0.0.0-20231031014202-31168adbb52c/go.mod h1:FPiR4fUVxhYea8t3SKrbv0iGZWvqU+e4JPz9MVE5qL0=
158+
k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193 h1:zRKeMjWR2ptQLMRB+ApTkliRT3c4XZzJ+tTxj42K6mI=
159+
k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193/go.mod h1:j61KCoZaF1FGNXg2uUCW4Sry80VqIA6IoepypNRd4y4=
160160
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
161161
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
162162
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
163163
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
164-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
165-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
164+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
165+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
166166
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
167167
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

0 commit comments

Comments
 (0)