Support to read the repository path of argocd from the center file

kubesphere · Jun 24, 2022 · 445e557 · 445e557
1 parent 4c3e83f
commit 445e557
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/roles/ks-devops/tasks/main.yaml b/roles/ks-devops/tasks/main.yaml
@@ -109,6 +109,7 @@
     dest: "{{ kubesphere_dir }}/{{ item.path }}/{{ item.file }}"
   with_items:
     - { path: ks-devops, file: ks-devops-values.yaml }
+    - { path: ks-devops, file: argo-cd-values.yaml }
 
 - name: ks-devops | Checking if ks-devops has installed
   shell: |
@@ -177,7 +178,9 @@
     executable: /bin/bash
   shell: |
     {{ bin_dir }}/helm upgrade --install devops {{ kubesphere_dir }}/ks-devops/charts/argo-cd-4.4.0.tgz \
-    -n argocd --create-namespace --reuse-values
+    -n argocd --create-namespace --reuse-values \
+    -f {{ kubesphere_dir }}/ks-devops/argo-cd-values.yaml
+
   register: argocd_upgrade_result
   until: argocd_upgrade_result is succeeded
   when:

diff --git a/roles/ks-devops/templates/argo-cd-values.yaml.j2 b/roles/ks-devops/templates/argo-cd-values.yaml.j2
@@ -0,0 +1,15 @@
+global:
+  image:
+    repository: "{{ argocd_repo }}"
+
+dex:
+  image:
+    repository: "{{ argocd_dex_repo }}"
+
+applicationSet:
+  image:
+    repository: "{{ argocd_applicationset_repo }}"
+
+redis:
+  image:
+    repository: "{{ argocd_redis_repo }}"