Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-2.0] Update go to 1.16, update dependencies. #1418

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOVERSION=1.15
ARG GOVERSION=1.16
FROM golang:${GOVERSION} as builder
ARG GOARCH
ENV GOARCH=${GOARCH}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ BUILD_DATE = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
ALL_ARCH = amd64 arm arm64 ppc64le s390x
PKG = k8s.io/kube-state-metrics/v2/pkg
GO_VERSION = 1.15.3
GO_VERSION = 1.16.2
IMAGE = $(REGISTRY)/kube-state-metrics
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)

Expand Down
44 changes: 28 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,35 +1,47 @@
module k8s.io/kube-state-metrics/v2

require (
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/brancz/gojsontoyaml v0.0.0-20190425155809-e8bd32d46b3d
cloud.google.com/go v0.74.0 // indirect
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
github.com/brancz/gojsontoyaml v0.0.0-20201216083616-202f76bf8c1f
github.com/campoy/embedmd v1.0.0
github.com/dgryski/go-jump v0.0.0-20170409065014-e1f439676b57
github.com/fatih/color v1.9.0 // indirect
github.com/google/go-jsonnet v0.14.0
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-jsonnet v0.17.0
github.com/jsonnet-bundler/jsonnet-bundler v0.4.1-0.20200708074244-ada055a225fa
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/oklog/run v1.1.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_golang v1.10.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.10.0
github.com/prometheus/common v0.19.0
github.com/prometheus/prometheus v2.5.0+incompatible
github.com/robfig/cron/v3 v3.0.0
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/pflag v1.0.5
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/autoscaler/vertical-pod-autoscaler v0.0.0-20200727194258-b7922d74509c
k8s.io/client-go v0.20.0
k8s.io/klog/v2 v2.4.0
github.com/stretchr/testify v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 // indirect
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd // indirect
golang.org/x/text v0.3.5 // indirect
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
golang.org/x/tools v0.1.0
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/api v0.20.4
k8s.io/apimachinery v0.20.4
k8s.io/autoscaler/vertical-pod-autoscaler v0.9.2
k8s.io/client-go v0.20.4
k8s.io/klog/v2 v2.8.0
)

replace (
k8s.io/api v0.18.3 => k8s.io/api v0.20.0
k8s.io/apimachinery v0.18.3 => k8s.io/apimachinery v0.18.3
k8s.io/client-go v0.18.3 => k8s.io/client-go v0.20.0
k8s.io/api v0.18.3 => k8s.io/api v0.20.4
k8s.io/apimachinery v0.18.3 => k8s.io/apimachinery v0.20.4
mrueg marked this conversation as resolved.
Show resolved Hide resolved
k8s.io/client-go v0.18.3 => k8s.io/client-go v0.20.4
)

go 1.16
440 changes: 387 additions & 53 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/github.com/brancz/gojsontoyaml/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions vendor/github.com/brancz/gojsontoyaml/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions vendor/github.com/brancz/gojsontoyaml/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/go-logr/logr/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 51 additions & 0 deletions vendor/github.com/go-logr/logr/discard.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

146 changes: 117 additions & 29 deletions vendor/github.com/go-logr/logr/logr.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/google/go-cmp/cmp/compare.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading