From 23b33f5c852beb60eabd4d0cbb92f5ef00cf647a Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Wed, 27 Feb 2019 08:54:45 -0500
Subject: [PATCH] Switch to k8s.gcr.io (from staging)

Change-Id: Ib0d6f681be3537f0cbfcae1dc254f1c42a04be66
---
 cluster/images/conformance/Makefile             |  4 ++--
 cluster/images/conformance/README.md            | 14 +++++++-------
 cluster/images/conformance/conformance-e2e.yaml |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile
index 00307960210..0a7673adca7 100644
--- a/cluster/images/conformance/Makefile
+++ b/cluster/images/conformance/Makefile
@@ -15,9 +15,9 @@
 # Build the conformance image.
 #
 # Usage:
-#   [ARCH=amd64] [REGISTRY="staging-k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
+#   [ARCH=amd64] [REGISTRY="k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
 
-REGISTRY?=staging-k8s.gcr.io
+REGISTRY?=k8s.gcr.io
 ARCH?=amd64
 OUT_DIR?=_output
 
diff --git a/cluster/images/conformance/README.md b/cluster/images/conformance/README.md
index c32c84eb00e..b5df5e8c1db 100644
--- a/cluster/images/conformance/README.md
+++ b/cluster/images/conformance/README.md
@@ -10,23 +10,23 @@
 $ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl"
 
 # Build for linux/amd64 (default)
-# export REGISTRY=$HOST/$ORG to switch from staging-k8s.gcr.io
+# export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io
 
 $ make push VERSION={target_version} ARCH=amd64
-# ---> staging-k8s.gcr.io/conformance-amd64:VERSION
-# ---> staging-k8s.gcr.io/conformance:VERSION (image with backwards-compatible naming)
+# ---> k8s.gcr.io/conformance-amd64:VERSION
+# ---> k8s.gcr.io/conformance:VERSION (image with backwards-compatible naming)
 
 $ make push VERSION={target_version} ARCH=arm
-# ---> staging-k8s.gcr.io/conformance-arm:VERSION
+# ---> k8s.gcr.io/conformance-arm:VERSION
 
 $ make push VERSION={target_version} ARCH=arm64
-# ---> staging-k8s.gcr.io/conformance-arm64:VERSION
+# ---> k8s.gcr.io/conformance-arm64:VERSION
 
 $ make push VERSION={target_version} ARCH=ppc64le
-# ---> staging-k8s.gcr.io/conformance-ppc64le:VERSION
+# ---> k8s.gcr.io/conformance-ppc64le:VERSION
 
 $ make push VERSION={target_version} ARCH=s390x
-# ---> staging-k8s.gcr.io/conformance-s390x:VERSION
+# ---> k8s.gcr.io/conformance-s390x:VERSION
 ```
 
 If you don't want to push the images, run `make` or `make build` instead
diff --git a/cluster/images/conformance/conformance-e2e.yaml b/cluster/images/conformance/conformance-e2e.yaml
index 4070b71731c..b12c4858483 100644
--- a/cluster/images/conformance/conformance-e2e.yaml
+++ b/cluster/images/conformance/conformance-e2e.yaml
@@ -55,7 +55,7 @@ metadata:
 spec:
   containers:
   - name: conformance-container
-    image: staging-k8s.gcr.io/conformance-amd64:v1.14-alpha4
+    image: k8s.gcr.io/conformance-amd64:v1.14
     imagePullPolicy: IfNotPresent
     env:
     - name: E2E_FOCUS