Compare commits
	
		
			No commits in common. "118d34db551aafc73a54775c5b4d51940dc5638a" and "24e466fadd600a6774561f5a73cbeeab6ad9476e" have entirely different histories.
		
	
	
		
			118d34db55
			...
			24e466fadd
		
	
		
@ -170,22 +170,6 @@ impl K8sAnywhereTopology {
 | 
				
			|||||||
        Ok(Some(state))
 | 
					        Ok(Some(state))
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async fn ensure_k8s_tenant_manager(&self) -> Result<(), String> {
 | 
					 | 
				
			||||||
        if let Some(_) = self.tenant_manager.get() {
 | 
					 | 
				
			||||||
            return Ok(());
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        self.tenant_manager
 | 
					 | 
				
			||||||
            .get_or_try_init(async || -> Result<K8sTenantManager, String> {
 | 
					 | 
				
			||||||
                let k8s_client = self.k8s_client().await?;
 | 
					 | 
				
			||||||
                Ok(K8sTenantManager::new(k8s_client))
 | 
					 | 
				
			||||||
            })
 | 
					 | 
				
			||||||
            .await
 | 
					 | 
				
			||||||
            .unwrap();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        Ok(())
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    fn get_k8s_tenant_manager(&self) -> Result<&K8sTenantManager, ExecutorError> {
 | 
					    fn get_k8s_tenant_manager(&self) -> Result<&K8sTenantManager, ExecutorError> {
 | 
				
			||||||
        match self.tenant_manager.get() {
 | 
					        match self.tenant_manager.get() {
 | 
				
			||||||
            Some(t) => Ok(t),
 | 
					            Some(t) => Ok(t),
 | 
				
			||||||
@ -233,10 +217,6 @@ impl Topology for K8sAnywhereTopology {
 | 
				
			|||||||
            "No K8s client could be found or installed".to_string(),
 | 
					            "No K8s client could be found or installed".to_string(),
 | 
				
			||||||
        ))?;
 | 
					        ))?;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.ensure_k8s_tenant_manager()
 | 
					 | 
				
			||||||
            .await
 | 
					 | 
				
			||||||
            .map_err(|e| InterpretError::new(e))?;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        match self.is_helm_available() {
 | 
					        match self.is_helm_available() {
 | 
				
			||||||
            Ok(()) => Ok(Outcome::success(format!(
 | 
					            Ok(()) => Ok(Outcome::success(format!(
 | 
				
			||||||
                "{} + helm available",
 | 
					                "{} + helm available",
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user