Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move b.gcr.io/k8s_authenticated_test to gcr.io/k8s-authenticated-test #40335

Merged
merged 1 commit into from
Jan 25, 2017
Merged

Move b.gcr.io/k8s_authenticated_test to gcr.io/k8s-authenticated-test #40335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/e2e/rc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var _ = framework.KubeDescribe("ReplicationController", func() {
// requires private images
framework.SkipUnlessProviderIs("gce", "gke")

ServeImageOrFail(f, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:v1.4")
ServeImageOrFail(f, "private", "gcr.io/k8s-authenticated-test/serve_hostname:v1.4")
})

It("should surface a failure condition on a common issue like exceeded quota", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/replica_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("ReplicaSet", func() {
// requires private images
framework.SkipUnlessProviderIs("gce", "gke")

ReplicaSetServeImageOrFail(f, "private", "b.gcr.io/k8s_authenticated_test/serve_hostname:v1.4")
ReplicaSetServeImageOrFail(f, "private", "gcr.io/k8s-authenticated-test/serve_hostname:v1.4")
})

It("should surface a failure condition on a common issue like exceeded quota", func() {
Expand Down
7 changes: 3 additions & 4 deletions test/images/serve_hostname/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
# Cross-build the serve_hostname image
#
# Usage:
# [TAG=v1.5] [PREFIX=gcr.io/google_containers] [TEST_REGISTRY=b.gcr.io/k8s_authenticated_test] [ARCH=amd64] [BASEIMAGE=busybox] make all
# [TAG=v1.5] [PREFIX=gcr.io/google_containers] [TEST_REGISTRY=gcr.io/k8s-authenticated-test] [ARCH=amd64] [BASEIMAGE=busybox] make all

.PHONY: all push container clean

TAG ?= v1.5

REGISTRY ?= gcr.io/google_containers
TEST_REGISTRY ?= b.gcr.io/k8s_authenticated_test
REGISTRY ?= gcr.io/google-containers
TEST_REGISTRY ?= gcr.io/k8s-authenticated-test

# Architectures supported: amd64, arm, arm64, ppc64le and s390x
ARCH ?= amd64
Expand Down Expand Up @@ -100,4 +100,3 @@ push: .push-$(ARCH)

clean:
rm -rf $(BIN)