Skip to content

Commit 60906c6

Browse files
authored
Merge pull request #1681 from mrueg/bump-go
Bump go to 1.17.6 and dependencies
2 parents 10dde21 + 4443f88 commit 60906c6

File tree

3 files changed

+62
-56
lines changed

3 files changed

+62
-56
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ OS ?= $(shell uname -s | tr A-Z a-z)
1616
ALL_ARCH = amd64 arm arm64 ppc64le s390x
1717
PKG = github.com/prometheus/common
1818
PROMETHEUS_VERSION = 2.31.1
19-
GO_VERSION = 1.17.4
19+
GO_VERSION = 1.17.6
2020
IMAGE = $(REGISTRY)/kube-state-metrics
2121
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
2222
USER ?= $(shell id -u -n)
@@ -151,6 +151,7 @@ install-tools:
151151

152152
install-promtool:
153153
@echo Installing promtool
154-
@wget -qO- "https://github.com/prometheus/prometheus/releases/download/v${PROMETHEUS_VERSION}/prometheus-${PROMETHEUS_VERSION}.${OS}-${ARCH}.tar.gz" | tar xvz --strip-components=1
154+
@wget -qO- "https://github.com/prometheus/prometheus/releases/download/v${PROMETHEUS_VERSION}/prometheus-${PROMETHEUS_VERSION}.${OS}-${ARCH}.tar.gz" |\
155+
tar xvz --strip-components=1 prometheus-${PROMETHEUS_VERSION}.${OS}-${ARCH}/promtool
155156

156157
.PHONY: all build build-local all-push all-container container container-* do-push-* sub-push-* push push-multi-arch test-unit test-rules test-benchmark-compare clean e2e validate-modules shellcheck licensecheck lint generate embedmd

go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ require (
44
github.com/brancz/gojsontoyaml v0.1.0
55
github.com/campoy/embedmd v1.0.0
66
github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0
7-
github.com/google/go-cmp v0.5.6
8-
github.com/google/go-jsonnet v0.17.0
7+
github.com/google/go-cmp v0.5.7
8+
github.com/google/go-jsonnet v0.18.0
99
github.com/jsonnet-bundler/jsonnet-bundler v0.4.1-0.20200708074244-ada055a225fa
1010
github.com/oklog/run v1.1.0
1111
github.com/pkg/errors v0.9.1
12-
github.com/prometheus/client_golang v1.11.0
12+
github.com/prometheus/client_golang v1.12.1
1313
github.com/prometheus/client_model v0.2.0
1414
github.com/prometheus/common v0.32.1
1515
github.com/prometheus/exporter-toolkit v0.7.1
1616
github.com/robfig/cron/v3 v3.0.1
1717
github.com/spf13/pflag v1.0.5
1818
golang.org/x/perf v0.0.0-20211012211434-03971e389cd3
19-
k8s.io/api v0.23.0
20-
k8s.io/apimachinery v0.23.0
21-
k8s.io/autoscaler/vertical-pod-autoscaler v0.9.2
22-
k8s.io/client-go v0.23.0
23-
k8s.io/klog/v2 v2.30.0
24-
k8s.io/sample-controller v0.23.0
19+
k8s.io/api v0.23.3
20+
k8s.io/apimachinery v0.23.3
21+
k8s.io/autoscaler/vertical-pod-autoscaler v0.10.0
22+
k8s.io/client-go v0.23.3
23+
k8s.io/klog/v2 v2.40.1
24+
k8s.io/sample-controller v0.23.3
2525
)
2626

2727
require (
@@ -35,10 +35,10 @@ require (
3535
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
3636
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
3737
github.com/beorn7/perks v1.0.1 // indirect
38-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
38+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3939
github.com/davecgh/go-spew v1.1.1 // indirect
4040
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
41-
github.com/fatih/color v1.9.0 // indirect
41+
github.com/fatih/color v1.10.0 // indirect
4242
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
4343
github.com/ghodss/yaml v1.0.0 // indirect
4444
github.com/go-kit/log v0.1.0 // indirect
@@ -51,18 +51,18 @@ require (
5151
github.com/imdario/mergo v0.3.5 // indirect
5252
github.com/jpillora/backoff v1.0.0 // indirect
5353
github.com/json-iterator/go v1.1.12 // indirect
54-
github.com/mattn/go-colorable v0.1.4 // indirect
55-
github.com/mattn/go-isatty v0.0.11 // indirect
54+
github.com/mattn/go-colorable v0.1.8 // indirect
55+
github.com/mattn/go-isatty v0.0.12 // indirect
5656
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
5757
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5858
github.com/modern-go/reflect2 v1.0.2 // indirect
5959
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
6060
github.com/pmezard/go-difflib v1.0.0 // indirect
61-
github.com/prometheus/procfs v0.6.0 // indirect
61+
github.com/prometheus/procfs v0.7.3 // indirect
6262
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
63-
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
63+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
6464
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
65-
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
65+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
6666
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
6767
golang.org/x/text v0.3.7 // indirect
6868
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
@@ -73,9 +73,9 @@ require (
7373
gopkg.in/yaml.v2 v2.4.0 // indirect
7474
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
7575
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
76-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
76+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
7777
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
78-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
78+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
7979
sigs.k8s.io/yaml v1.2.0 // indirect
8080
)
8181

0 commit comments

Comments
 (0)