Update component versions for Enterprise v3.1.0 (#664)

Calico: v3.15.0 Enterprise: v3.1.0
tigera · Jun 26, 2020 · 41bc44a · 41bc44a
1 parent a38b263
commit 41bc44a
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 53 deletions.
diff --git a/config/calico_versions.yml b/config/calico_versions.yml
@@ -1,11 +1,11 @@
 components:
   typha:
-    version: release-v3.15
+    version: v3.15.0
   calico/node:
-    version: release-v3.15
+    version: v3.15.0
   calico/cni:
-    version: release-v3.15
+    version: v3.15.0
   calico/kube-controllers:
-    version: release-v3.15
+    version: v3.15.0
   flexvol:
-    version: release-v3.15
+    version: v3.15.0
diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml
@@ -1,36 +1,36 @@
 components:
   cnx-manager:
     image: tigera/cnx-manager
-    version: release-calient-v3.1
+    version: v3.1.0
   voltron:
     image: tigera/voltron
-    version: release-calient-v3.1
+    version: v3.1.0
   cnx-apiserver:
     image: tigera/cnx-apiserver
-    version: release-calient-v3.1
+    version: v3.1.0
   cnx-queryserver:
     image: tigera/cnx-queryserver
-    version: release-calient-v3.1
+    version: v3.1.0
   cnx-kube-controllers:
     image: tigera/kube-controllers
-    version: release-calient-v3.1
+    version: v3.1.0
   typha:
     image: tigera/typha
-    version: release-calient-v3.1
+    version: v3.1.0
   cnx-node:
     image: tigera/cnx-node
-    version: release-calient-v3.1
+    version: v3.1.0
   fluentd:
     image: tigera/fluentd
-    version: release-calient-v3.1
+    version: v3.1.0
   es-proxy:
     image: tigera/es-proxy
-    version: release-calient-v3.1
+    version: v3.1.0
   eck-kibana:
     version: 7.6.2
   kibana:
     image: tigera/kibana
-    version: release-calient-v3.1
+    version: v3.1.0
   elasticsearch-operator:
     registry: docker.elastic.co
     image: eck/eck-operator
@@ -41,36 +41,36 @@ components:
     version: 7.6.2
   elastic-tsee-installer:
     image: tigera/intrusion-detection-job-installer
-    version: release-calient-v3.1
+    version: v3.1.0
   es-curator:
     image: tigera/es-curator
-    version: release-calient-v3.1
+    version: v3.1.0
   intrusion-detection-controller:
     image: tigera/intrusion-detection-controller
-    version: release-calient-v3.1
+    version: v3.1.0
   compliance-controller:
     image: tigera/compliance-controller
-    version: release-calient-v3.1
+    version: v3.1.0
   compliance-reporter:
     image: tigera/compliance-reporter
-    version: release-calient-v3.1
+    version: v3.1.0
   compliance-snapshotter:
     image: tigera/compliance-snapshotter
-    version: release-calient-v3.1
+    version: v3.1.0
   compliance-server:
     image: tigera/compliance-server
-    version: release-calient-v3.1
+    version: v3.1.0
   compliance-benchmarker:
     image: tigera/compliance-benchmarker
-    version: release-calient-v3.1
+    version: v3.1.0
   # Below components are all maintained by 3rd parties and thus specify a 'registry' to indicate
   # to the docs & manifest tooling not to default to the tigera registry.
   guardian:
     image: tigera/guardian
-    version: release-calient-v3.1
+    version: v3.1.0
   tigera-cni:
     image: tigera/cni
-    version: release-calient-v3.1
+    version: v3.1.0
   cloud-controllers:
     image: tigera/cloud-controllers
-    version: release-calient-v3.1
+    version: v3.1.0
diff --git a/pkg/components/calico.go b/pkg/components/calico.go
@@ -18,27 +18,27 @@ import "github.com/tigera/operator/version"
 
 var (
 	ComponentCalicoCNI = component{
-		Version: "release-v3.15",
+		Version: "v3.15.0",
 		Image:   "calico/cni",
 	}
 
 	ComponentCalicoKubeControllers = component{
-		Version: "release-v3.15",
+		Version: "v3.15.0",
 		Image:   "calico/kube-controllers",
 	}
 
 	ComponentCalicoNode = component{
-		Version: "release-v3.15",
+		Version: "v3.15.0",
 		Image:   "calico/node",
 	}
 
 	ComponentCalicoTypha = component{
-		Version: "release-v3.15",
+		Version: "v3.15.0",
 		Image:   "calico/typha",
 	}
 
 	ComponentFlexVolume = component{
-		Version: "release-v3.15",
+		Version: "v3.15.0",
 		Image:   "calico/pod2daemon-flexvol",
 	}
 

diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go
@@ -16,32 +16,32 @@ package components
 
 var (
 	ComponentAPIServer = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/cnx-apiserver",
 	}
 
 	ComponentComplianceBenchmarker = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/compliance-benchmarker",
 	}
 
 	ComponentComplianceController = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/compliance-controller",
 	}
 
 	ComponentComplianceReporter = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/compliance-reporter",
 	}
 
 	ComponentComplianceServer = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/compliance-server",
 	}
 
 	ComponentComplianceSnapshotter = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/compliance-snapshotter",
 	}
 
@@ -51,7 +51,7 @@ var (
 	}
 
 	ComponentElasticTseeInstaller = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/intrusion-detection-job-installer",
 	}
 
@@ -66,72 +66,72 @@ var (
 	}
 
 	ComponentEsCurator = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/es-curator",
 	}
 
 	ComponentEsProxy = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/es-proxy",
 	}
 
 	ComponentFluentd = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/fluentd",
 	}
 
 	ComponentGuardian = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/guardian",
 	}
 
 	ComponentIntrusionDetectionController = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/intrusion-detection-controller",
 	}
 
 	ComponentKibana = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/kibana",
 	}
 
 	ComponentManager = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/cnx-manager",
 	}
 
 	ComponentManagerProxy = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/voltron",
 	}
 
 	ComponentQueryServer = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/cnx-queryserver",
 	}
 
 	ComponentTigeraKubeControllers = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/kube-controllers",
 	}
 
 	ComponentTigeraNode = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/cnx-node",
 	}
 
 	ComponentTigeraTypha = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/typha",
 	}
 
 	ComponentTigeraCNI = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/cni",
 	}
 
     ComponentCloudControllers = component{
-		Version: "release-calient-v3.1",
+		Version: "v3.1.0",
 		Image:   "tigera/cloud-controllers",
     }
 )
diff --git a/pkg/components/images.go b/pkg/components/images.go
@@ -16,7 +16,7 @@ package components
 // 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/"
 )