Merge pull request #570 from doublek/update-components

Update components
tigera · May 8, 2020 · d0b6953 · d0b6953
2 parents a6049fc + 598a324
commit d0b6953
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/config/calico_versions.yml b/config/calico_versions.yml
@@ -1,11 +1,11 @@
 components:
   typha:
-    version: v3.13.1
+    version: v3.14.0
   calico/node:
-    version: v3.13.1
+    version: v3.14.0
   calico/cni:
-    version: v3.13.1
+    version: v3.14.0
   calico/kube-controllers:
-    version: v3.13.1
+    version: v3.14.0
   flexvol:
-    version: v3.13.1
+    version: v3.14.0
diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml
@@ -26,19 +26,6 @@ components:
   es-proxy:
     image: tigera/es-proxy
     version: v3.0.0-0.dev-29-gfe7b046
-  eck-kibana:
-    version: 7.3.2
-  kibana:
-    image: tigera/kibana
-    version: v3.0.0-0.dev-0-gddc3967
-  elasticsearch-operator:
-    registry: docker.elastic.co
-    image: eck/eck-operator
-    version: 1.0.1
-  elasticsearch:
-    registry: docker.elastic.co
-    image: elasticsearch/elasticsearch
-    version: 7.3.2
   elastic-tsee-installer:
     image: tigera/intrusion-detection-job-installer
     version: v3.0.0-0.dev-15-g466c351
@@ -63,11 +50,24 @@ components:
   compliance-benchmarker:
     image: tigera/compliance-benchmarker
     version: v3.0.0-0.dev-23-gd7abd7d
-  # 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: v3.0.0-0.dev-8-g4197ee4
   tigera-cni:
     image: tigera/cni
     version: v3.0.0-0.dev-53-gb3668d9
+  kibana:
+    image: tigera/kibana
+    version: v3.0.0-0.dev-0-gddc3967
+  eck-kibana:
+    version: 7.3.2
+  # 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.
+  elasticsearch-operator:
+    registry: docker.elastic.co
+    image: eck/eck-operator
+    version: 1.0.1
+  elasticsearch:
+    registry: docker.elastic.co
+    image: elasticsearch/elasticsearch
+    version: 7.3.2
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: "v3.13.1",
+		Version: "v3.14.0",
 		Image:   "calico/cni",
 	}
 
 	ComponentCalicoKubeControllers = component{
-		Version: "v3.13.1",
+		Version: "v3.14.0",
 		Image:   "calico/kube-controllers",
 	}
 
 	ComponentCalicoNode = component{
-		Version: "v3.13.1",
+		Version: "v3.14.0",
 		Image:   "calico/node",
 	}
 
 	ComponentCalicoTypha = component{
-		Version: "v3.13.1",
+		Version: "v3.14.0",
 		Image:   "calico/typha",
 	}
 
 	ComponentFlexVolume = component{
-		Version: "v3.13.1",
+		Version: "v3.14.0",
 		Image:   "calico/pod2daemon-flexvol",
 	}