Merge pull request #2005 from ks-ci-bot/cherry-pick-2004-to-release-3.3

[release-3.3] add servicemesh configuration migration
kubesphere · May 30, 2022 · 8402e80 · 8402e80
2 parents 00d6640 + 05bba84
commit 8402e80
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/controller/installRunner.py b/controller/installRunner.py
@@ -599,6 +599,29 @@ def generate_new_cluster_configuration(api):
             }
         del cluster_configuration_spec["networkpolicy"]
 
+    if "terminal" not in cluster_configuration_spec:
+        upgrade_flag = True
+        cluster_configuration_spec["terminal"] = {
+            "timeout": 600
+        }
+
+    # add servicemesh configuration migration
+    if "servicemesh" in cluster_configuration_spec and "istio" not in cluster_configuration_spec["servicemesh"]:
+        upgrade_flag = True
+        cluster_configuration_spec["servicemesh"]["istio"] = {
+            "components": {
+                "ingressGateways": [
+                    {
+                        "name": "istio-ingressgateway",
+                        "enabled": False
+                    }
+                ],
+                "cni": {
+                    "enabled": False
+                }
+            }
+        }
+
     # add edgeruntime configuration migration
     if "kubeedge" in cluster_configuration_spec:
         upgrade_flag = True