Skip to content

Commit 7523a34

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 965bc8d + ce4f256 commit 7523a34

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Diff for: go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ require (
2424
golang.org/x/term v0.13.0
2525
golang.org/x/time v0.3.0
2626
google.golang.org/protobuf v1.31.0
27-
k8s.io/api v0.0.0-20231031211309-14869ee3b213
28-
k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5
27+
k8s.io/api v0.0.0-20231101011356-6106c48f363d
28+
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
2929
k8s.io/klog/v2 v2.100.1
3030
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
3131
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3232
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
33-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0
33+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
3434
sigs.k8s.io/yaml v1.3.0
3535
)
3636

@@ -61,6 +61,6 @@ require (
6161
)
6262

6363
replace (
64-
k8s.io/api => k8s.io/api v0.0.0-20231031211309-14869ee3b213
65-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5
64+
k8s.io/api => k8s.io/api v0.0.0-20231101011356-6106c48f363d
65+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
6666
)

Diff for: go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
158158
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
159159
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
160160
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
161-
k8s.io/api v0.0.0-20231031211309-14869ee3b213 h1:Lf1wKygIftBuj1Lr51emTskN7QSwvd51XFkYMUGgRsM=
162-
k8s.io/api v0.0.0-20231031211309-14869ee3b213/go.mod h1:qAbMauUgqfsYnwf64MNh5zf3WAoroYWSHW05o2JiGqk=
163-
k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5 h1:EiPDmPd4kR0WxYWUVNBrfSTW6Bz9gbLIEBBN44c59zo=
164-
k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5/go.mod h1:w0F2e93v67dkDnVXN80UeHkHMV8q0UIPd3JmttbIV2M=
161+
k8s.io/api v0.0.0-20231101011356-6106c48f363d h1:UGmDzNqOmVt+OcwK8zqQY+Rt7jex0EqP8teb11hhVNo=
162+
k8s.io/api v0.0.0-20231101011356-6106c48f363d/go.mod h1:lBfRF4cZnQAE1dC8eo5d+GYNg4AVK8XhcdF7OeZP3vw=
163+
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8 h1:ZmtmO/iO+jAzN4d6CitAv4GcBeoL900OIyD8hQH+BOY=
164+
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8/go.mod h1:Jstex+Vd1bLMOri3JGwKux2G++hIIH+6+/Gbrq+DhOQ=
165165
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
166166
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
167167
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
@@ -170,7 +170,7 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn
170170
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
171171
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
172172
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
173-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
174-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
173+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
174+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
175175
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
176176
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

0 commit comments

Comments
 (0)