Skip to content

Commit 5b017f7

Browse files
authored
Merge pull request #1789 from mrueg/update-go
Update dependencies
2 parents 69cc196 + 03906e6 commit 5b017f7

File tree

6 files changed

+81
-64
lines changed

6 files changed

+81
-64
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
E2E_SETUP_KUBECTL: yes
1919
SUDO: sudo
2020
GO_VERSION: "^1.18"
21-
GOLANGCI_LINT_VERSION: "v1.46.2"
21+
GOLANGCI_LINT_VERSION: "v1.48.0"
2222

2323
jobs:
2424
ci-go-lint:

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.35.0
19-
GO_VERSION = 1.18.3
18+
PROMETHEUS_VERSION = 2.37.0
19+
GO_VERSION = 1.18.5
2020
IMAGE = $(REGISTRY)/kube-state-metrics
2121
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
2222
USER ?= $(shell id -u -n)

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ timeout: 1800s
33
options:
44
substitution_option: ALLOW_LOOSE
55
steps:
6-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'
6+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
77
entrypoint: make
88
env:
99
- TAG=$_PULL_BASE_REF

docs/cli-arguments.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
$ kube-state-metrics -h
2727
Usage of ./kube-state-metrics:
2828
--add_dir_header If true, adds the file directory to the header of the log messages
29-
--alsologtostderr log to standard error as well as files
29+
--alsologtostderr log to standard error as well as files (no effect when -logtostderr=true)
3030
--apiserver string The URL of the apiserver to use as a master
3131
--custom-resource-state-config string Inline Custom Resource State Metrics config YAML (experimental)
3232
--custom-resource-state-config-file string Path to a Custom Resource State Metrics config file (experimental)
@@ -35,9 +35,9 @@ Usage of ./kube-state-metrics:
3535
--host string Host to expose metrics on. (default "::")
3636
--kubeconfig string Absolute path to the kubeconfig file
3737
--log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0)
38-
--log_dir string If non-empty, write log files in this directory
39-
--log_file string If non-empty, use this log file
40-
--log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
38+
--log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true)
39+
--log_file string If non-empty, use this log file (no effect when -logtostderr=true)
40+
--log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
4141
--logtostderr log to standard error instead of files (default true)
4242
--metric-allowlist string Comma-separated list of metrics to be exposed. This list comprises of exact metric names and/or regex patterns. The allowlist and denylist are mutually exclusive.
4343
--metric-annotations-allowlist string Comma-separated list of Kubernetes annotations keys that will be used in the resource' labels metric. By default the metric contains only name and namespace labels. To include additional annotations provide a list of resource names in their plural form and Kubernetes annotation keys you would like to allow for them (Example: '=namespaces=[kubernetes.io/team,...],pods=[kubernetes.io/team],...)'. A single '*' can be provided per resource instead to allow any annotations, but that has severe performance implications (Example: '=pods=[*]').
@@ -46,15 +46,15 @@ Usage of ./kube-state-metrics:
4646
--metric-opt-in-list string Comma-separated list of metrics which are opt-in and not enabled by default. This is in addition to the metric allow- and denylists
4747
--namespaces string Comma-separated list of namespaces to be enabled. Defaults to ""
4848
--namespaces-denylist string Comma-separated list of namespaces not to be enabled. If namespaces and namespaces-denylist are both set, only namespaces that are excluded in namespaces-denylist will be used.
49-
--one_output If true, only write logs to their native severity level (vs also writing to each lower severity level)
49+
--one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true)
5050
--pod string Name of the pod that contains the kube-state-metrics container. When set, it is expected that --pod and --pod-namespace are both set. Most likely this should be passed via the downward API. This is used for auto-detecting sharding. If set, this has preference over statically configured sharding. This is experimental, it may be removed without notice.
5151
--pod-namespace string Name of the namespace of the pod specified by --pod. When set, it is expected that --pod and --pod-namespace are both set. Most likely this should be passed via the downward API. This is used for auto-detecting sharding. If set, this has preference over statically configured sharding. This is experimental, it may be removed without notice.
5252
--port int Port to expose metrics on. (default 8080)
5353
--resources string Comma-separated list of Resources to be enabled. Defaults to "certificatesigningrequests,clusterrolebindings,clusterroles,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,rolebindings,roles,secrets,serviceaccounts,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments"
5454
--shard int32 The instances shard nominal (zero indexed) within the total number of shards. (default 0)
5555
--skip_headers If true, avoid header prefixes in the log messages
56-
--skip_log_headers If true, avoid headers when opening log files
57-
--stderrthreshold severity logs at or above this threshold go to stderr (default 2)
56+
--skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true)
57+
--stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2)
5858
--telemetry-host string Host to expose kube-state-metrics self metrics on. (default "::")
5959
--telemetry-port int Port to expose kube-state-metrics self metrics on. (default 8081)
6060
--tls-config string Path to the TLS configuration file

go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ require (
77
github.com/gobuffalo/flect v0.2.5
88
github.com/google/go-cmp v0.5.8
99
github.com/google/go-jsonnet v0.18.0
10-
github.com/jsonnet-bundler/jsonnet-bundler v0.4.1-0.20200708074244-ada055a225fa
10+
github.com/jsonnet-bundler/jsonnet-bundler v0.5.1
1111
github.com/oklog/run v1.1.0
12-
github.com/prometheus/client_golang v1.12.2
12+
github.com/prometheus/client_golang v1.13.0
1313
github.com/prometheus/client_model v0.2.0
14-
github.com/prometheus/common v0.34.0
14+
github.com/prometheus/common v0.37.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
18-
github.com/stretchr/testify v1.7.1
19-
golang.org/x/perf v0.0.0-20220411212318-84e58bfe0a7e
18+
github.com/stretchr/testify v1.8.0
19+
golang.org/x/perf v0.0.0-20220722155240-3d85ee92886d
2020
gopkg.in/yaml.v3 v3.0.1
21-
k8s.io/api v0.24.1
22-
k8s.io/apimachinery v0.24.1
21+
k8s.io/api v0.24.4
22+
k8s.io/apimachinery v0.24.4
2323
k8s.io/autoscaler/vertical-pod-autoscaler v0.11.0
24-
k8s.io/client-go v0.24.1
25-
k8s.io/klog/v2 v2.60.1
26-
k8s.io/sample-controller v0.24.1
27-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
24+
k8s.io/client-go v0.24.4
25+
k8s.io/klog/v2 v2.70.1
26+
k8s.io/sample-controller v0.24.4
27+
k8s.io/utils v0.0.0-20220812165043-ad590609e2e5
2828
)
2929

3030
require (
@@ -38,13 +38,13 @@ require (
3838
github.com/PuerkitoBio/purell v1.1.1 // indirect
3939
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4040
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
41-
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
41+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
4242
github.com/beorn7/perks v1.0.1 // indirect
4343
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4444
github.com/davecgh/go-spew v1.1.1 // indirect
4545
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
4646
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
47-
github.com/fatih/color v1.10.0 // indirect
47+
github.com/fatih/color v1.13.0 // indirect
4848
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
4949
github.com/fsnotify/fsnotify v1.5.1 // indirect
5050
github.com/ghodss/yaml v1.0.0 // indirect
@@ -63,8 +63,8 @@ require (
6363
github.com/jpillora/backoff v1.0.0 // indirect
6464
github.com/json-iterator/go v1.1.12 // indirect
6565
github.com/mailru/easyjson v0.7.6 // indirect
66-
github.com/mattn/go-colorable v0.1.8 // indirect
67-
github.com/mattn/go-isatty v0.0.12 // indirect
66+
github.com/mattn/go-colorable v0.1.12 // indirect
67+
github.com/mattn/go-isatty v0.0.14 // indirect
6868
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
6969
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7070
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -74,16 +74,16 @@ require (
7474
github.com/onsi/gomega v1.17.0 // indirect
7575
github.com/pkg/errors v0.9.1 // indirect
7676
github.com/pmezard/go-difflib v1.0.0 // indirect
77-
github.com/prometheus/procfs v0.7.3 // indirect
77+
github.com/prometheus/procfs v0.8.0 // indirect
7878
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
7979
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
8080
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
81-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
81+
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
8282
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
8383
golang.org/x/text v0.3.7 // indirect
8484
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
8585
google.golang.org/appengine v1.6.7 // indirect
86-
google.golang.org/protobuf v1.28.0 // indirect
86+
google.golang.org/protobuf v1.28.1 // indirect
8787
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
8888
gopkg.in/inf.v0 v0.9.1 // indirect
8989
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)