Merge pull request #2249 from ks-ci-bot/cherry-pick-2232-to-release-3.4

[release-3.4] Fix enabling logging failure after upgrading to v3.4.0 from v3.3.1
kubesphere · Oct 26, 2023 · a3a409d · a3a409d
2 parents 9c53afd + c6c05c2
commit a3a409d
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/controller/installRunner.py b/controller/installRunner.py
@@ -547,6 +547,16 @@ def generate_new_cluster_configuration(api):
                 cluster_configuration_spec["common"]["opensearch"]["data"] = {
                     "volumeSize": "20Gi"
                 }
+            if "opensearchPrefix" not in cluster_configuration_spec["common"]["opensearch"]:
+                cluster_configuration_spec["common"]["opensearch"]["opensearchPrefix"] = "whizard"
+            if "logMaxAge" not in cluster_configuration_spec["common"]["opensearch"]:
+                cluster_configuration_spec["common"]["opensearch"]["logMaxAge"] = "7"
+            if "basicAuth" not in cluster_configuration_spec["common"]["opensearch"]:
+                cluster_configuration_spec["common"]["opensearch"]["basicAuth"] = {
+                    "enabled": True,
+                    "username": "admin",
+                    "password": "admin"
+                }
             if "opensearchMasterReplicas" in cluster_configuration_spec["common"]["opensearch"]:
                 cluster_configuration_spec["common"]["opensearch"]["master"]["replicas"] = cluster_configuration_spec["common"]["opensearch"]["elasticsearchMasterReplicas"]
                 del cluster_configuration_spec["common"]["opensearch"]["opensearchMasterReplicas"]