summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-11-15 14:27:23 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-11-23 10:37:13 +0100
commit5735f00fed2e691517ad1aab33c2981882f2d474 (patch)
treeac310e4749a0a3e4812424f7331bad047f008a41
parentec514d5db41dcbd86eb8dd902f8d2114a4c28f52 (diff)
[ANSIBLE] Install cmctl utility
Cert-manager role will also install cmctl utility for cert-manager resources management. Change-Id: I4c4d9ecb243c951a190733230f310f4899c9bc23 Issue-ID: OOM-2871 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rw-r--r--ansible/roles/cert-manager/defaults/main.yml1
-rw-r--r--ansible/roles/cert-manager/molecule/default/prepare.yml2
-rw-r--r--ansible/roles/cert-manager/molecule/default/vars.yml2
-rw-r--r--ansible/roles/cert-manager/tasks/main.yml9
-rw-r--r--ansible/test/roles/prepare-cert-manager/tasks/main.yml5
-rwxr-xr-xbuild/package.py3
6 files changed, 21 insertions, 1 deletions
diff --git a/ansible/roles/cert-manager/defaults/main.yml b/ansible/roles/cert-manager/defaults/main.yml
index f87c9075..aa59c240 100644
--- a/ansible/roles/cert-manager/defaults/main.yml
+++ b/ansible/roles/cert-manager/defaults/main.yml
@@ -6,3 +6,4 @@ cert_manager:
helm_values_file: "{{ app_data_path }}/cert_manager.yaml"
helm_values:
installCRDs: true
+cmctl_bin_dir: /usr/local/bin
diff --git a/ansible/roles/cert-manager/molecule/default/prepare.yml b/ansible/roles/cert-manager/molecule/default/prepare.yml
index 8a90616c..580e7bf2 100644
--- a/ansible/roles/cert-manager/molecule/default/prepare.yml
+++ b/ansible/roles/cert-manager/molecule/default/prepare.yml
@@ -4,6 +4,8 @@
pre_tasks:
- name: Include infrastructure group variables
include_vars: ../../../../group_vars/infrastructure.yml
+ - name: Include test scenario variables
+ include_vars: vars.yml
tasks:
- name: "Include prepare-cert-manager role"
include_role:
diff --git a/ansible/roles/cert-manager/molecule/default/vars.yml b/ansible/roles/cert-manager/molecule/default/vars.yml
new file mode 100644
index 00000000..12334528
--- /dev/null
+++ b/ansible/roles/cert-manager/molecule/default/vars.yml
@@ -0,0 +1,2 @@
+---
+cmctl_version: 1.6.1
diff --git a/ansible/roles/cert-manager/tasks/main.yml b/ansible/roles/cert-manager/tasks/main.yml
index 5b73ded8..9bf7fde3 100644
--- a/ansible/roles/cert-manager/tasks/main.yml
+++ b/ansible/roles/cert-manager/tasks/main.yml
@@ -20,3 +20,12 @@
wait: True
wait_timeout: "{{ cert_manager.helm_timeout }}"
tags: molecule-notest
+
+- name: Install cmctl
+ unarchive:
+ src: "{{ app_data_path }}/downloads/cmctl-linux-amd64.tar.gz"
+ dest: "{{ cmctl_bin_dir }}"
+ extra_opts:
+ - 'cmctl'
+ remote_src: true
+ mode: 0755
diff --git a/ansible/test/roles/prepare-cert-manager/tasks/main.yml b/ansible/test/roles/prepare-cert-manager/tasks/main.yml
index add49051..1802f1b3 100644
--- a/ansible/test/roles/prepare-cert-manager/tasks/main.yml
+++ b/ansible/test/roles/prepare-cert-manager/tasks/main.yml
@@ -9,3 +9,8 @@
get_url:
url: "https://charts.jetstack.io/charts/cert-manager-v{{ cert_manager_version }}.tgz"
dest: "{{ app_data_path }}/downloads"
+
+- name: "Download cmctl binary"
+ get_url:
+ url: "https://github.com/jetstack/cert-manager/releases/download/v{{ cmctl_version }}/cmctl-linux-amd64.tar.gz"
+ dest: "{{ app_data_path }}/downloads"
diff --git a/build/package.py b/build/package.py
index 50e6d8cf..f0afcfcb 100755
--- a/build/package.py
+++ b/build/package.py
@@ -248,7 +248,8 @@ def build_offline_deliverables(build_version,
'**/kubectl',
'**/helm-push_*_linux_amd64.tar.gz',
'**/kube-prometheus-stack-*.tgz',
- '**/cert-manager-*.tgz']
+ '**/cert-manager-*.tgz',
+ '**/cmctl-linux-amd64.tar.gz']
for pattern in bin_pattern_list:
for bin_file in glob.glob(os.path.join('.', pattern), recursive=True):