From 402c1b44559e61428aabdc998c9296811f2e799a Mon Sep 17 00:00:00 2001 From: Zach Zhu <zzqshu@126.com> Date: Tue, 26 Oct 2021 11:20:45 +0800 Subject: [PATCH] upgrade github.com/evanphx/json-patch to v4.12.0 Fix partial negative indice support in json patch Kubernetes-commit: 20cc72344e653ab90c1a851816bb206b715fd231 --- go.mod | 17 +++++++++-------- go.sum | 12 ++---------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 4367bee0..efb025bd 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ module k8s.io/sample-controller go 1.16 require ( - k8s.io/api v0.0.0-20211022203536-7d47955f01bd - k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300 - k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f - k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6 + 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/klog/v2 v2.30.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20211022203536-7d47955f01bd - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300 - k8s.io/client-go => k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6 + 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 ) diff --git a/go.sum b/go.sum index 4bae707c..2ac0ba5f 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= -github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -606,14 +606,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20211022203536-7d47955f01bd h1:t2LT7M8JRuofDih9ziRvu/Vyla8Ej3yjSrxJ9FgB3Pc= -k8s.io/api v0.0.0-20211022203536-7d47955f01bd/go.mod h1:eJg/6b+/Rz9bOKmx0Edyb0/GSov2ZHPYDXoxbqMJgKg= -k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300 h1:SaXMD0Olvi/V70/K8OKFF4e/+b21wKuSolzf5Uk2Lak= -k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300/go.mod h1:Us141aTxAE+ha/FV0yDwUGmNqwDlF6EpCGN/6w1eLZk= -k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f h1:iNLSkW213TvDoHY+523SpD5SLktbXnr5ZuJ7Xfm2G9c= -k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f/go.mod h1:J/CKd1tfft/vlmtgr40pGEK4bXNV0EZOQtV3cXS09IA= -k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6 h1:DewxcU1y1Kryma574sjAC8LfEzsDA2+BlE4/pazr+TI= -k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6/go.mod h1:alK4pz5+y/zKXOPBnND3TvXOC/iF2oYTBDynHO1+qlI= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=