Update calico/ctl image tag

We no longer need to use v0.22.0 for calicoctl since Kargo has
support for new calicoctl CLI format.

Also fixing condition logic for calico pool task.
This commit is contained in:
Aleksandr Didenko 2016-11-24 14:56:33 +01:00
parent 6d29a5981c
commit ff7d489f2d
2 changed files with 5 additions and 5 deletions

View file

@ -44,7 +44,7 @@ flannel_image_tag: "{{ flannel_version }}"
calicoctl_image_repo: "calico/ctl" calicoctl_image_repo: "calico/ctl"
# TODO(apanchenko): v1.0.0-beta can't execute `node run` from Docker container # TODO(apanchenko): v1.0.0-beta can't execute `node run` from Docker container
# for details see https://github.com/projectcalico/calico-containers/issues/1291 # for details see https://github.com/projectcalico/calico-containers/issues/1291
calicoctl_image_tag: "v0.22.0" calicoctl_image_tag: "v1.0.0-beta-18-gf72bc1d"
calico_node_image_repo: "calico/node" calico_node_image_repo: "calico/node"
calico_node_image_tag: "{{ calico_version }}" calico_node_image_tag: "{{ calico_version }}"
calico_cni_image_repo: "calico/cni" calico_cni_image_repo: "calico/cni"

View file

@ -101,8 +101,8 @@
environment: environment:
NO_DEFAULT_POOLS: true NO_DEFAULT_POOLS: true
run_once: true run_once: true
when: (not legacy_calicoctl and when: not legacy_calicoctl and
"Key not found" in calico_conf.stdout or "nodes" not in calico_conf.stdout) ("Key not found" in calico_conf.stdout or "nodes" not in calico_conf.stdout)
- name: Calico (old) | Define ipip pool argument - name: Calico (old) | Define ipip pool argument
run_once: true run_once: true
@ -129,8 +129,8 @@
environment: environment:
NO_DEFAULT_POOLS: true NO_DEFAULT_POOLS: true
run_once: true run_once: true
when: (legacy_calicoctl and when: legacy_calicoctl and
"Key not found" in calico_conf.stdout or "nodes" not in calico_conf.stdout) ("Key not found" in calico_conf.stdout or "nodes" not in calico_conf.stdout)
- name: Calico | Get calico configuration from etcd - name: Calico | Get calico configuration from etcd
command: |- command: |-