Merge pull request #121575 from apelisse/update-smd

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

Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df
This commit is contained in:
Kubernetes Publisher
2023-11-01 01:51:17 +01:00
parent 9d2bb0a8e8
commit 1b62458621
2 changed files with 16 additions and 24 deletions
+8 -9
View File
@@ -6,10 +6,10 @@ go 1.21.3
require (
golang.org/x/time v0.3.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
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/code-generator v0.0.0-20231101010903-a0b3d34de476
k8s.io/klog/v2 v2.100.1
)
@@ -58,9 +58,8 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20231101011356-6106c48f363d
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
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
)