Skip to content

Commit

Permalink
Merge pull request #345 from brancz/cut-1.2
Browse files Browse the repository at this point in the history
Cut 1.2
  • Loading branch information
andyxning authored Jan 15, 2018
2 parents 00bd666 + 70c8425 commit 5ccda14
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v1.2.0 / 2018-01-15

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

## v1.2.0-rc.0 / 2018-01-05

* [CHANGE] The CronJob collector now expects the version to be v1beta1.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ release.
#### Container Image

The latest container image can be found at:
* `quay.io/coreos/kube-state-metrics:v1.2.0-rc.0`
* `k8s.gcr.io/kube-state-metrics:v1.2.0-rc.0`
* `quay.io/coreos/kube-state-metrics:v1.2.0`
* `k8s.gcr.io/kube-state-metrics:v1.2.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 kubernetes/kube-state-metrics-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
image: quay.io/coreos/kube-state-metrics:v1.2.0-rc.0
image: quay.io/coreos/kube-state-metrics:v1.2.0
ports:
- name: http-metrics
containerPort: 8080
Expand Down

0 comments on commit 5ccda14

Please sign in to comment.