Skip to content

Commit e59bc57

Browse files
authored
Merge pull request #1429 from mrueg/merge-release-2.0
Merge release 2.0 branch back to master
2 parents 658fd9b + de2bdeb commit e59bc57

21 files changed

Lines changed: 82 additions & 101 deletions

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## v2.0.0-rc.1 / 2021-03-26
2+
3+
* [CHANGE] Rename --labels-metric-allow-list to --metric-labels-allowlist #1424
4+
* [CHANGE] Remove deprecated Kubernetes APIs #1423
5+
* [CHANGE] go.mod: Update Dependencies #1419
6+
* [CHANGE] Remove vendor folder #1419
7+
* [CHANGE] `k8s.gcr.io/kube-state-metrics/kube-state-metrics` becomes the authoritative registry
8+
Location on quay.io will not be updated anymore. Previously pushed images will be kept around to avoid breaking existing deployments.
9+
110
## v2.0.0-rc.0 / 2021-03-04
211

312
* [CHANGE] internal/store/pod.go: Only create waiting_reason series if pods are in waiting state #1378

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kub
7070
|--------------------|---------------------|---------------------|----------------------|----------------------|-----------------------|
7171
| **v1.8.0** | - | - | - | - | - |
7272
| **v1.9.8** || - | - | - | - |
73-
| **v2.0.0-rc.0** | - | -/✓ | -/✓ |||
73+
| **v2.0.0-rc.1** | - | -/✓ | -/✓ |||
7474
| **master** | - | -/✓ | -/✓ |||
7575
- `` Fully supported version range.
7676
- `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, deprecated APIs, etc).
7777

78-
**Note:** The `v2.0.0-alpha.2+` and `master` releases of kube-state-metrics work on Kubernetes v1.17 and v1.18 excluding Ingress or CertificateSigningRequest resource metrics. If you require those metrics and are on an older Kubernetes version, use v2.0.0-alpha.1 or v1.9.7 kube-state-metrics release.
78+
**Note:** The `v2.0.0-alpha.2+` and `master` releases of kube-state-metrics work on Kubernetes v1.17 and v1.18 excluding Ingress or CertificateSigningRequest resource metrics. If you require those metrics and are on an older Kubernetes version, use v2.0.0-alpha.1 or v1.9.8 kube-state-metrics release.
7979

8080
#### Resource group version compatibility
8181

@@ -86,7 +86,7 @@ release.
8686
#### Container Image
8787

8888
The latest container image can be found at:
89-
* `k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-rc.0` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
89+
* `k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-rc.1` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
9090

9191
### Metrics Documentation
9292

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-rc.0
1+
2.0.0-rc.1

docs/cli-arguments.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,36 @@ spec:
2525
```txt
2626
$ kube-state-metrics -h
2727
Usage of ./kube-state-metrics:
28-
--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
30-
--apiserver string The URL of the apiserver to use as a master
31-
--enable-gzip-encoding Gzip responses when requested by clients via 'Accept-Encoding: gzip' header.
32-
-h, --help Print Help text
33-
--host string Host to expose metrics on. (default "::")
34-
--kubeconfig string Absolute path to the kubeconfig file
35-
--labels-metric-allow-list string Allows to pass a list of additional Kubernetes label keys that will be used in the resource' labels metric. By default the metric contains only name and namespace labels. To include additional labels provide a list of resource names in their plural form and Kubernetes label keys you would like to allow for them (Example: '=namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...)'
36-
--log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0)
37-
--log_dir string If non-empty, write log files in this directory
38-
--log_file string If non-empty, use this log file
39-
--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)
40-
--logtostderr log to standard error instead of files (default true)
41-
--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.
42-
--metric-denylist string Comma-separated list of metrics not to be enabled. This list comprises of exact metric names and/or regex patterns. The allowlist and denylist are mutually exclusive.
43-
--namespaces string Comma-separated list of namespaces to be enabled. Defaults to ""
44-
--one_output If true, only write logs to their native severity level (vs also writing to each lower severity level)
45-
--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.
46-
--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.
47-
--port int Port to expose metrics on. (default 8080)
48-
--resources string Comma-separated list of Resources to be enabled. Defaults to "certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments"
49-
--shard int32 The instances shard nominal (zero indexed) within the total number of shards. (default 0)
50-
--skip_headers If true, avoid header prefixes in the log messages
51-
--skip_log_headers If true, avoid headers when opening log files
52-
--stderrthreshold severity logs at or above this threshold go to stderr (default 2)
53-
--telemetry-host string Host to expose kube-state-metrics self metrics on. (default "::")
54-
--telemetry-port int Port to expose kube-state-metrics self metrics on. (default 8081)
55-
--tls-config string Path to the TLS configuration file
56-
--total-shards int The total number of shards. Sharding is disabled when total shards is set to 1. (default 1)
57-
-v, --v Level number for the log level verbosity
58-
--version kube-state-metrics build version information
59-
--vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging
28+
--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
30+
--apiserver string The URL of the apiserver to use as a master
31+
--enable-gzip-encoding Gzip responses when requested by clients via 'Accept-Encoding: gzip' header.
32+
-h, --help Print Help text
33+
--host string Host to expose metrics on. (default "::")
34+
--kubeconfig string Absolute path to the kubeconfig file
35+
--log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0)
36+
--log_dir string If non-empty, write log files in this directory
37+
--log_file string If non-empty, use this log file
38+
--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)
39+
--logtostderr log to standard error instead of files (default true)
40+
--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.
41+
--metric-denylist string Comma-separated list of metrics not to be enabled. This list comprises of exact metric names and/or regex patterns. The allowlist and denylist are mutually exclusive.
42+
--metric-labels-allowlist string Comma-separated list of additional Kubernetes label keys that will be used in the resource' labels metric. By default the metric contains only name and namespace labels. To include additional labels provide a list of resource names in their plural form and Kubernetes label keys you would like to allow for them (Example: '=namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...)'
43+
--namespaces string Comma-separated list of namespaces to be enabled. Defaults to ""
44+
--one_output If true, only write logs to their native severity level (vs also writing to each lower severity level)
45+
--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.
46+
--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.
47+
--port int Port to expose metrics on. (default 8080)
48+
--resources string Comma-separated list of Resources to be enabled. Defaults to "certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments"
49+
--shard int32 The instances shard nominal (zero indexed) within the total number of shards. (default 0)
50+
--skip_headers If true, avoid header prefixes in the log messages
51+
--skip_log_headers If true, avoid headers when opening log files
52+
--stderrthreshold severity logs at or above this threshold go to stderr (default 2)
53+
--telemetry-host string Host to expose kube-state-metrics self metrics on. (default "::")
54+
--telemetry-port int Port to expose kube-state-metrics self metrics on. (default 8081)
55+
--tls-config string Path to the TLS configuration file
56+
--total-shards int The total number of shards. Sharding is disabled when total shards is set to 1. (default 1)
57+
-v, --v Level number for the log level verbosity
58+
--version kube-state-metrics build version information
59+
--vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging
6060
```

examples/autosharding/cluster-role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: 2.0.0-rc.0
6+
app.kubernetes.io/version: 2.0.0-rc.1
77
name: kube-state-metrics
88
roleRef:
99
apiGroup: rbac.authorization.k8s.io

examples/autosharding/cluster-role.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterRole
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: 2.0.0-rc.0
6+
app.kubernetes.io/version: 2.0.0-rc.1
77
name: kube-state-metrics
88
rules:
99
- apiGroups:
@@ -24,15 +24,6 @@ rules:
2424
verbs:
2525
- list
2626
- watch
27-
- apiGroups:
28-
- extensions
29-
resources:
30-
- daemonsets
31-
- deployments
32-
- replicasets
33-
verbs:
34-
- list
35-
- watch
3627
- apiGroups:
3728
- apps
3829
resources:

examples/autosharding/role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: RoleBinding
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: 2.0.0-rc.0
6+
app.kubernetes.io/version: 2.0.0-rc.1
77
name: kube-state-metrics
88
namespace: kube-system
99
roleRef:

examples/autosharding/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Role
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: 2.0.0-rc.0
6+
app.kubernetes.io/version: 2.0.0-rc.1
77
name: kube-state-metrics
88
namespace: kube-system
99
rules:

examples/autosharding/service-account.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: ServiceAccount
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: 2.0.0-rc.0
6+
app.kubernetes.io/version: 2.0.0-rc.1
77
name: kube-state-metrics
88
namespace: kube-system

examples/autosharding/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Service
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: 2.0.0-rc.0
6+
app.kubernetes.io/version: 2.0.0-rc.1
77
name: kube-state-metrics
88
namespace: kube-system
99
spec:

0 commit comments

Comments
 (0)