Skip to content

Commit

Permalink
Use calico/routereflector v0.5.0 for master ST
Browse files Browse the repository at this point in the history
  • Loading branch information
Neil Jerram committed Dec 1, 2017
1 parent 0758c9e commit 2e9b81c
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 32 deletions.
58 changes: 29 additions & 29 deletions _data/versions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ v2.6:
note: |
28 November 2017
- 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.
- 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.
- Reduces default confd log level from `debug` to `info`.
- [#418](https://github.com/projectcalico/cni-plugin/pull/418): If the [CNI-plugin](https://github.com/projectcalico/cni-plugin) fails to re-network an existing endpoint, it no longer releases the IP allocations to the pool that are still attached to the endpoint. (@fasaxc)
- [#408](https://github.com/projectcalico/cni-plugin/pull/408): The [CNI-plugin](https://github.com/projectcalico/cni-plugin) no longer throws file exists while programming route (@gunjan5)
<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:
Expand Down Expand Up @@ -1402,7 +1402,7 @@ v3.0:
- title: v3.0.0-beta1
note: |
17 November 2017
This is a pre-release of v3.0.0. This release is intended for testing purposes only and is NOT to be used on production systems.
#### What's new
Expand All @@ -1411,32 +1411,32 @@ v3.0:
- Two new `calicoctl` resources: [BGP Configuration](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/bgpconfig) and [Felix Configuration](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/felixconfig).
- Those using the Kubernetes API datastore can now use `calicoctl` to create, read, update, and delete Calico policies.
- Those using the Kubernetes API datastore can now use `calicoctl` to create, read, update, and delete Calico policies.
- The `calicoctl` policy resource has been split into new [network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy) and [global network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/globalnetworkpolicy) resources.
- [Network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy) resources can include a `namespace` value, allowing you to create policies that only apply to [workload endpoint resources](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/workloadendpoint) in the same namespace.
- You can now specify `namespaceSelector` expressions in [network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy) and [global network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/globalnetworkpolicy) rules to select one or more namespaces in their entirety.
- You can now specify `namespaceSelector` expressions in [network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy) and [global network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/globalnetworkpolicy) rules to select one or more namespaces in their entirety.
- The `get`, `apply`, `create`, `delete`, and `replace` commands of `calicoctl` now include an optional `--namespace=<NS>` flag. Refer to the `calicoctl` [Command reference](https://docs.projectcalico.org/v3.0/reference/calicoctl/commands/) section for more details.
- The `get` command of `calicoctl` now includes optional `--all-namespaces` and `--export` flags. Refer to the [calicoctl get](https://docs.projectcalico.org/v3.0/reference/calicoctl/commands/get) section for more information.
- `calicoctl` no longer accepts the following flags in `get` commands: `--node=<NODE>`, `--orchestrator=<ORCH>`, `--workload=<WORKLOAD>`, and `--scope=<SCOPE>`. These options are now a part of the individual resources.
- `calicoctl` no longer includes a `config` command. To achieve the equivalent functionality, refer to [Modifying low-level component configurations](https://docs.projectcalico.org/v3.0/reference/calicoctl/commands/#modifying-low-level-component-configurations).
- You can now name [host](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/hostendpoint#endpointport) and [workload](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/workloadendpoint#endpointport) endpoint ports and reference them by name in your [policy rules](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy#ports).
- The new `ApplyOnForward` flag allows you to specify if a host endpoint policy should apply to forwarded traffic or not. Forwarded traffic includes traffic forwarded between host endpoints and traffic forwarded between a host endpoint and a workload endpoint on the same host. Refer to [Using Calico to secure host interfaces](https://docs.projectcalico.org/v3.0/getting-started/bare-metal/bare-metal) for more details.
- Calico now works with Kubernetes network services proxy with IPVS/LVS. Calico enforces network policies with kube-proxy running in IPVS mode for Kubernetes clusters. Currently only workload ingress policy is supported.
- After a period of deprecation, this release removes support for the `ETCD_AUTHORITY` and `ETCD_SCHEME` environment variables. Calico no longer reads these values. If you have not transitioned to `ETCD_ENDPOINTS`, you must do so as of v3.0. Refer to [Configuring `calicoctl` - etcdv3 datastore](https://docs.projectcalico.org/v3.0/reference/calicoctl/setup/etcdv3) for more information.
- 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. Refer to [Configuring the Calico Kubernetes controllers](https://docs.projectcalico.org/v3.0/reference/kube-controllers/configuration) for more information.
- `calicoctl` now allows a `0` value for ICMP entries in policy resources, enabling `ping` responses. In addition, it now rejects `255` values in the `type` field due to lack of kernel support. Refer to the reference documentation of the [network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy#icmp) and [global network policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/globalnetworkpolicy#icmp) resources for more information.
Expand All @@ -1447,7 +1447,7 @@ v3.0:
- **Integrates only with Kubernetes, OpenShift, and host endpoints**: the OpenStack, Mesos, DC/OS, rkt, and Docker orchestrators have not been tested and are not supported. (Calico still supports Docker and rkt containers.) We plan to resume support for the OpenStack, Mesos, DC/OS, and Docker orchestrators in a future release.
- **BGP route reflector not supported**: large deployments that require the [BGP route reflector](https://docs.projectcalico.org/v3.0/usage/routereflector/bird-rr-config) are not supported. We plan to resume support for the BGP route reflector in a future release.
- **GoBGP not supported**: Setting the `CALICO_NETWORKING_BACKEND` environment variable to `gobgp` is not supported. See [Configuring calico/node](https://docs.projectcalico.org/v3.0/reference/node/configuration) for more information. We plan to resume support for GoBPG in a future release.
<!-- Once migration from etcdv2 to etcdv3 is supported, restore the following warning -->
Expand Down Expand Up @@ -1497,7 +1497,7 @@ v3.0:
- title: v3.0.0-alpha1
note: |
29 October 2017
This is a pre-release of v3.0.0. This release is intended for testing purposes only and is NOT to be used on production systems.
#### What's new
Expand All @@ -1506,26 +1506,26 @@ v3.0:
- Two new `calicoctl` resources: [BGP Configuration](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/bgpconfig) and [Felix Configuration](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/felixconfig).
- Those using the Kubernetes API datastore can now use `calicoctl` to create, update, and delete Calico policies.
- Those using the Kubernetes API datastore can now use `calicoctl` to create, update, and delete Calico policies.
- The `calicoctl` Policy resource has been split into [Network Policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy) and [Global Network Policy](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/globalnetworkpolicy).
- The `get`, `apply`, `create`, `delete`, and `replace` commands of `calicoctl` now include an optional `--namespace=<NS>` flag. Refer to the `calicoctl` [Command reference](https://docs.projectcalico.org/v3.0/reference/calicoctl/commands/) section for more details.
- The `get` command of `calicoctl` now includes an optional `--all-namespaces` flag. Refer to the [calicoctl get](https://docs.projectcalico.org/v3.0/reference/calicoctl/commands/get) section for more information.
- `calicoctl` no longer accepts the following flags in `get` commands: `--node=<NODE>`, `--orchestrator=<ORCH>`, `--workload=<WORKLOAD>`, and `--scope=<SCOPE>`. These options are now a part of the individual resources.
- `calicoctl` no longer includes a `config` command. To achieve the equivalent functionality: refer to [Modifying low-level component configurations](https://docs.projectcalico.org/v3.0/reference/calicoctl/commands/#modifying-low-level-component-configurations).
- You can now name [host](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/hostendpoint#endpointport) and [workload](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/workloadendpoint#endpointport) endpoint ports and reference them by name in your [policy rules](https://docs.projectcalico.org/v3.0/reference/calicoctl/resources/networkpolicy#ports).
- The new `ApplyOnForward` flag allows you to specify if a host endpoint policy should apply to forwarded traffic or not. Forwarded traffic includes traffic forwarded between host endpoints and traffic forwarded between a host endpoint and a workload endpoint on the same host. Refer to [Using Calico to secure host interfaces](https://docs.projectcalico.org/v3.0/getting-started/bare-metal/bare-metal) for more details.
- Calico now works with Kubernetes network services proxy with IPVS/LVS. Calico enforces network policies with kube-proxy running in ipvs mode for Kubernetes clusters. Currently only workload ingress policy is supported.
- After a period of deprecation, this release removes support for the `ETCD_AUTHORITY` and `ETCD_SCHEME` environment variables. Calico no longer reads these values. If you have not transitioned to `ETCD_ENDPOINTS`, you must do so as of v3.0. Refer to [Configuring `calicoctl` - etcdv3 datastore](https://docs.projectcalico.org/v3.0/reference/calicoctl/setup/etcdv3) for more information.
#### Limitations
Expand All @@ -1537,7 +1537,7 @@ v3.0:
- **Lack of `calicoctl` data validation**: `calicoctl` does not perform as much validation on data, increasing the potential for bad data. Use caution when entering data via `calicoctl`.
- **BGP route reflector not supported**: large deployments that require the [BGP route reflector](https://docs.projectcalico.org/v3.0/usage/routereflector/bird-rr-config) are not supported. We plan to resume support for the BGP route reflector in a future release.
- **GoBGP not supported**: Setting the `CALICO_NETWORKING_BACKEND` environment variable to `gobgp` is not supported. See [Configuring calico/node](https://docs.projectcalico.org/v3.0/reference/node/configuration) for more information. We plan to resume support for GoBPG in a future release.
<!-- Once migration from etcdv2 to etcdv3 is supported, restore the following warning -->
Expand Down Expand Up @@ -1587,7 +1587,7 @@ v3.0:
- title: v3.0.0-alpha1-rc1
note: |
24 October 2017
This is a pre-release of v3.0.0-alpha1. This release is intended for testing purposes only and is NOT to be used on production systems.
components:
Expand Down Expand Up @@ -1657,7 +1657,7 @@ master:
version: v0.3.1
url: https://github.com/projectcalico/calico-bird/releases/tag/v0.3.1
confd:
version: master
version: master
calico-bgp-daemon:
version: v0.2.2
url: https://github.com/projectcalico/calico-bgp-daemon/releases/tag/v0.2.2
Expand All @@ -1671,7 +1671,7 @@ master:
version: master
url: ""
calico/routereflector:
version: v0.4.0
version: v0.5.0
url: ""

# Local directories to ignore when checking external links
Expand Down
8 changes: 5 additions & 3 deletions calico_node/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ V_GOBGPD := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM
V_KUBE_CONTROLLERS := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico/kube-controllers.version')
V_LIBNETWORK_PLUGIN := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.libnetwork-plugin.version')
V_TYPHA := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.typha.version')
V_RR := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico/routereflector.version')

# Now use ?= to allow the versions derived from versions.yml to be
# overriden (by the environment).
Expand All @@ -40,6 +41,7 @@ GOBGPD_VER ?= $(V_GOBGPD)
KUBE_CONTROLLERS_VER ?= $(V_KUBE_CONTROLLERS)
LIBNETWORK_PLUGIN_VER ?= $(V_LIBNETWORK_PLUGIN)
TYPHA_VER ?= $(V_TYPHA)
RR_VER ?= $(V_RR)

$(info $(shell printf "%-21s = %-10s\n" "CALICO_VER" $(CALICO_VER)))
$(info $(shell printf "%-21s = %-10s\n" "CALICO_GIT_VER" $(CALICO_GIT_VER)))
Expand All @@ -52,6 +54,7 @@ $(info $(shell printf "%-21s = %-10s\n" "GOBGPD_VER" $(GOBGPD_VER)))
$(info $(shell printf "%-21s = %-10s\n" "KUBE_CONTROLLERS_VER" $(KUBE_CONTROLLERS_VER)))
$(info $(shell printf "%-21s = %-10s\n" "LIBNETWORK_PLUGIN_VER" $(LIBNETWORK_PLUGIN_VER)))
$(info $(shell printf "%-21s = %-10s\n" "TYPHA_VER" $(TYPHA_VER)))
$(info $(shell printf "%-21s = %-10s\n" "RR_VER" $(RR_VER)))

SYSTEMTEST_CONTAINER_VER ?= latest
# we can use "custom" build image and test image name
Expand Down Expand Up @@ -339,8 +342,8 @@ busybox.tar:
docker save --output busybox.tar busybox:latest

routereflector.tar:
docker pull calico/routereflector:latest
docker save --output routereflector.tar calico/routereflector:latest
docker pull calico/routereflector:$(RR_VER)
docker save --output routereflector.tar calico/routereflector:$(RR_VER)

workload.tar:
cd workload && docker build -t workload .
Expand Down Expand Up @@ -709,4 +712,3 @@ help: # Some kind of magic from https://gist.github.com/rcmachado/af3db315e31383
{ helpMsg = $$0 }' \
width=20 \
$(MAKEFILE_LIST)

0 comments on commit 2e9b81c

Please sign in to comment.