Merge pull request #121575 from apelisse/update-smd

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

Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df

go.mod

@@ -20,11 +20,11 @@ require (
 	golang.org/x/oauth2 v0.10.0
 	google.golang.org/api v0.126.0
 	gopkg.in/gcfg.v1 v1.2.3
-	k8s.io/api v0.0.0-20231031013930-a9aa0dc09108
-	k8s.io/apimachinery v0.0.0-20231031211055-850727f9e38c
-	k8s.io/client-go v0.0.0-20231031051614-477cb782cf02
-	k8s.io/cloud-provider v0.0.0-20231031215119-93613c6adf75
-	k8s.io/component-base v0.0.0-20231027174419-7eefecff8918
+	k8s.io/api v0.0.0-20231101011356-6106c48f363d
+	k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
+	k8s.io/client-go v0.0.0-20231101011735-7523a344f785
+	k8s.io/cloud-provider v0.0.0-20231101015605-ceea62f3e7b9
+	k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/yaml v1.3.0
@@ -88,20 +88,20 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/component-helpers v0.0.0-20231028091944-d8245642b471 // indirect
+	k8s.io/component-helpers v0.0.0-20231101012613-d6e059a1d44d // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // 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
 )
 
 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/cloud-provider => k8s.io/cloud-provider v0.0.0-20231031215119-93613c6adf75
-	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/cloud-provider => k8s.io/cloud-provider v0.0.0-20231101015605-ceea62f3e7b9
+	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

@@ -737,18 +737,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-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/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/cloud-provider v0.0.0-20231031215119-93613c6adf75 h1:OwAiOGtUrkYaw9p6i491iLghfnTwfbvZek3gq/bDBiU=
-k8s.io/cloud-provider v0.0.0-20231031215119-93613c6adf75/go.mod h1:c7PxCOhXtLjuZ/uS1D38dMf98ZkN88nH0Ar9OJ4gx9M=
-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/client-go v0.0.0-20231101011735-7523a344f785 h1:RCG2X8THR9tj0NKW3r7e6WuC4O9PZTw0RVKBntWjVUw=
+k8s.io/client-go v0.0.0-20231101011735-7523a344f785/go.mod h1:cTK5cDp0KQpzCXVivM3YixBMwcJdet4JFzdnwWQfgKk=
+k8s.io/cloud-provider v0.0.0-20231101015605-ceea62f3e7b9 h1:BpjfADKvy/T7eLsTwAFHrIfQy5mHbb+YakB5tOeFgQc=
+k8s.io/cloud-provider v0.0.0-20231101015605-ceea62f3e7b9/go.mod h1:LTN6WmsI+eaHIIxWCavkURpgmZR9oiMyaVF1Mp+Sgqs=
+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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
@@ -761,7 +761,7 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 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=