From 989abbdf4b548b001a8aa66598775d0283872289 Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Wed, 23 Aug 2023 15:07:00 +0800
Subject: [PATCH] Support without OpenSearch curator component

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 deploy/cluster-configuration.yaml          | 4 ++++
 roles/common/tasks/escurator-install.yaml  | 3 ++-
 roles/common/tasks/opensearch-install.yaml | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/deploy/cluster-configuration.yaml b/deploy/cluster-configuration.yaml
index f280db41a..814c3f538 100644
--- a/deploy/cluster-configuration.yaml
+++ b/deploy/cluster-configuration.yaml
@@ -67,6 +67,8 @@ spec:
         password: ""
       externalElasticsearchHost: ""
       externalElasticsearchPort: ""
+      curator:
+        enabled: false
     opensearch:   # Storage backend for logging, events and auditing.
       # master:
       #   volumeSize: 4Gi  # The volume size of Opensearch master nodes.
@@ -85,6 +87,8 @@ spec:
         password: "admin"
       externalOpensearchHost: ""
       externalOpensearchPort: ""
+      curator:
+        enabled: true
       dashboard:
         enabled: false
   alerting:                # (CPU: 0.1 Core, Memory: 100 MiB) It enables users to customize alerting policies to send messages to receivers in time with different time intervals and alerting levels to choose from.
diff --git a/roles/common/tasks/escurator-install.yaml b/roles/common/tasks/escurator-install.yaml
index a1863603b..e34d0b139 100644
--- a/roles/common/tasks/escurator-install.yaml
+++ b/roles/common/tasks/escurator-install.yaml
@@ -70,5 +70,6 @@
       {{ kubesphere_dir }}/elasticsearch-curator/elasticsearch-curator-1.3.3.tgz
       -f {{ kubesphere_dir }}/elasticsearch-curator/custom-values-elasticsearch-curator.yaml
       --namespace kubesphere-logging-system
-    # when:
+    when:
+      - common.es.curator is defined and common.es.curator.enabled is defined and common.es.curator.enabled
     #   - (curator_check.stdout.find("DEPLOYED") == -1) or (curator_check.stdout.find("5.5.4-0217") == -1)
\ No newline at end of file
diff --git a/roles/common/tasks/opensearch-install.yaml b/roles/common/tasks/opensearch-install.yaml
index cab42a3b7..a4fb8b576 100644
--- a/roles/common/tasks/opensearch-install.yaml
+++ b/roles/common/tasks/opensearch-install.yaml
@@ -153,7 +153,8 @@
       {{ kubesphere_dir }}/opensearch/opensearch-curator-1.3.3.tgz
       -f {{ kubesphere_dir }}/opensearch/custom-values-opensearch-curator.yaml
       --namespace kubesphere-logging-system
-    # when:
+    when:
+      - common.opensearch.curator is defined and common.opensearch.curator.enabled is defined and common.opensearch.curator.enabled
     #   - (curator_check.stdout.find("DEPLOYED") == -1) or (curator_check.stdout.find("5.5.4-0217") == -1)
 
   - name: KubeSphere | Deploying opensearch-dashboard