Bladeren bron

HUE-8330 [cluster] Start simplifying get_clusters

Romain 6 jaren geleden
bovenliggende
commit
f34cfbdad1
2 gewijzigde bestanden met toevoegingen van 15 en 20 verwijderingen
  1. 12 12
      desktop/core/src/desktop/conf.py
  2. 3 8
      desktop/core/src/desktop/models.py

+ 12 - 12
desktop/core/src/desktop/conf.py

@@ -1722,6 +1722,18 @@ def get_clusters(user):
   clusters = []
   cluster_config = CLUSTERS.get()
 
+  # Backward compatibility when not using clusters
+  if not cluster_config:
+    clusters.append(
+      (CLUSTER_ID.get(), {
+        'id': CLUSTER_ID.get(),
+        'name': CLUSTER_ID.get(),
+        'type': 'direct',
+        'credentials': {},
+        }
+      )
+    )
+
   for i in cluster_config:
     # Get additional remote multi clusters
     clusters.append(
@@ -1734,18 +1746,6 @@ def get_clusters(user):
       )
     )
 
-  # Get traditional services in regular ini too
-  if not IS_MULTICLUSTER_ONLY.get():
-    clusters.append(
-      (CLUSTER_ID.get(), {
-        'id': CLUSTER_ID.get(),
-        'name': CLUSTER_ID.get(),
-        'type': 'plain',
-        'credentials': {},
-        }
-      )
-    )
-
   return OrderedDict(clusters)
 
 

+ 3 - 8
desktop/core/src/desktop/models.py

@@ -1935,15 +1935,10 @@ class Cluster():
     self.user = user
     self.clusters = get_clusters(user)
 
-    if len(self.clusters) == 1:
-      self.data = self.clusters.values()[0]
-    elif IS_K8S_ONLY.get():
-      self.data = self.clusters['AltusV2']
-      self.data['type'] = 'altus' # To show simplified UI
-    elif IS_MULTICLUSTER_ONLY.get():
-      self.data = self.clusters['Altus']
+    if IS_MULTICLUSTER_ONLY.get():
+      self.data = self.clusters['Altus'] # Backward compatibility
     else:
-      self.data = self.clusters[CLUSTER_ID.get()]
+      self.data = self.clusters.values()[0] # Next: CLUSTER_ID.get() or user persisted
 
   def get_type(self):
     return self.data['type']