diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-14 22:52:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 22:52:09 -0400 |
| commit | 2bc68321f54ed405819d168a4930c75d9ab8fadc (patch) | |
| tree | 48c713a2c0ad9dc05eca0c2311f6eab37ee546db /roles/calico | |
| parent | d5fc93e7e32872e0903d83f1be08999a3f7ccca9 (diff) | |
| parent | 917015b0473a1fb9a0488ebec2765460e7bf3667 (diff) | |
| download | openshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.tar.gz openshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.tar.bz2 openshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.tar.xz openshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.zip | |
Merge pull request #5037 from ozdanborne/calico-2.4
Bump Calico to v2.4.1
Diffstat (limited to 'roles/calico')
| -rw-r--r-- | roles/calico/README.md | 20 | ||||
| -rw-r--r-- | roles/calico/defaults/main.yaml | 6 |
2 files changed, 16 insertions, 10 deletions
diff --git a/roles/calico/README.md b/roles/calico/README.md index 9b9458bfa..65f66ebfa 100644 --- a/roles/calico/README.md +++ b/roles/calico/README.md @@ -6,12 +6,6 @@ Configure Calico components for the Master host. * Ansible 2.2 -## Warning: This Calico Integration is in Alpha - -Calico shares the etcd instance used by OpenShift, and distributes client etcd certificates to each node. -For this reason, **we do not (yet) recommend running Calico on any production-like -cluster, or using it for any purpose besides early access testing.** - ## Installation To install, set the following inventory configuration parameters: @@ -20,7 +14,19 @@ To install, set the following inventory configuration parameters: * `openshift_use_openshift_sdn=False` * `os_sdn_network_plugin_name='cni'` -## Additional Calico/Node and Felix Configuration Options +For more information, see [Calico's official OpenShift Installation Documentation](https://docs.projectcalico.org/latest/getting-started/openshift/installation#bring-your-own-etcd) + +## Improving security with BYO-etcd + +By default, Calico uses the etcd set up by OpenShift. To accomplish this, it generates and distributes client etcd certificates to each node. +Distributing these certs across the cluster in this way weakens the overall security, +so Calico should not be deployed in production in this mode. + +Instead, Calico can be installed in BYO-etcd mode, where it connects to an externally +set up etcd. For information on deploying Calico in BYO-etcd mode, see +[Calico's official OpenShift Installation Documentation](https://docs.projectcalico.org/latest/getting-started/openshift/installation#bring-your-own-etcd) + +## Calico Configuration Options Additional parameters that can be defined in the inventory are: diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml index 207dee068..e7a9db92f 100644 --- a/roles/calico/defaults/main.yaml +++ b/roles/calico/defaults/main.yaml @@ -5,11 +5,11 @@ cni_conf_dir: "/etc/cni/net.d/" cni_bin_dir: "/opt/cni/bin/" cni_url: "https://github.com/containernetworking/cni/releases/download/v0.5.2/cni-amd64-v0.5.2.tgz" -calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v1.8.3/calico" -calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.8.3/calico-ipam" +calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v1.10.0/calico" +calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.10.0/calico-ipam" calico_ipv4pool_ipip: "always" calico_ipv4pool_cidr: "192.168.0.0/16" calico_log_dir: "/var/log/calico" -calico_node_image: "calico/node:v1.2.1" +calico_node_image: "calico/node:v2.4.1" |