Merge pull request #427 from tmjd/r1.2-tigera-quay

Switch back to quay
tigera · Feb 28, 2020 · 75264f1 · 75264f1
2 parents 6315ebb + cb77b07
commit 75264f1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/render/images.go b/pkg/render/images.go
@@ -24,7 +24,7 @@ import (
 // Default registries for Calico and Tigera.
 const (
 	CalicoRegistry = "docker.io/"
-	TigeraRegistry = "gcr.io/unique-caldron-775/cnx/"
+	TigeraRegistry = "quay.io/"
 	K8sGcrRegistry = "gcr.io/"
 	ECKRegistry    = "docker.elastic.co/"
 )

diff --git a/pkg/render/images_test.go b/pkg/render/images_test.go
@@ -25,7 +25,7 @@ var _ = Describe("No registry override", func() {
 		Expect(constructImage(NodeImageNameCalico, "", "")).To(Equal("docker.io/calico/node:" + components.VersionCalicoNode))
 	})
 	It("should render a tigera image correctly", func() {
-		Expect(constructImage(NodeImageNameTigera, "", "")).To(Equal("gcr.io/unique-caldron-775/cnx/tigera/cnx-node:" + components.VersionTigeraNode))
+		Expect(constructImage(NodeImageNameTigera, "", "")).To(Equal("quay.io/tigera/cnx-node:" + components.VersionTigeraNode))
 	})
 	It("should render an ECK image correctly", func() {
 		Expect(constructImage(ECKOperatorImageName, "", "")).To(Equal("docker.elastic.co/eck/eck-operator:" + components.VersionECKOperator))
@@ -49,7 +49,7 @@ var _ = Describe("imagepath override", func() {
 		Expect(constructImage(NodeImageNameCalico, "", "userpath")).To(Equal("docker.io/userpath/node:" + components.VersionCalicoNode))
 	})
 	It("should render a tigera image correctly", func() {
-		Expect(constructImage(NodeImageNameTigera, "", "userpath")).To(Equal("gcr.io/unique-caldron-775/cnx/userpath/cnx-node:" + components.VersionTigeraNode))
+		Expect(constructImage(NodeImageNameTigera, "", "userpath")).To(Equal("quay.io/userpath/cnx-node:" + components.VersionTigeraNode))
 	})
 	It("should render an ECK image correctly", func() {
 		Expect(constructImage(ECKOperatorImageName, "", "userpath")).To(Equal("docker.elastic.co/userpath/eck-operator:" + components.VersionECKOperator))

diff --git a/pkg/render/manager_test.go b/pkg/render/manager_test.go
@@ -88,9 +88,9 @@ var _ = Describe("Tigera Secure Manager rendering tests", func() {
 		}
 
 		deployment := resources[12].(*appsv1.Deployment)
-		Expect(deployment.Spec.Template.Spec.Containers[0].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/cnx-manager:" + components.VersionManager))
-		Expect(deployment.Spec.Template.Spec.Containers[1].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/es-proxy:" + components.VersionManagerEsProxy))
-		Expect(deployment.Spec.Template.Spec.Containers[2].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/voltron:" + components.VersionManagerProxy))
+		Expect(deployment.Spec.Template.Spec.Containers[0].Image).Should(Equal("quay.io/tigera/cnx-manager:" + components.VersionManager))
+		Expect(deployment.Spec.Template.Spec.Containers[1].Image).Should(Equal("quay.io/tigera/es-proxy:" + components.VersionManagerEsProxy))
+		Expect(deployment.Spec.Template.Spec.Containers[2].Image).Should(Equal("quay.io/tigera/voltron:" + components.VersionManagerProxy))
 	})
 
 	It("should ensure cnx policy recommendation support is always set to true", func() {