Merge pull request #121575 from apelisse/update-smd

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

Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df

Author: k8s-publishing-bot

go.mod

@@ -9,13 +9,13 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	k8s.io/api v0.0.0-20231031013930-a9aa0dc09108
-	k8s.io/apimachinery v0.0.0-20231031211055-850727f9e38c
-	k8s.io/apiserver v0.0.0-20231031212854-0f520bf96fed
-	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/controller-manager v0.0.0-20231031214954-d3c571a8eb15
+	k8s.io/api v0.0.0-20231101011356-6106c48f363d
+	k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
+	k8s.io/apiserver v0.0.0-20231101013206-c78de1fe6c83
+	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/controller-manager v0.0.0-20231101015429-49c08f0d2ba6
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
@@ -106,17 +106,17 @@ require (
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20231031013930-a9aa0dc09108
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231031211055-850727f9e38c
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231031212854-0f520bf96fed
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20231031051614-477cb782cf02
-	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/controller-manager => k8s.io/controller-manager v0.0.0-20231031214954-d3c571a8eb15
+	k8s.io/api => k8s.io/api v0.0.0-20231101011356-6106c48f363d
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231101013206-c78de1fe6c83
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20231101011735-7523a344f785
+	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/controller-manager => k8s.io/controller-manager v0.0.0-20231101015429-49c08f0d2ba6
 	k8s.io/kms => k8s.io/kms v0.0.0-20231031012129-523a5e8e70a1
 )

go.sum

@@ -312,20 +312,20 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-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-850727f9e38c h1:p1eyrSiR6d4nWobVvqdyXxk6Wm8bjhFXDTUcFYsAlL8=
-k8s.io/apimachinery v0.0.0-20231031211055-850727f9e38c/go.mod h1:w0F2e93v67dkDnVXN80UeHkHMV8q0UIPd3JmttbIV2M=
-k8s.io/apiserver v0.0.0-20231031212854-0f520bf96fed h1:cAE5+Zf79ldEc0yrAJyGz3fT2692R0uDyFbGQEOzxdc=
-k8s.io/apiserver v0.0.0-20231031212854-0f520bf96fed/go.mod h1:fbqxBuMKn/EXii9hNGgpjkC7g1QWDqw7dtB4qQua94U=
-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/controller-manager v0.0.0-20231031214954-d3c571a8eb15 h1:HtQ7rcoR2g2VC+VgR6kJshcb04HVJtvRs3chppm5/bs=
-k8s.io/controller-manager v0.0.0-20231031214954-d3c571a8eb15/go.mod h1:xI3KTWjE8ztQyuYfMyoM3OTTtBR+J4MYOSA9+TFfPA8=
+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/apiserver v0.0.0-20231101013206-c78de1fe6c83 h1:VaQ7JdULMayW3arN/QPgi3KUx1fCtVPdzqvwDn51iEE=
+k8s.io/apiserver v0.0.0-20231101013206-c78de1fe6c83/go.mod h1:BBWhD8D1qDg6gB+fwOlUo/SfUmVT63jvohLedVibPdE=
+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/controller-manager v0.0.0-20231101015429-49c08f0d2ba6 h1:v8rWhX7yVh4ckI6DKkuKOzTYMHGCu2X1se8qbX2f1kI=
+k8s.io/controller-manager v0.0.0-20231101015429-49c08f0d2ba6/go.mod h1:LaviMAw/SCOwgMnfLBYzi2X7Jj4m7D0r1KkOPfeHt50=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kms v0.0.0-20231031012129-523a5e8e70a1 h1:NjJWKqxAfC+bj/B0XSfbl7QSKHGgDturoUCMoRpDOwA=
@@ -338,7 +338,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-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=