Merge pull request #121575 from apelisse/update-smd

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

Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df

go.mod

@@ -9,11 +9,11 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/stretchr/testify v1.8.4
 	google.golang.org/grpc v1.58.2
-	k8s.io/api v0.0.0-20231027172135-b5946e690808
-	k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2
-	k8s.io/client-go v0.0.0-20231027173027-30eba26adb82
+	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/klog/v2 v2.100.1
-	k8s.io/kubelet v0.0.0-20231031014202-31168adbb52c
+	k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
 
@@ -52,16 +52,16 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // 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
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20231027172135-b5946e690808
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231030212541-17d270f3cf34
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20231027173027-30eba26adb82
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20231027174419-7eefecff8918
+	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/cri-api => k8s.io/cri-api v0.0.0-20231027184618-f11c0b9770d2
-	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20231031014202-31168adbb52c
+	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193
 )

go.sum

@@ -145,23 +145,23 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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-20231027172135-b5946e690808 h1:PsNn101YgL4iLA6+r0S1SVxL7sE+lbEh5gHZs+Fig00=
-k8s.io/api v0.0.0-20231027172135-b5946e690808/go.mod h1:85jITVjKQiZ2494QUKUFq0g8dT584SMJydVlt8/fKwU=
-k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2 h1:IK+ucSMFzgZA5Obph+lJ5U64hB1SqywIJSojJg8eZZ8=
-k8s.io/apimachinery v0.0.0-20231027171410-92fa50ee03b2/go.mod h1:w0F2e93v67dkDnVXN80UeHkHMV8q0UIPd3JmttbIV2M=
-k8s.io/client-go v0.0.0-20231027173027-30eba26adb82 h1:VAIBmcvsYJjOy3wSkIhfRQ/LWnEP3DHSxkdgqUSaQ18=
-k8s.io/client-go v0.0.0-20231027173027-30eba26adb82/go.mod h1:tvNs9oJ+I4BmXdfQFadxavDpbC4ErR1mr3QrCKxvQXI=
+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/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/kubelet v0.0.0-20231031014202-31168adbb52c h1:c7HdQ/NLST7YgTrw4bUL9Z+QDYhG7XfR30H0HVttSag=
-k8s.io/kubelet v0.0.0-20231031014202-31168adbb52c/go.mod h1:FPiR4fUVxhYea8t3SKrbv0iGZWvqU+e4JPz9MVE5qL0=
+k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193 h1:zRKeMjWR2ptQLMRB+ApTkliRT3c4XZzJ+tTxj42K6mI=
+k8s.io/kubelet v0.0.0-20231101015138-90fec88d2193/go.mod h1:j61KCoZaF1FGNXg2uUCW4Sry80VqIA6IoepypNRd4y4=
 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=
 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=