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 jwt token for ec2

Browse Source
This commit is contained in:
Σrebe - Romain GERARD
2022-05-10 16:26:51 +02:00
parent 90056140be
commit 5a698f89e1
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cloud_provider/aws/kubernetes/ec2_helm_charts.rs
View File

@@ -346,7 +346,7 @@ pub fn ec2_aws_helm_charts(
organization_long_id: &chart_config_prerequisites.organization_long_id,
cluster_id: &chart_config_prerequisites.cluster_id,
cluster_long_id: &chart_config_prerequisites.cluster_long_id,
cluster_token: &chart_config_prerequisites.infra_options.jwt_token,
cluster_jwt_token: &chart_config_prerequisites.infra_options.jwt_token,
grpc_url: &chart_config_prerequisites.infra_options.qovery_grpc_url,
};
let shell_agent = get_chart_for_shell_agent(shell_context, chart_path)?;

2
src/cloud_provider/aws/kubernetes/eks_helm_charts.rs
View File

@@ -1001,7 +1001,7 @@ datasources:
organization_long_id: &chart_config_prerequisites.organization_long_id,
cluster_id: &chart_config_prerequisites.cluster_id,
cluster_long_id: &chart_config_prerequisites.cluster_long_id,
cluster_token: &chart_config_prerequisites.infra_options.jwt_token,
cluster_jwt_token: &chart_config_prerequisites.infra_options.jwt_token,
grpc_url: &chart_config_prerequisites.infra_options.qovery_grpc_url,
};
let shell_agent = get_chart_for_shell_agent(shell_context, chart_path)?;

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

@@ -812,7 +812,7 @@ datasources:
organization_long_id: &chart_config_prerequisites.organization_long_id,
cluster_id: &chart_config_prerequisites.cluster_id,
cluster_long_id: &chart_config_prerequisites.cluster_long_id,
cluster_token: &chart_config_prerequisites.infra_options.jwt_token,
cluster_jwt_token: &chart_config_prerequisites.infra_options.jwt_token,
grpc_url: &chart_config_prerequisites.infra_options.qovery_grpc_url,
};
let shell_agent = get_chart_for_shell_agent(shell_context, chart_path)?;

4
src/cloud_provider/helm.rs
View File

@@ -717,7 +717,7 @@ pub struct ShellAgentContext<'a> {
pub organization_long_id: &'a Uuid,
pub cluster_id: &'a str,
pub cluster_long_id: &'a Uuid,
pub cluster_token: &'a str,
pub cluster_jwt_token: &'a str,
pub grpc_url: &'a str,
}
@@ -759,7 +759,7 @@ pub fn get_chart_for_shell_agent(
},
ChartSetValue {
key: "environmentVariables.CLUSTER_JWT_TOKEN".to_string(),
value: context.cluster_token.to_string(),
value: context.cluster_jwt_token.to_string(),
},
ChartSetValue {
key: "environmentVariables.CLUSTER_ID".to_string(),

2
src/cloud_provider/scaleway/kubernetes/helm_charts.rs
View File

@@ -685,7 +685,7 @@ datasources:
organization_long_id: &chart_config_prerequisites.organization_long_id,
cluster_id: &chart_config_prerequisites.cluster_id,
cluster_long_id: &chart_config_prerequisites.cluster_long_id,
cluster_token: &chart_config_prerequisites.infra_options.jwt_token,
cluster_jwt_token: &chart_config_prerequisites.infra_options.jwt_token,
grpc_url: &chart_config_prerequisites.infra_options.qovery_grpc_url,
};
let shell_agent = get_chart_for_shell_agent(shell_context, chart_path)?;