summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-11-25 11:51:26 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-12-03 09:20:34 +0100
commit46aedc0acdfca002115856016b8b5b165a3f65fe (patch)
treef41351a71736602dccdbdfed8a10cf88fa059e6b
parentc3af30561ac70e5758b3fce065cd7f248b1710d2 (diff)
[ANSIBLE] Drop Helm v2 specific code from application role
Change-Id: I270594786b2ec3b63b5c6cd313278bb271db44b1 Issue-ID: OOM-2883 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rw-r--r--ansible/roles/application/defaults/main.yml2
-rw-r--r--ansible/roles/application/tasks/install-helm-plugins.yml (renamed from ansible/roles/application/tasks/install-helm3-plugins.yml)0
-rw-r--r--ansible/roles/application/tasks/install-helm2-plugins.yml25
-rw-r--r--ansible/roles/application/tasks/install.yml5
-rw-r--r--ansible/roles/application/tasks/setup-helm.yml (renamed from ansible/roles/application/tasks/setup-helm3.yml)0
-rw-r--r--ansible/roles/application/tasks/setup-helm2.yml52
-rw-r--r--ansible/roles/application/tasks/transfer-helm-charts.yml5
7 files changed, 3 insertions, 86 deletions
diff --git a/ansible/roles/application/defaults/main.yml b/ansible/roles/application/defaults/main.yml
index 8e630f73..1c4437ed 100644
--- a/ansible/roles/application/defaults/main.yml
+++ b/ansible/roles/application/defaults/main.yml
@@ -2,7 +2,7 @@
helm_repository_name: local
helm_repository_url: http://127.0.0.1:8879
helm_extra_install_options:
- - { opt: "{% if helm_version | regex_search('^v3' ) %}{{ '--timeout 1800s' }}{% else %}{{ '--timeout 1800' }}{% endif %}"}
+ - { opt: '--timeout 1800s'}
# Override file generation for Helm application can be customized by any role
# given by user and found by ansible from roles_path.
# By default override file is generated by 'application-override' role that
diff --git a/ansible/roles/application/tasks/install-helm3-plugins.yml b/ansible/roles/application/tasks/install-helm-plugins.yml
index 5d933ed2..5d933ed2 100644
--- a/ansible/roles/application/tasks/install-helm3-plugins.yml
+++ b/ansible/roles/application/tasks/install-helm-plugins.yml
diff --git a/ansible/roles/application/tasks/install-helm2-plugins.yml b/ansible/roles/application/tasks/install-helm2-plugins.yml
deleted file mode 100644
index f1f900e3..00000000
--- a/ansible/roles/application/tasks/install-helm2-plugins.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: Install helm plugins if needed
- block:
- - name: Get helm dir
- command: "{{ helm_bin_dir }}/helm home"
- register: helm_home_dir
- - name: Ensure that dir for helm plugins exists
- file:
- path: "{{ helm_home_dir.stdout }}/plugins"
- state: directory
- mode: 0755
- - name: Register all plugins to be inserted by dir names
- find:
- paths: "{{ app_helm_plugins_directory }}"
- file_type: "directory"
- register: list_of_plugins
- delegate_to: localhost
- - name: Install all helm plugins from {{ app_helm_plugins_directory }} dir
- copy:
- src: "{{ item.path }}"
- dest: "{{ helm_home_dir.stdout }}/plugins"
- directory_mode: true
- mode: 0755
- loop: "{{ list_of_plugins.files }}"
- when: app_helm_plugins_directory is defined and app_helm_plugins_directory is not none
diff --git a/ansible/roles/application/tasks/install.yml b/ansible/roles/application/tasks/install.yml
index 2db88631..6cd22d05 100644
--- a/ansible/roles/application/tasks/install.yml
+++ b/ansible/roles/application/tasks/install.yml
@@ -6,10 +6,7 @@
state: present
when: ansible_os_family == "Debian"
-- include_tasks: setup-helm2.yml
- when: helm_version | regex_search("^v2" )
-- include_tasks: setup-helm3.yml
- when: helm_version | regex_search("^v3" )
+- include_tasks: setup-helm.yml
- name: Build local helm repository
make:
diff --git a/ansible/roles/application/tasks/setup-helm3.yml b/ansible/roles/application/tasks/setup-helm.yml
index 4b50ec1c..4b50ec1c 100644
--- a/ansible/roles/application/tasks/setup-helm3.yml
+++ b/ansible/roles/application/tasks/setup-helm.yml
diff --git a/ansible/roles/application/tasks/setup-helm2.yml b/ansible/roles/application/tasks/setup-helm2.yml
deleted file mode 100644
index 8479e1a1..00000000
--- a/ansible/roles/application/tasks/setup-helm2.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- name: Helm init and upgrade
- command: |
- {{ helm_bin_dir }}/helm init
- --upgrade
- --skip-refresh
- changed_when: true # init is always changed type of action
-
-# A correct way to implement this would be using --wait option in helm init invocation.
-# However, it does not work due to https://github.com/helm/helm/issues/4031 (fixed in newer helm release)
-- name: "Wait for helm upgrade to finish"
- command: "{{ helm_bin_dir }}/helm version --tiller-connection-timeout 10"
- register: result
- until: result.rc == 0
- delay: 10
- retries: 12
- changed_when: false # for idempotency
-
-- name: Get all helm repos
- command: "{{ helm_bin_dir }}/helm repo list"
- register: repos
- changed_when: false # for idempotency
-
-- name: Remove stable repo
- command: "{{ helm_bin_dir }}/helm repo remove stable"
- changed_when: true # when executed its a changed type of action
- when: "'stable' in repos.stdout"
-
-- name: Helm Serve
- shell: "{{ helm_bin_dir }}/helm serve &"
- async: 45
- poll: 3 # wait 3sec to get a chance for some stderr
- register: helm_serve
- changed_when: "'address already in use' not in helm_serve.stderr"
-
-- name: List helm repos
- command: "{{ helm_bin_dir }}/helm repo list"
- register: helm_repo_list
- changed_when: false # for idempotency
- failed_when:
- - helm_repo_list.rc > 0
- - "'Error: no repositories to show' not in helm_repo_list.stderr"
-
-- name: Helm Add Repo
- command: "{{ helm_bin_dir }}/helm repo add {{ helm_repository_name | mandatory }} {{ helm_repository_url | mandatory }}"
- when: "'local' not in helm_repo_list.stdout"
- changed_when: true # when executed its a changed type of action
-
-- name: Check for deploy plugin presence
- stat:
- path: '{{ helm_home_dir.stdout }}/plugins/deploy/deploy.sh'
- register: deploy_plugin_presence
diff --git a/ansible/roles/application/tasks/transfer-helm-charts.yml b/ansible/roles/application/tasks/transfer-helm-charts.yml
index 2101a5ab..9b36cffe 100644
--- a/ansible/roles/application/tasks/transfer-helm-charts.yml
+++ b/ansible/roles/application/tasks/transfer-helm-charts.yml
@@ -20,7 +20,4 @@
src: "{{ app_helm_charts_install_directory }}.tgz"
dest: "{{ app_helm_charts_infra_directory }}"
-- include_tasks: install-helm2-plugins.yml
- when: helm_version | regex_search("^v2" )
-- include_tasks: install-helm3-plugins.yml
- when: helm_version | regex_search("^v3" )
+- include_tasks: install-helm-plugins.yml