Skip to content

Commit

Permalink
Merge pull request kubernetes#246 from andyxning/move_default_image_r…
Browse files Browse the repository at this point in the history
…egistry_to_quay

move default image registry to quay
  • Loading branch information
brancz authored Sep 7, 2017
2 parents d042af2 + 79a4624 commit 905c6c6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FLAGS =
COMMONENVVAR = GOOS=$(shell uname -s | tr A-Z a-z) GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))
BUILDENVVAR = CGO_ENABLED=0
TESTENVVAR =
REGISTRY = gcr.io/google_containers
REGISTRY = quay.io/coreos
TAG = $(shell git describe --abbrev=0)
PKGS = $(shell go list ./... | grep -v /vendor/)

Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ Currently, `client-go` is in version `v4.0.0-beta.0`.

## Container Image

The latest container image can be found at `gcr.io/google_containers/kube-state-metrics:v0.5.0`.
The latest container image can be found at:
* `quay.io/coreos/kube-state-metrics:v1.0.1`
* `gcr.io/google_containers/kube-state-metrics:v1.0.1`

**Note**:
The recommended docker registry for kube-state-metrics is `quay.io`. kube-state-metrics on
`gcr.io` is only maintained on best effort as it requires external help from Google employees.

## Metrics Documentation

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 @@ -13,7 +13,7 @@ spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
image: gcr.io/google_containers/kube-state-metrics:v1.0.1
image: quay.io/coreos/kube-state-metrics:v1.0.1
ports:
- name: http-metrics
containerPort: 8080
Expand Down

0 comments on commit 905c6c6

Please sign in to comment.