X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=blobdiff_plain;f=apps%2Fspinnaker%2Fkubespray%2Fplaybooks%2Froles%2Finstall%2Ftasks%2Fmain.yml;h=ddff98ee5885da9f9c86432eb4767c3195540677;hp=a72222242bf8bce4160a56c1d9730acc8dbe637b;hb=e3a66b1bc2152760d30fc5bb86fb2b1ab9c3ce23;hpb=fe97d89d279161727ca383b45fbf618797839b29

diff --git a/apps/spinnaker/kubespray/playbooks/roles/install/tasks/main.yml b/apps/spinnaker/kubespray/playbooks/roles/install/tasks/main.yml
index a722222..ddff98e 100644
--- a/apps/spinnaker/kubespray/playbooks/roles/install/tasks/main.yml
+++ b/apps/spinnaker/kubespray/playbooks/roles/install/tasks/main.yml
@@ -42,6 +42,22 @@
   command: helm init --client-only --local-repo-url {{ local_repo_url }} --stable-repo-url {{ stable_repo_url }}
   register: helm_init_result
   changed_when: true
+  when: helm_version is version('v3', '<')
+
+- name: Check if stable helm repo exists (helm v3+)
+  command: "helm repo list"
+  changed_when: true
+  failed_when: false
+  register: helm_repo_list_result
+
+- name: Add stable helm repo (helm v3+)
+  command: "helm repo add stable {{ stable_repo_url }}"
+  register: helm_repo_add_stable_result
+  changed_when: true
+  when: >
+    helm_version is version('v3.0.0', '>=')
+    and execution_mode == "online-deployment"
+    and helm_repo_list_result is not search(stable_repo_url)
 
 - name: Clone Helm Charts repository
   git:
@@ -108,9 +124,9 @@
 - name: Install Spinnaker using helm
   command: >
     helm install
-      --name "{{ spinnaker_service }}"
+      {% if helm_version is version('v3.0.0', '<')%} --name {% endif %}"{{ spinnaker_service }}"
       --namespace "{{ spinnaker_namespace }}"
-      --timeout 900
+      --timeout "900{% if helm_version is version('v3.0.0', '>=') %}s{% endif %}"
       {{ engine_cache }}/repos/charts/stable/spinnaker
   register: spinnaker_helm_log
   changed_when: true