commit 4932b17cb762e5c02d8f76ef5ec2b08e07d781ad
author Artem Panchenko <apanchenko@mirantis.com> Tue Nov 08 19:06:03 2016 +0200
committer Artem Panchenko <apanchenko@mirantis.com> Thu Nov 10 14:45:33 2016 +0000
tree 17943e2e26924ce5466be33e35956cb6fe27f14b
parent d4e31281bfea4a36052aad5e656a12c80e824328

Update default Calico version

Set current released version (upstream) as default.

Change-Id: I957475bc451e857dc6d8427d962f45c16f4c20a1

vars/buildCalicoContainers.groovy

diff --git a/vars/buildCalicoContainers.groovy b/vars/buildCalicoContainers.groovy
index cf31d3d..9c4e53f 100644
--- a/vars/buildCalicoContainers.groovy
+++ b/vars/buildCalicoContainers.groovy
@@ -10,11 +10,11 @@
   def artifactoryUrl = config.artifactoryURL ?: "https://artifactory.mcp.mirantis.net/artifactory/projectcalico"
 
   def nodeImage = config.nodeImage ?: "calico/node"
-  def nodeImageTag = config.nodeImageTag ?: "v0.20.0"
+  def nodeImageTag = config.nodeImageTag ?: "v1.0.0-beta"
   def nodeName = "${dockerRepo}/${nodeImage}:${nodeImageTag}"
 
   def ctlImage = config.ctlImage ?: "calico/ctl"
-  def ctlImageTag = config.ctlImageTag ?: "v0.20.0"
+  def ctlImageTag = config.ctlImageTag ?: "v1.0.0-beta"
   def ctlName = "${dockerRepo}/${ctlImage}:${ctlImageTag}"
 
   // calico/build goes from {artifactoryUrl}/mcp/libcalico/

vars/buildCalicoContainers.txt

diff --git a/vars/buildCalicoContainers.txt b/vars/buildCalicoContainers.txt
index 67ffece..3b2c714 100644
--- a/vars/buildCalicoContainers.txt
+++ b/vars/buildCalicoContainers.txt
@@ -3,9 +3,9 @@
   def dockerRepo = config.dockerRepo ?: "artifactory.mcp.mirantis.net:5001"
   def artifactoryUrl = config.artifactoryURL ?: "https://artifactory.mcp.mirantis.net/artifactory/projectcalico"
   def nodeImage = config.nodeImage ?: "calico/node"
-  def nodeImageTag = config.nodeImageTag ?: "v0.20.0"
+  def nodeImageTag = config.nodeImageTag ?: "v1.0.0-beta"
   def ctlImage = config.ctlImage ?: "calico/ctl"
-  def ctlImageTag = config.ctlImageTag ?: "v0.20.0"
+  def ctlImageTag = config.ctlImageTag ?: "v1.0.0-beta"
   def buildImage = config.buildImage ?: "${artifactoryURL}/mcp/libcalico/lastbuild".toURL().text.trim()
   def felixImage = config.felixImage ?: "${artifactoryURL}/mcp/felix/lastbuild".toURL().text.trim()
   def confdBuildId = config.confdBuildId ?: "${artifactoryURL}/mcp/confd/lastbuild".toURL().text.trim()