Skip to content

Commit

Permalink
Merge pull request #123339 from skitt/canonical-json-patch
Browse files Browse the repository at this point in the history
Update kustomize, use canonical json-patch v4 import

Kubernetes-commit: da02fdb2aef1b7102526963c91df4992ee5b6a05
  • Loading branch information
k8s-publishing-bot committed May 29, 2024
1 parent 937cf5a commit 3f73ad3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 100 deletions.
23 changes: 6 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.4
google.golang.org/grpc v1.59.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/apiserver v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/cri-api v0.0.0
k8s.io/api v0.0.0-20240529203521-42619825cf01
k8s.io/apimachinery v0.0.0-20240529203233-63ab494c70e6
k8s.io/apiserver v0.0.0-20240529205642-259cd1817cb1
k8s.io/client-go v0.0.0-20240529203923-e8b54718d08b
k8s.io/component-base v0.0.0-20240529204824-47eccf3754e9
k8s.io/cri-api v0.0.0-20240529211729-363354bd9a0c
k8s.io/klog/v2 v2.120.1
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
)
Expand Down Expand Up @@ -57,14 +57,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/kms => ../kms
k8s.io/kubelet => ../kubelet
)
Loading

0 comments on commit 3f73ad3

Please sign in to comment.