From 6871e8f43aae732a236bde58615dedbc282e01e3 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 20 Aug 2020 19:17:39 -0700 Subject: [PATCH] Merge pull request #94147 from liggitt/json-patch Update json-patch to v4.9.0 tagged release Kubernetes-commit: ce3dd04c49067d0f7cb713d0b866b5b7eea04a18 --- Godeps/Godeps.json | 18 +++++++----------- go.mod | 27 +++++++++++++-------------- go.sum | 7 +++++++ 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 2e51c25a3..012d20066 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -208,7 +208,7 @@ }, { "ImportPath": "github.com/evanphx/json-patch", - "Rev": "162e5629780b" + "Rev": "v4.9.0" }, { "ImportPath": "github.com/exponent-io/jsonpath", @@ -374,10 +374,6 @@ "ImportPath": "github.com/inconshreveable/mousetrap", "Rev": "v1.0.0" }, - { - "ImportPath": "github.com/jessevdk/go-flags", - "Rev": "v1.4.0" - }, { "ImportPath": "github.com/jonboulle/clockwork", "Rev": "v0.1.0" @@ -760,19 +756,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "4934d0c67eba" + "Rev": "051d027c14e1" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "2c6e837afb20" + "Rev": "9254095ca5ca" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "6753542ca25a" + "Rev": "dc6972a70c4c" }, { "ImportPath": "k8s.io/client-go", - "Rev": "e7a1d9ada0d5" + "Rev": "20923fd71b14" }, { "ImportPath": "k8s.io/code-generator", @@ -780,7 +776,7 @@ }, { "ImportPath": "k8s.io/component-base", - "Rev": "976a05f23b53" + "Rev": "1cf1c2dded48" }, { "ImportPath": "k8s.io/gengo", @@ -796,7 +792,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "2abcf21ede90" + "Rev": "c6db502286a9" }, { "ImportPath": "k8s.io/utils", diff --git a/go.mod b/go.mod index 4757b8cbf..25d51ed0a 100644 --- a/go.mod +++ b/go.mod @@ -34,14 +34,14 @@ require ( github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/api v0.0.0-20200821051526-051d027c14e1 + k8s.io/apimachinery v0.0.0-20200821051348-9254095ca5ca + k8s.io/cli-runtime v0.0.0-20200821053522-dc6972a70c4c + k8s.io/client-go v0.0.0-20200821051752-20923fd71b14 + k8s.io/component-base v0.0.0-20200821052257-1cf1c2dded48 k8s.io/klog/v2 v2.2.0 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20200821053413-c6db502286a9 k8s.io/utils v0.0.0-20200729134348-d5654de09c73 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 @@ -49,12 +49,11 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20200821051526-051d027c14e1 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200821051348-9254095ca5ca + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200821053522-dc6972a70c4c + k8s.io/client-go => k8s.io/client-go v0.0.0-20200821051752-20923fd71b14 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200813011144-5a311e69ffcf + k8s.io/component-base => k8s.io/component-base v0.0.0-20200821052257-1cf1c2dded48 + k8s.io/metrics => k8s.io/metrics v0.0.0-20200821053413-c6db502286a9 ) diff --git a/go.sum b/go.sum index a3a6a6854..5e2eddea8 100644 --- a/go.sum +++ b/go.sum @@ -508,6 +508,12 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +k8s.io/api v0.0.0-20200821051526-051d027c14e1/go.mod h1:6DKPkNII5GHfkmzU2WRXuDEJXvErpzTgkC/GRlsMFOQ= +k8s.io/apimachinery v0.0.0-20200821051348-9254095ca5ca/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/cli-runtime v0.0.0-20200821053522-dc6972a70c4c/go.mod h1:cNEkDjgMj+hIxCf8rG/RcXGZlbvmJ8g9b/wzXkAKj2g= +k8s.io/client-go v0.0.0-20200821051752-20923fd71b14/go.mod h1:kz7fk90GxOSGwCdAI1SPTNzsmAPPgh3Gr06lIP6G9mo= +k8s.io/code-generator v0.0.0-20200813011144-5a311e69ffcf/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= +k8s.io/component-base v0.0.0-20200821052257-1cf1c2dded48/go.mod h1:1gG5qkov95cjSJQkbTCGYvuR7DSA+qOT2xW+oQp5MUQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -515,6 +521,7 @@ k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= +k8s.io/metrics v0.0.0-20200821053413-c6db502286a9/go.mod h1:bYjjMM6d/2RUDI90cEz9WY84HzddYiSlWSkkAow19mE= k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=