X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=blobdiff_plain;f=apps%2Fprometheus%2Fkubespray%2Fplaybooks%2Froles%2Finstall%2Ftasks%2Fmain.yaml;h=ed9a2c93d1f47179ec59d547b59889303017eb3a;hp=3161f20630f6f2dfeba12536b7c635f01e8554ba;hb=3f7a6e04758ac28aa51bd66b67f600534f646ff0;hpb=a1e1f40e71a48d8c5315f37999b9123c7ea908ab

diff --git a/apps/prometheus/kubespray/playbooks/roles/install/tasks/main.yaml b/apps/prometheus/kubespray/playbooks/roles/install/tasks/main.yaml
index 3161f20..ed9a2c9 100644
--- a/apps/prometheus/kubespray/playbooks/roles/install/tasks/main.yaml
+++ b/apps/prometheus/kubespray/playbooks/roles/install/tasks/main.yaml
@@ -36,12 +36,42 @@
       src: "index.yaml.j2"
       dest: "{{ engine_workspace }}/offline/charts/stable/index.yaml"
       force: true
+
+  - name: Create local repo index (empty initially)
+    command: "helm repo index {{ engine_workspace }}/offline/charts/local/"
+    args:
+      creates: "{{ engine_workspace }}/offline/charts/local/index.yaml"
   when: execution_mode == "offline-deployment"
 
 - name: Initialize Helm
   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: Add local helm repo (helm v3+)
+  command: "helm repo add local {{ local_repo_url }}"
+  register: helm_repo_add_local_result
+  changed_when: true
+  when: >
+    helm_version is version('v3.0.0', '>=')
+    and execution_mode == "offline-deployment"
+    and helm_repo_list_result is not search(local_repo_url)
 
 - name: Clone Helm Charts repository
   git:
@@ -87,9 +117,9 @@
 - name: Install Prometheus using helm
   command: >
     helm install
-      --name "{{ prometheus_service }}"
+      {% if helm_version is version('v3.0.0', '<') %} --name {% endif %}"{{ prometheus_service }}"
       --namespace "{{ prometheus_namespace }}"
-      --timeout 900
+      --timeout "900{% if helm_version is version('v3.0.0', '>=') %}s{% endif %}"
       {{ config_path }}/repos/charts/stable/prometheus
   register: prometheus_helm_log
   changed_when: true