From ce3b79c591497ba8966d47c67896e98abf2a432c Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 20 Aug 2020 17:05:24 -0400 Subject: [PATCH] Update json-patch to v4.9.0 tagged release Kubernetes-commit: 245064a3518c7a42fe830316da2fbfd2667db01d --- go.mod | 13 +++++++------ go.sum | 7 +------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index b338aa8..22d4aea 100644 --- a/go.mod +++ b/go.mod @@ -5,13 +5,14 @@ module k8s.io/kube-proxy go 1.15 require ( - k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20 - k8s.io/component-base v0.0.0-20200813012721-976a05f23b53 + k8s.io/apimachinery v0.0.0 + k8s.io/component-base v0.0.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20200813011650-4934d0c67eba - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20 - k8s.io/client-go => k8s.io/client-go v0.0.0-20200813012017-e7a1d9ada0d5 - k8s.io/component-base => k8s.io/component-base v0.0.0-20200813012721-976a05f23b53 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kube-proxy => ../kube-proxy ) diff --git a/go.sum b/go.sum index 5ca818b..57ebfe7 100644 --- a/go.sum +++ b/go.sum @@ -52,7 +52,7 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -115,7 +115,6 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -355,10 +354,6 @@ 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-20200813011650-4934d0c67eba/go.mod h1:QJ0oQNNZl/Xp5kUlzey804E6C+Vj1FnxAx5MuW0GkTI= -k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20/go.mod h1:1z+ESypfBDWAQXahXbqiOO581DaYTRgdaHAi60KXR1s= -k8s.io/client-go v0.0.0-20200813012017-e7a1d9ada0d5/go.mod h1:dIFJBSkp6Fh6Mv1+bRxSN7O/Ze489PT2VztfLmqUfXM= -k8s.io/component-base v0.0.0-20200813012721-976a05f23b53/go.mod h1:94CWKFudqgEEiA1H4waU0sHC0xhtMHQOHqAWC1Cz4a4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=