Skip to content

Commit 07c8a22

Browse files
authored
Merge pull request #1743 from mrueg/bump-0522
Bump to go 1.18.2, k8s 1.24, kind 0.14.0, prometheus 2.35.0
2 parents ecf650f + 42cd98e commit 07c8a22

File tree

4 files changed

+73
-51
lines changed

4 files changed

+73
-51
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
1515
OS ?= $(shell uname -s | tr A-Z a-z)
1616
ALL_ARCH = amd64 arm arm64 ppc64le s390x
1717
PKG = github.com/prometheus/common
18-
PROMETHEUS_VERSION = 2.33.4
19-
GO_VERSION = 1.18.1
18+
PROMETHEUS_VERSION = 2.35.0
19+
GO_VERSION = 1.18.2
2020
IMAGE = $(REGISTRY)/kube-state-metrics
2121
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
2222
USER ?= $(shell id -u -n)

go.mod

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ require (
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.12.1
12+
github.com/prometheus/client_golang v1.12.2
1313
github.com/prometheus/client_model v0.2.0
1414
github.com/prometheus/common v0.34.0
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-20220411212318-84e58bfe0a7e
19-
k8s.io/api v0.23.6
20-
k8s.io/apimachinery v0.23.6
19+
k8s.io/api v0.24.1
20+
k8s.io/apimachinery v0.24.1
2121
k8s.io/autoscaler/vertical-pod-autoscaler v0.10.0
22-
k8s.io/client-go v0.23.6
22+
k8s.io/client-go v0.24.1
2323
k8s.io/klog/v2 v2.60.1
24-
k8s.io/sample-controller v0.23.6
24+
k8s.io/sample-controller v0.24.1
2525
)
2626

2727
require (
@@ -32,51 +32,60 @@ require (
3232
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
3333
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3434
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
35+
github.com/PuerkitoBio/purell v1.1.1 // indirect
36+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3537
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
3638
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
3739
github.com/beorn7/perks v1.0.1 // indirect
3840
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3941
github.com/davecgh/go-spew v1.1.1 // indirect
42+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
4043
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4144
github.com/fatih/color v1.10.0 // indirect
4245
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
4346
github.com/ghodss/yaml v1.0.0 // indirect
44-
github.com/go-kit/log v0.2.0 // indirect
47+
github.com/go-kit/log v0.2.1 // indirect
4548
github.com/go-logfmt/logfmt v0.5.1 // indirect
4649
github.com/go-logr/logr v1.2.0 // indirect
50+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
51+
github.com/go-openapi/jsonreference v0.19.5 // indirect
52+
github.com/go-openapi/swag v0.19.14 // indirect
4753
github.com/gogo/protobuf v1.3.2 // indirect
4854
github.com/golang/protobuf v1.5.2 // indirect
55+
github.com/google/gnostic v0.5.7-v3refs // indirect
4956
github.com/google/gofuzz v1.1.0 // indirect
50-
github.com/googleapis/gnostic v0.5.5 // indirect
5157
github.com/imdario/mergo v0.3.5 // indirect
58+
github.com/josharian/intern v1.0.0 // indirect
5259
github.com/jpillora/backoff v1.0.0 // indirect
5360
github.com/json-iterator/go v1.1.12 // indirect
61+
github.com/mailru/easyjson v0.7.6 // indirect
5462
github.com/mattn/go-colorable v0.1.8 // indirect
5563
github.com/mattn/go-isatty v0.0.12 // indirect
5664
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
5765
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5866
github.com/modern-go/reflect2 v1.0.2 // indirect
67+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5968
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
6069
github.com/pmezard/go-difflib v1.0.0 // indirect
6170
github.com/prometheus/procfs v0.7.3 // indirect
6271
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
6372
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
6473
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
65-
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
74+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
6675
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
6776
golang.org/x/text v0.3.7 // indirect
68-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
77+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
6978
google.golang.org/appengine v1.6.7 // indirect
7079
google.golang.org/protobuf v1.27.1 // indirect
7180
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
7281
gopkg.in/inf.v0 v0.9.1 // indirect
7382
gopkg.in/yaml.v2 v2.4.0 // indirect
74-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
75-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
83+
gopkg.in/yaml.v3 v3.0.0 // indirect
84+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
7685
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
77-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
86+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
7887
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
79-
sigs.k8s.io/yaml v1.2.0 // indirect
88+
sigs.k8s.io/yaml v1.3.0 // indirect
8089
)
8190

8291
go 1.17

0 commit comments

Comments
 (0)