From 4479cc48fed3a94e147dceafb91c3817a2492c7e Mon Sep 17 00:00:00 2001
From: Douglas Hellinger <douglas.hellinger@sc.com>
Date: Wed, 23 Jan 2019 16:15:10 +0800
Subject: [PATCH] Introduce `calico_upgrade_url` var for Calico upgrade tool.
So that binary can be sourced from anywhere - not only github.
---
roles/network_plugin/calico/defaults/main.yml | 1 +
roles/network_plugin/calico/tasks/upgrade.yml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 39bf10861..45a2bda06 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -43,6 +43,7 @@ calico_felix_prometheusprocessmetricsenabled: "true"
### check latest version https://github.com/projectcalico/calico-upgrade/releases
calico_upgrade_enabled: true
calico_upgrade_version: v1.0.5
+calico_upgrade_url: "https://github.com/projectcalico/calico-upgrade/releases/download/{{ calico_upgrade_version }}/calico-upgrade"
# Set the agent log level. Can be debug, warning, info or fatal
calico_loglevel: info
diff --git a/roles/network_plugin/calico/tasks/upgrade.yml b/roles/network_plugin/calico/tasks/upgrade.yml
index 9815b3d27..9754d058e 100644
--- a/roles/network_plugin/calico/tasks/upgrade.yml
+++ b/roles/network_plugin/calico/tasks/upgrade.yml
@@ -1,7 +1,7 @@
---
- name: "Download calico-upgrade tool (force version)"
get_url:
- url: "https://github.com/projectcalico/calico-upgrade/releases/download/{{ calico_upgrade_version }}/calico-upgrade"
+ url: "{{ calico_upgrade_url }}"
dest: "{{ bin_dir }}/calico-upgrade"
mode: 0755
owner: root
--
GitLab