Home Explore Help
Register Sign In
shixiong
/
okd
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Bump calico to v2.4.1

Dan Osborne 7 years ago
parent
085e3eb240
commit
1284510b76
2 changed files with 5 additions and 5 deletions
Split View Show Diff Stats
  1. 3 3
      roles/calico/defaults/main.yaml
  2. 2 2
      roles/calico_master/defaults/main.yaml

+ 3 - 3
roles/calico/defaults/main.yaml
View File 

@@ -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"

+ 2 - 2
roles/calico_master/defaults/main.yaml
View File 

@@ -3,5 +3,5 @@ kubeconfig: "{{ openshift.common.config_base }}/master/openshift-master.kubeconf
 
 
 calicoctl_bin_dir: "/usr/local/bin/"
 
 
-calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.1.3/calicoctl"
 
-calico_url_policy_controller: "quay.io/calico/kube-policy-controller:v0.5.4"
 
+calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.4.0/calicoctl"
 
+calico_url_policy_controller: "quay.io/calico/kube-policy-controller:v0.7.0"