Skip to content

Commit

Permalink
Merge pull request #19 from kubernetes/release-1.8
Browse files Browse the repository at this point in the history
Sync with upstream 1.8 release
  • Loading branch information
openshift-merge-robot committed Oct 9, 2019
2 parents 07b2974 + 6b7bb93 commit 83f9fc5
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 16 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,21 @@
## v1.8.0 / 2019-10-01

After a testing period of 7 days, there were no additional bugs found or features introduced.

## v1.8.0-rc.1 / 2019-09-24

* [CHANGE] Pin go version to go mod artifact file #882
* [BUGFIX] Correct mapping of hpa condition status labels #890

## v1.8.0-rc.0 / 2019-09-10

* [FEATURE] Introduce sharding (and experimental auto-sharding) #613
* [FEATURE] Add `kube_pod_status_unschedulable metric` #835
* [CHANGE] Makefile: Remove tmpdir after container build #867
* [ENHANCEMENT] Add metrics about kube-state-metric's interaction with the Kubernetes API. #866
* [FEATURE] Add `kube_node_role metric` #877
* [ENHANCEMENT] Add support for Darwin OS in e2e test #879

## v1.7.2 / 2019-08-05

* [CHANGE] Revert "add `kube_*_annotations metrics` for all objects" #859
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -61,11 +61,11 @@ At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kub

| kube-state-metrics | client-go | **Kubernetes 1.11** | **Kubernetes 1.12** | **Kubernetes 1.13** | **Kubernetes 1.14** | **Kubernetes 1.15** |
|--------------------|------------|---------------------|---------------------|---------------------|---------------------|----------------------|
| **v1.3.1** | v6.0.0 ||| - | - | - |
| **v1.4.0** | v8.0.0 ||| - | - | - |
| **v1.5.0** | v8.0.0 ||| - | - | - |
| **v1.6.0** | v11.0.0 ||||| - |
| **v1.7.2** | v12.0.0 ||||||
| **v1.8.0** | v12.0.0 ||||||
| **master** | v12.0.0 ||||||
- `` Fully supported version range.
- `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, etc).
Expand All @@ -78,8 +78,8 @@ release.
#### Container Image

The latest container image can be found at:
* `quay.io/coreos/kube-state-metrics:v1.7.2`
* `k8s.gcr.io/kube-state-metrics:v1.7.2`
* `quay.io/coreos/kube-state-metrics:v1.8.0`
* `k8s.gcr.io/kube-state-metrics:v1.8.0`

**Note**:
The recommended docker registry for kube-state-metrics is `quay.io`. kube-state-metrics on
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
1.7.2
1.8.0
2 changes: 1 addition & 1 deletion docs/horizontalpodautoscaler-metrics.md
Expand Up @@ -7,5 +7,5 @@
| kube_hpa_spec_min_replicas | Gauge | `hpa`=&lt;hpa-name&gt; <br> `namespace`=&lt;hpa-namespace&gt; | STABLE |
| kube_hpa_status_current_replicas | Gauge | `hpa`=&lt;hpa-name&gt; <br> `namespace`=&lt;hpa-namespace&gt; | STABLE |
| kube_hpa_status_desired_replicas | Gauge | `hpa`=&lt;hpa-name&gt; <br> `namespace`=&lt;hpa-namespace&gt; | STABLE |
| kube_hpa_status_condition | Gauge | `hpa`=&lt;hpa-name&gt; <br> `namespace`=&lt;hpa-namespace&gt; | STABLE |
| kube_hpa_status_condition | Gauge | `hpa`=&lt;hpa-name&gt; <br> `namespace`=&lt;hpa-namespace&gt; <br> `condition`=&lt;hpa-condition&gt; <br> `status`=&lt;true\|false\|unknown&gt; | STABLE |
| kube_hpa_labels | Gauge | `hpa`=&lt;hpa-name&gt; <br> `namespace`=&lt;hpa-namespace&gt; | STABLE |
2 changes: 1 addition & 1 deletion internal/store/hpa.go
Expand Up @@ -133,7 +133,7 @@ var (
for j, m := range metrics {
metric := m
metric.LabelKeys = []string{"condition", "status"}
metric.LabelValues = append(metric.LabelValues, string(c.Type))
metric.LabelValues = append([]string{string(c.Type)}, metric.LabelValues...)
ms[i*len(conditionStatuses)+j] = metric
}
}
Expand Down
16 changes: 8 additions & 8 deletions internal/store/hpa_test.go
Expand Up @@ -44,10 +44,10 @@ func TestHPAStore(t *testing.T) {
# TYPE kube_hpa_status_current_replicas gauge
# HELP kube_hpa_status_desired_replicas Desired number of replicas of pods managed by this autoscaler.
# TYPE kube_hpa_status_desired_replicas gauge
# HELP kube_hpa_status_condition The condition of this autoscaler.
# TYPE kube_hpa_status_condition gauge
# HELP kube_hpa_labels Kubernetes labels converted to Prometheus labels.
# TYPE kube_hpa_labels gauge
# HELP kube_hpa_status_condition The condition of this autoscaler.
# TYPE kube_hpa_status_condition gauge
# HELP kube_hpa_labels Kubernetes labels converted to Prometheus labels.
# TYPE kube_hpa_labels gauge
`
cases := []generateMetricsTestCase{
{
Expand Down Expand Up @@ -82,13 +82,13 @@ func TestHPAStore(t *testing.T) {
},
},
Want: metadata + `
kube_hpa_labels{hpa="hpa1",label_app="foobar",namespace="ns1"} 1
kube_hpa_labels{hpa="hpa1",label_app="foobar",namespace="ns1"} 1
kube_hpa_metadata_generation{hpa="hpa1",namespace="ns1"} 2
kube_hpa_spec_max_replicas{hpa="hpa1",namespace="ns1"} 4
kube_hpa_spec_min_replicas{hpa="hpa1",namespace="ns1"} 2
kube_hpa_status_condition{condition="false",hpa="hpa1",namespace="ns1",status="AbleToScale"} 0
kube_hpa_status_condition{condition="true",hpa="hpa1",namespace="ns1",status="AbleToScale"} 1
kube_hpa_status_condition{condition="unknown",hpa="hpa1",namespace="ns1",status="AbleToScale"} 0
kube_hpa_status_condition{condition="AbleToScale",hpa="hpa1",namespace="ns1",status="false"} 0
kube_hpa_status_condition{condition="AbleToScale",hpa="hpa1",namespace="ns1",status="true"} 1
kube_hpa_status_condition{condition="AbleToScale",hpa="hpa1",namespace="ns1",status="unknown"} 0
kube_hpa_status_current_replicas{hpa="hpa1",namespace="ns1"} 2
kube_hpa_status_desired_replicas{hpa="hpa1",namespace="ns1"} 2
`,
Expand Down
Expand Up @@ -19,7 +19,7 @@ spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
image: quay.io/coreos/kube-state-metrics:v1.7.1
image: quay.io/coreos/kube-state-metrics:v1.8.0
args:
- "--pod=$(POD_NAME)"
- "--pod-namespace=$(POD_NAMESPACE)"
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/kube-state-metrics-deployment.yaml
Expand Up @@ -18,7 +18,7 @@ spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
image: quay.io/coreos/kube-state-metrics:v1.7.2
image: quay.io/coreos/kube-state-metrics:v1.8.0
ports:
- name: http-metrics
containerPort: 8080
Expand Down

0 comments on commit 83f9fc5

Please sign in to comment.