Merge pull request #120329 from liggitt/automated-cherry-pick-of-#120…

…327-upstream-release-1.28

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

Kubernetes-commit: 797b3cf45ec77becceb7d6ae4deb6f6b293fdbf5

go.mod

@@ -13,12 +13,12 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.2
 	golang.org/x/net v0.13.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/code-generator 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/apiserver v0.0.0-20230904114607-bf038b7f385e
+	k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
+	k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
+	k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
@@ -105,19 +105,18 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kms v0.0.0 // indirect
+	k8s.io/kms v0.0.0-20230904112654-85054a342003 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/apiserver => ../apiserver
-	k8s.io/client-go => ../client-go
-	k8s.io/code-generator => ../code-generator
-	k8s.io/component-base => ../component-base
-	k8s.io/kms => ../kms
-	k8s.io/kube-aggregator => ../kube-aggregator
+	k8s.io/api => k8s.io/api v0.0.0-20230904104028-546e4253e738
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230904102823-bc548d1d2406
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230904114607-bf038b7f385e
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20230904110526-29a840dbdf2a
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20230904111932-ef6aa9891ad3
+	k8s.io/kms => k8s.io/kms v0.0.0-20230904112654-85054a342003
 )