Skip to content

K
k3s
Commit 2e4939a6 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40335 from zmerlynn/b.gcr.io

Automatic merge from submit-queue Move b.gcr.io/k8s_authenticated_test to gcr.io/k8s-authenticated-test **What this PR does / why we need it**: Per https://cloud.google.com/container-registry/docs/support/deprecation-notices, b.gcr.io access will be deprecated soon. I've already mirrored the repo to the location specified in this PR.
parents e2c0bf3f 3b90066d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
test/e2e/rc.go
View file @ 2e4939a6
...@@ -44,7 +44,7 @@ var _ = framework.KubeDescribe("ReplicationController", func() { ...@@ -44,7 +44,7 @@ var _ = framework.KubeDescribe("ReplicationController", func() {
// requires private images // requires private images
framework.SkipUnlessProviderIs("gce", "gke") 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() { It("should surface a failure condition on a common issue like exceeded quota", func() {
......
test/e2e/replica_set.go
View file @ 2e4939a6
...@@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("ReplicaSet", func() { ...@@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("ReplicaSet", func() {
// requires private images // requires private images
framework.SkipUnlessProviderIs("gce", "gke") 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() { It("should surface a failure condition on a common issue like exceeded quota", func() {
......
test/images/serve_hostname/Makefile
View file @ 2e4939a6
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
# Cross-build the serve_hostname image # Cross-build the serve_hostname image
# #
# Usage: # 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 .PHONY: all push container clean
TAG ?= v1.5 TAG ?= v1.5
REGISTRY ?= gcr.io/google_containers REGISTRY ?= gcr.io/google-containers
TEST_REGISTRY ?= b.gcr.io/k8s_authenticated_test TEST_REGISTRY ?= gcr.io/k8s-authenticated-test
# Architectures supported: amd64, arm, arm64, ppc64le and s390x # Architectures supported: amd64, arm, arm64, ppc64le and s390x
ARCH ?= amd64 ARCH ?= amd64
...@@ -100,4 +100,3 @@ push: .push-$(ARCH) ...@@ -100,4 +100,3 @@ push: .push-$(ARCH)
clean: clean:
rm -rf $(BIN) rm -rf $(BIN)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment