Merge pull request #1395 from fasaxc/v2.6.x-rev-libcal

v2.6.x: Rev libcalico-go and pin go-build to v0.8
projectcalico · Nov 28, 2017 · d6d1ea0 · d6d1ea0
2 parents 057f77e + bdaa587
commit d6d1ea0
Show file tree

Hide file tree

Showing 12 changed files with 204 additions and 662 deletions.
diff --git a/_data/versions.yml b/_data/versions.yml
@@ -1,4 +1,55 @@
 v2.6:
+- title: v2.6.3
+  note: |
+    28 November 2017
+
+    Calico v2.6.3 addresses several outstanding common vulnerabilities and exposures (CVE).
+
+    - A new node controller for Kubernetes deployments clears data associated with deleted nodes from the Calico datastore, preventing conflicts that can lead to crash loops. 
+
+    <div class="alert alert-danger" role="alert"><b>Important</b>: If you are using the Kubernetes datastore and upgrading from Calico v2.4.x or earlier to Calico v2.5.x or later, you must <a href="https://github.com/projectcalico/calico/blob/master/upgrade/v2.5/README.md">migrate your Calico configuration data</a> before upgrading. Otherwise, your cluster may lose connectivity after the upgrade.</div>
+
+  components:
+    felix:
+      version: 2.6.2
+      url: https://github.com/projectcalico/felix/releases/tag/2.6.2
+    typha:
+      version: v0.5.3
+      url: https://github.com/projectcalico/typha/releases/tag/v0.5.3
+    calicoctl:
+      version: v1.6.2
+      url: https://github.com/projectcalico/calicoctl/releases/tag/v1.6.2
+      download_url: https://github.com/projectcalico/calicoctl/releases/download/v1.6.2/calicoctl
+    calico/node:
+      version: v2.6.3
+      url: https://github.com/projectcalico/calico/releases/tag/v2.6.3
+    calico/cni:
+      version: v1.11.1
+      url: https://github.com/projectcalico/cni-plugin/releases/tag/v1.11.1
+      download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.1/calico
+      download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.1/calico-ipam
+    calico-bird:
+      version: v0.3.1
+      url: https://github.com/projectcalico/calico-bird/releases/tag/v0.3.1
+    confd:
+      version: v0.12.1-calico-0.4.2
+      url: https://github.com/projectcalico/confd/releases/tag/v0.12.1-calico-0.4.2
+    calico-bgp-daemon:
+      version: v0.2.1
+      url: https://github.com/projectcalico/calico-bgp-daemon/releases/tag/v0.2.1
+    libnetwork-plugin:
+      version: v1.1.1
+      url: https://github.com/projectcalico/libnetwork-plugin/releases/tag/v1.1.1
+    calico/kube-controllers:
+      version: v1.0.1
+      url: https://github.com/projectcalico/k8s-policy/releases/tag/v1.0.1
+    networking-calico:
+      version: 1.4.3
+      url: http://git.openstack.org/cgit/openstack/networking-calico/commit/?h=1.4.3
+    calico/routereflector:
+      version: v0.4.1
+      url: ""
+
 - title: v2.6.2
   note: |
     16 October 2017
@@ -1355,20 +1406,20 @@ master:
   note: ""
   components:
      felix:
-      version: 2.x-series
+      version: 2.6.x-series
       url: ""
      calicoctl:
-      version: v1.x-series
+      version: v1.6.x-series
       url: "https://www.projectcalico.org/builds/calicoctl"
       download_url: "https://www.projectcalico.org/builds/calicoctl"
      calico/node:
-      version: v2.x-series
+      version: v2.6.x-series
       url: ""
      calico/cni:
-      version: v1.11.0
+      version: v1.11.x-series
       url: ""
-      download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.0/calico
-      download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.0/calico-ipam
+      download_calico_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.1/calico
+      download_calico_ipam_url: https://github.com/projectcalico/cni-plugin/releases/download/v1.11.1/calico-ipam
      calico-bird:
       version: v0.3.1
       url: https://github.com/projectcalico/calico-bird/releases/tag/v0.3.1
@@ -1385,7 +1436,7 @@ master:
       version: master
       url: ""
      calico/routereflector:
-      version: v0.4.0
+      version: v0.4.1
       url: ""
 # vX.Y format: update during major release process
 currentReleaseStream: v2.6

diff --git a/calico_node/Makefile b/calico_node/Makefile
@@ -1,6 +1,6 @@
 ###############################################################################
 
-GO_BUILD_VER?=v0.7
+GO_BUILD_VER?=v0.8
 CALICO_BUILD?=calico/go-build:$(GO_BUILD_VER)
 
 CALICO_NODE_DIR=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -19,6 +19,7 @@ RELEASE_STREAM ?= $(V_RELEASE_STREAM)
 V_CALICO := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].title')
 V_CALICO_GIT := $(shell git describe --tags --dirty --always)
 V_BIRD := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico-bird.version')
+V_CONFD := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.confd.version')
 V_CALICOCTL := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calicoctl.version')
 V_CNI := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico/cni.version')
 V_FELIX := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.felix.version')
@@ -32,6 +33,7 @@ V_TYPHA := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)
 CALICO_VER ?= $(V_CALICO)
 CALICO_GIT_VER ?= $(V_CALICO_GIT)
 BIRD_VER ?= $(V_BIRD)
+CONFD_VER ?= $(V_CONFD)
 CALICOCTL_VER ?= $(V_CALICOCTL)
 CNI_VER ?= $(V_CNI)
 FELIX_VER ?= $(V_FELIX)
@@ -40,9 +42,6 @@ KUBE_CONTROLLERS_VER ?= $(V_KUBE_CONTROLLERS)
 LIBNETWORK_PLUGIN_VER ?= $(V_LIBNETWORK_PLUGIN)
 TYPHA_VER ?= $(V_TYPHA)
 
-# TODO - Why isn't confd in versions.yaml
-CONFD_VER ?= v0.12.1-calico-0.4.0
-
 $(info RELEASE_STREAM=$(RELEASE_STREAM))
 $(info CALICO_VER=$(CALICO_VER))
 $(info CALICO_GIT_VER=$(CALICO_GIT_VER))
@@ -527,8 +526,8 @@ semaphore:
 	# Actually run the tests (refreshing the images as required), we only run a
 	# small subset of the tests for testing SSL support.  These tests are run
 	# using "latest" tagged images.
-	$(MAKE) RELEASE_STREAM=master $(NODE_CONTAINER_NAME) st
-	ST_TO_RUN=tests/st/policy $(MAKE) RELEASE_STREAM=master st-ssl
+	$(MAKE) RELEASE_STREAM=$(RELEASE_STREAM) $(NODE_CONTAINER_NAME) st
+	ST_TO_RUN=tests/st/policy $(MAKE) RELEASE_STREAM=$(RELEASE_STREAM) st-ssl
 
 release: clean
 	@echo Using the following versions:

diff --git a/calico_node/filesystem/etc/rc.local b/calico_node/filesystem/etc/rc.local
@@ -60,8 +60,8 @@ case "$CALICO_NETWORKING_BACKEND" in
 	# Run confd twice.  Our confd TOML files are also generated from confd, so
 	# running twice ensures our starting configuration is correct.
 	if [ "$DATASTORE_TYPE" = "kubernetes" ]; then
-		confd -onetime -backend=k8s -confdir=/etc/calico/confd -log-level=debug -keep-stage-file >/felix-startup-1.log 2>&1 || true
-		confd -onetime -backend=k8s -confdir=/etc/calico/confd -log-level=debug -keep-stage-file >/felix-startup-2.log 2>&1 || true
+		confd -onetime -backend=k8s -confdir=/etc/calico/confd -log-level=info -keep-stage-file >/felix-startup-1.log 2>&1 || true
+		confd -onetime -backend=k8s -confdir=/etc/calico/confd -log-level=info -keep-stage-file >/felix-startup-2.log 2>&1 || true
 	else
 		# Use ETCD_ENDPOINTS in preferences to ETCD_AUTHORITY
 		ETCD_NODE=${ETCD_ENDPOINTS:=${ETCD_SCHEME:=http}://${ETCD_AUTHORITY}}

diff --git a/calico_node/filesystem/etc/service/available/confd/run b/calico_node/filesystem/etc/service/available/confd/run
@@ -3,12 +3,12 @@ exec 2>&1
 
 if [ "$DATASTORE_TYPE" = "kubernetes" ]
 then
-    exec confd -confdir=/etc/calico/confd -interval=5 -log-level=debug -backend=k8s
+    exec confd -confdir=/etc/calico/confd -interval=5 -log-level=info -backend=k8s
 else
     ETCD_NODE=${ETCD_ENDPOINTS:=${ETCD_SCHEME:=http}://${ETCD_AUTHORITY}}
     ETCD_ENDPOINTS_CONFD=`echo "-node=$ETCD_NODE" | sed -e 's/,/ -node=/g'`
 
-    exec confd -confdir=/etc/calico/confd -interval=5 -watch --log-level=debug \
+    exec confd -confdir=/etc/calico/confd -interval=5 -watch --log-level=info \
            $ETCD_ENDPOINTS_CONFD -client-key=${ETCD_KEY_FILE} \
            -client-cert=${ETCD_CERT_FILE} -client-ca-keys=${ETCD_CA_CERT_FILE}
 fi
diff --git a/calico_node/glide.lock b/calico_node/glide.lock
diff --git a/calico_node/glide.yaml b/calico_node/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/sirupsen/logrus
   version: ^0.10.0
 - package: github.com/projectcalico/libcalico-go
-  version: v1.x-series
+  version: v1.7.2
   subpackages:
   - lib/api
   - lib/client

diff --git a/calico_node/tests/st/libnetwork/test_labeling.py b/calico_node/tests/st/libnetwork/test_labeling.py
@@ -19,7 +19,6 @@
 
 from tests.st.test_base import TestBase
 from tests.st.utils.docker_host import DockerHost
-from tests.st.utils.network import NETWORKING_LIBNETWORK
 from tests.st.utils.utils import ETCD_CA, ETCD_CERT, \
     ETCD_KEY, ETCD_HOSTNAME_SSL, ETCD_SCHEME, get_ip, \
     retry_until_success, wipe_etcd
@@ -70,16 +69,14 @@ def setUpClass(cls):
                 "host1",
                 additional_docker_options=ADDITIONAL_DOCKER_OPTIONS,
                 post_docker_commands=POST_DOCKER_COMMANDS,
-                start_calico=False,
-                networking=NETWORKING_LIBNETWORK)
+                start_calico=False)
         cls.host1_hostname = cls.host1.execute("hostname")
         cls.hosts.append(cls.host1)
         cls.host2 = DockerHost(
                 "host2",
                 additional_docker_options=ADDITIONAL_DOCKER_OPTIONS,
                 post_docker_commands=POST_DOCKER_COMMANDS,
-                start_calico=False,
-                networking=NETWORKING_LIBNETWORK)
+                start_calico=False)
         cls.host2_hostname = cls.host1.execute("hostname")
         cls.hosts.append(cls.host2)