Merge pull request #2025 from pixiake/devel

refine installation logic of redis
kubesphere · Jun 23, 2022 · b1c414e · b1c414e
2 parents 260d616 + 5dd20f0
commit b1c414e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/roles/common/tasks/common-install.yaml b/roles/common/tasks/common-install.yaml
@@ -1,13 +1,13 @@
 - name: KubeSphere | Checking KubeSphere Config is Exists
   shell: >
-    {{ bin_dir }}/kubectl get cm -n kubesphere-system | grep "kubesphere-config" | wc -l
-  register: ksconfig_exist
+    {{ bin_dir }}/kubectl get secret -n kubesphere-system | grep "redis-secret" | wc -l
+  register: redis_secret_exist
 
 - import_tasks: redis-install.yaml
   when:
-    - common.redis is defined and common.redis.enabled is defined and common.redis.enabled
+    - (common.redis is defined and common.redis.enabled is defined and common.redis.enabled) or (enableHA is defined and enableHA)
     - "status.redis is not defined or status.redis.status is not defined or status.redis.status != 'enabled'"
-    - ksconfig_exist.stdout == "0"
+    - redis_secret_exist.stdout == "0"
 
 - import_tasks: openldap-install.yaml
   when: