From a322fb98b88501f0192b8e1c5c8ab4a528ccf295 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 18 May 2020 12:37:08 +0800 Subject: [PATCH] bump github.com/prometheus/client_golang to v1.6.0 Kubernetes-commit: d8062e076e76bdea573bd19d4e2d0074d1f3fdac --- go.mod | 19 +++++++++++-------- go.sum | 8 -------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 4ca8cca2..fefbdaea 100644 --- a/go.mod +++ b/go.mod @@ -5,18 +5,21 @@ module k8s.io/sample-controller go 1.13 require ( - k8s.io/api v0.0.0-20200517042100-2490600588fc - k8s.io/apimachinery v0.0.0-20200517041843-561e5e9b265b - k8s.io/client-go v0.0.0-20200517042358-3d5c80942cce - k8s.io/code-generator v0.0.0-20200517041639-0881615ab9fd + 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.0.0 ) replace ( + github.com/golang/protobuf => github.com/golang/protobuf v1.3.3 + github.com/json-iterator/go => github.com/json-iterator/go v1.1.8 golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => k8s.io/api v0.0.0-20200517042100-2490600588fc - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200517041843-561e5e9b265b - k8s.io/client-go => k8s.io/client-go v0.0.0-20200517042358-3d5c80942cce - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200517041639-0881615ab9fd + 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 ccc1e046..49702f65 100644 --- a/go.sum +++ b/go.sum @@ -82,9 +82,6 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -117,7 +114,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -280,10 +276,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-20200517042100-2490600588fc/go.mod h1:ExbRZPEQpO7MaDVNLbKNxu/Wsc3/QfT1Tqfbbhn/M5U= -k8s.io/apimachinery v0.0.0-20200517041843-561e5e9b265b/go.mod h1:XraFtZJYPxtse0n3rSuYw+TjG4aVQFUO5cEG3MRfLTM= -k8s.io/client-go v0.0.0-20200517042358-3d5c80942cce/go.mod h1:sBPsoaDqSdNFq8lY4POs8ZDyBkagaRlaCNDoCe2IHzo= -k8s.io/code-generator v0.0.0-20200517041639-0881615ab9fd/go.mod h1:Ahd1YHWvcZhS215bH8Hd6qX0kZfgMniai8dx6BF+Rn4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=