Skip to content

Commit 3ea4ec4

Browse files
Merge pull request #120329 from liggitt/automated-cherry-pick-of-#120327-upstream-release-1.28
Automated cherry pick of #120327: Revert to json-patch 4.12.0 Kubernetes-commit: 797b3cf45ec77becceb7d6ae4deb6f6b293fdbf5
1 parent 0ede49e commit 3ea4ec4

File tree

2 files changed

+28
-169
lines changed

2 files changed

+28
-169
lines changed

go.mod

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ require (
2424
google.golang.org/grpc v1.54.0
2525
google.golang.org/protobuf v1.30.0
2626
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.0.0
28-
k8s.io/apimachinery v0.0.0
29-
k8s.io/apiserver v0.0.0
30-
k8s.io/client-go v0.0.0
31-
k8s.io/code-generator v0.0.0
32-
k8s.io/component-base v0.0.0
27+
k8s.io/api v0.0.0-20230904104028-546e4253e738
28+
k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406
29+
k8s.io/apiserver v0.0.0-20230904114607-bf038b7f385e
30+
k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
31+
k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
32+
k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
3333
k8s.io/klog/v2 v2.100.1
3434
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
3535
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
@@ -122,17 +122,16 @@ require (
122122
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
123123
gopkg.in/yaml.v3 v3.0.1 // indirect
124124
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
125-
k8s.io/kms v0.0.0 // indirect
125+
k8s.io/kms v0.0.0-20230904112654-85054a342003 // indirect
126126
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
127127
)
128128

129129
replace (
130-
k8s.io/api => ../api
131-
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
132-
k8s.io/apimachinery => ../apimachinery
133-
k8s.io/apiserver => ../apiserver
134-
k8s.io/client-go => ../client-go
135-
k8s.io/code-generator => ../code-generator
136-
k8s.io/component-base => ../component-base
137-
k8s.io/kms => ../kms
130+
k8s.io/api => k8s.io/api v0.0.0-20230904104028-546e4253e738
131+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406
132+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230904114607-bf038b7f385e
133+
k8s.io/client-go => k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
134+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
135+
k8s.io/component-base => k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
136+
k8s.io/kms => k8s.io/kms v0.0.0-20230904112654-85054a342003
138137
)

0 commit comments

Comments
 (0)