Skip to content

Commit

Permalink
Merge pull request #120329 from liggitt/automated-cherry-pick-of-#120…
Browse files Browse the repository at this point in the history
…327-upstream-release-1.28

Automated cherry pick of #120327: Revert to json-patch 4.12.0

Kubernetes-commit: 797b3cf45ec77becceb7d6ae4deb6f6b293fdbf5
  • Loading branch information
k8s-publishing-bot committed Sep 4, 2023
1 parent efed843 commit bf038b7
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 163 deletions.
21 changes: 10 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ require (
google.golang.org/protobuf v1.30.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20230904104028-546e4253e738
k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406
k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
k8s.io/klog/v2 v2.100.1
k8s.io/kms v0.0.0
k8s.io/kms v0.0.0-20230904112654-85054a342003
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2
Expand Down Expand Up @@ -126,10 +126,9 @@ require (
)

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/kms => ../kms
k8s.io/api => k8s.io/api v0.0.0-20230904104028-546e4253e738
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406
k8s.io/client-go => k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
k8s.io/component-base => k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
k8s.io/kms => k8s.io/kms v0.0.0-20230904112654-85054a342003
)
Loading

0 comments on commit bf038b7

Please sign in to comment.