Merge pull request #121575 from apelisse/update-smd

Update sigs.k8s.io/structured-merge-diff to v4.4.0

Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df

go.mod

@@ -30,20 +30,20 @@ require (
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/sys v0.13.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0-20231031013930-a9aa0dc09108
-	k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5
-	k8s.io/cli-runtime v0.0.0-20231027183539-7a70979f0b71
-	k8s.io/client-go v0.0.0-20231031051614-477cb782cf02
-	k8s.io/component-base v0.0.0-20231027174419-7eefecff8918
-	k8s.io/component-helpers v0.0.0-20231028091944-d8245642b471
+	k8s.io/api v0.0.0-20231101011356-6106c48f363d
+	k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
+	k8s.io/cli-runtime v0.0.0-20231101014603-a832cfbf22f6
+	k8s.io/client-go v0.0.0-20231101011735-7523a344f785
+	k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115
+	k8s.io/component-helpers v0.0.0-20231101012613-d6e059a1d44d
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
-	k8s.io/metrics v0.0.0-20231027183144-3003ccda3466
+	k8s.io/metrics v0.0.0-20231101014430-8bff7e5c4349
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
 	sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3
 	sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -96,12 +96,12 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20231031013930-a9aa0dc09108
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20231027183539-7a70979f0b71
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20231031051614-477cb782cf02
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231027170846-b1e283ffb4d8
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20231027174419-7eefecff8918
-	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20231028091944-d8245642b471
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20231027183144-3003ccda3466
+	k8s.io/api => k8s.io/api v0.0.0-20231101011356-6106c48f363d
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20231101014603-a832cfbf22f6
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20231101011735-7523a344f785
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231101010903-a0b3d34de476
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115
+	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20231101012613-d6e059a1d44d
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20231101014430-8bff7e5c4349
 )

go.sum

@@ -283,24 +283,24 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20231031013930-a9aa0dc09108 h1:RLNKzPwSr5qvAJElxookVqfE3NHl5/MYmRGqodr2268=
-k8s.io/api v0.0.0-20231031013930-a9aa0dc09108/go.mod h1:85jITVjKQiZ2494QUKUFq0g8dT584SMJydVlt8/fKwU=
-k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5 h1:EiPDmPd4kR0WxYWUVNBrfSTW6Bz9gbLIEBBN44c59zo=
-k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5/go.mod h1:w0F2e93v67dkDnVXN80UeHkHMV8q0UIPd3JmttbIV2M=
-k8s.io/cli-runtime v0.0.0-20231027183539-7a70979f0b71 h1:hKvdHCOsRRdKeocXnQHM7kyLqGRsWx4V4lrHyWC6RBg=
-k8s.io/cli-runtime v0.0.0-20231027183539-7a70979f0b71/go.mod h1:/xZKmDjbJy7cxtLdql+0AAWcYigEmvue3hOKtbV3lR4=
-k8s.io/client-go v0.0.0-20231031051614-477cb782cf02 h1:QZfMCRiabDlfm6Ny7G9u6ZLpP9lJlaXxF7HL4/LC9d8=
-k8s.io/client-go v0.0.0-20231031051614-477cb782cf02/go.mod h1:9IdUKOSyLL+70YH1Xrr2H9ACZxmEHhfSayjfsEeb2M4=
-k8s.io/component-base v0.0.0-20231027174419-7eefecff8918 h1:REROa5iZinlgOCnq1UxCSpcjE3sy2wqQ2WKcrKw/tBM=
-k8s.io/component-base v0.0.0-20231027174419-7eefecff8918/go.mod h1:pWKBYrw3h6RE9E/iVyrVjoUpYforObgVsPP7aCVGeic=
-k8s.io/component-helpers v0.0.0-20231028091944-d8245642b471 h1:7+51u6EifBYbQf+8EbqS+kNytBqigWtETaeTu8LYkoU=
-k8s.io/component-helpers v0.0.0-20231028091944-d8245642b471/go.mod h1:MJolwXYGubLLcOv1xZKTY8a/LwADWE++E/NkiA6c+yU=
+k8s.io/api v0.0.0-20231101011356-6106c48f363d h1:UGmDzNqOmVt+OcwK8zqQY+Rt7jex0EqP8teb11hhVNo=
+k8s.io/api v0.0.0-20231101011356-6106c48f363d/go.mod h1:lBfRF4cZnQAE1dC8eo5d+GYNg4AVK8XhcdF7OeZP3vw=
+k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8 h1:ZmtmO/iO+jAzN4d6CitAv4GcBeoL900OIyD8hQH+BOY=
+k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8/go.mod h1:Jstex+Vd1bLMOri3JGwKux2G++hIIH+6+/Gbrq+DhOQ=
+k8s.io/cli-runtime v0.0.0-20231101014603-a832cfbf22f6 h1:TW8JEOuz4BRPDMrE7jq0KQj+fdtFOGs639JuRvKU8cA=
+k8s.io/cli-runtime v0.0.0-20231101014603-a832cfbf22f6/go.mod h1:ZMSud1gJWvbEtQWvf51G4pPRh2bWIF8AMgpVw2pKfNQ=
+k8s.io/client-go v0.0.0-20231101011735-7523a344f785 h1:RCG2X8THR9tj0NKW3r7e6WuC4O9PZTw0RVKBntWjVUw=
+k8s.io/client-go v0.0.0-20231101011735-7523a344f785/go.mod h1:cTK5cDp0KQpzCXVivM3YixBMwcJdet4JFzdnwWQfgKk=
+k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115 h1:hSeGKNDD82ZZX9xSla8OH02UzwNXDLfxIaYtTFbAmNg=
+k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115/go.mod h1:NSugshDiYqn5/1FWEweKICkcNSIwfNS+4n4nVM1kBk8=
+k8s.io/component-helpers v0.0.0-20231101012613-d6e059a1d44d h1:AuN2dg4wNd9l7j4Iayzx6ZlxIJ6I1nsdOndK+uYLSmc=
+k8s.io/component-helpers v0.0.0-20231101012613-d6e059a1d44d/go.mod h1:MC606tiy+SOD6UvCRExO/jjvIZR0BI9FVp4TehMrK6Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
-k8s.io/metrics v0.0.0-20231027183144-3003ccda3466 h1:JNzQk5L3HUKDIVoC3Abkx4Gu55NJGZMBE6inkOewmMc=
-k8s.io/metrics v0.0.0-20231027183144-3003ccda3466/go.mod h1:WbAkpbVU7f21QHQlQ8TaUfKiNOlza1/dCZvbMq2U5Z8=
+k8s.io/metrics v0.0.0-20231101014430-8bff7e5c4349 h1:TjzODb/9Dy6HmjqqkKvLpF0qts8/C+tn6In9qzpC0gY=
+k8s.io/metrics v0.0.0-20231101014430-8bff7e5c4349/go.mod h1:FJBvy5dreXH5m+hXD5KZTvtLaTu/HsH03gP6M07fk3I=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
@@ -311,7 +311,7 @@ sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3 h1:vq2Tt
 sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3/go.mod h1:/d88dHCvoy7d0AKFT0yytezSGZKjsZBVs9YTkBHSGFk=
 sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U=
 sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag=
-sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
-sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=