jlengrand/engine
1
0
Fork 0
mirror of https://github.com/jlengrand/engine.git synced 2026-03-10 08:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: DO kubeconfig retrieval cluster name (#662)

Browse Source
This commit is contained in:
BenjaminCh
2022-03-25 01:07:41 +01:00
committed by GitHub
parent 262efda972
commit 804fb1b990
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cloud_provider/digitalocean/kubernetes/doks_api.rs
View File

@@ -95,7 +95,7 @@ pub fn get_do_kubeconfig_by_cluster_name(token: &str, cluster_name: &str) -> Res
let cluster_name = cluster_name.trim().to_lowercase();
match clusters_copy
.into_iter()
.filter(|cluster| cluster.name.trim().to_lowercase() == cluster_name.to_string())
.filter(|cluster| cluster.name.trim().to_lowercase() == cluster_name)
.collect::<Vec<KubernetesCluster>>()
.first()
{

10
src/cloud_provider/digitalocean/kubernetes/mod.rs
View File

@@ -187,6 +187,11 @@ impl DOKS {
format!("{}.yaml", self.id)
}
// TODO(benjaminch): Very dirty quickfix, should be removed and cluster id / name should be handled globally
fn doks_cluster_name(&self) -> String {
format!("qovery-{}", self.id)
}
// create a context to render tf files (terraform) contained in lib/digitalocean/
fn tera_context(&self) -> Result<TeraContext, EngineError> {
let event_details = self.get_event_details(Stage::Infrastructure(InfrastructureStep::LoadConfiguration));
@@ -1738,7 +1743,10 @@ impl Kubernetes for DOKS {
)),
},
None => {
let kubeconfig = match get_do_kubeconfig_by_cluster_name(self.cloud_provider.token(), self.name()) {
let kubeconfig = match get_do_kubeconfig_by_cluster_name(
self.cloud_provider.token(),
self.doks_cluster_name().as_str(),
) {
Ok(kubeconfig) => match kubeconfig {
None => {
return Err(EngineError::new_cannot_retrieve_cluster_config_file(