NationTech/harmony
6
0
Fork 1
Code Issues 35 Pull Requests 7 Actions Packages Projects Releases 1 Wiki Activity

reset

Browse Source
This commit is contained in:
tahahawa 2025-05-16 15:35:32 -04:00
parent cae7d8ead3
commit 45b10fdf25
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
harmony/src/modules/lamp.rs
View File

@ -135,6 +135,7 @@ impl<T: Topology + K8sclient + HelmCommand> Interpret<T> for LAMPInterpret {
info!("LAMP deployment_score {deployment_score:?}"); info!("LAMP deployment_score {deployment_score:?}");
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
let lamp_ingress = K8sIngressScore { let lamp_ingress = K8sIngressScore {
name: fqdn!("lamp-ingress"), name: fqdn!("lamp-ingress"),
@ -163,6 +164,32 @@ impl<T: Topology + K8sclient + HelmCommand> Interpret<T> for LAMPInterpret {
Ok(Outcome::success("Successfully deployed LAMP Stack!".to_string())) Ok(Outcome::success("Successfully deployed LAMP Stack!".to_string()))
======= =======
>>>>>>> f7f32d4 (Still WIP but pretty much done) >>>>>>> f7f32d4 (Still WIP but pretty much done)
||||||| parent of ad7ca39 (reset)
=======
let lamp_ingress = K8sIngressScore {
name: fqdn!("lamp-ingress"),
host: fqdn!("test"),
backend_service: fqdn!(
<LAMPScore as Score<T>>::name(&self.score)
.to_case(Case::Kebab)
.as_str()
),
port: 8080,
path: Some(ingress_path!("/")),
path_type: None,
namespace: self
.get_namespace()
.map(|nbs| fqdn!(nbs.to_string().as_str())),
};
lamp_ingress
.create_interpret()
.execute(inventory, topology)
.await?;
info!("LAMP lamp_ingress {lamp_ingress:?}");
>>>>>>> ad7ca39 (reset)
Ok(Outcome::success( Ok(Outcome::success(
"Successfully deployed LAMP Stack!".to_string(), "Successfully deployed LAMP Stack!".to_string(),
)) ))
@ -215,7 +242,7 @@ impl LAMPInterpret {
create_namespace: true, create_namespace: true,
install_only: false, install_only: false,
values_yaml: None, values_yaml: None,
repo_url: None, repository: None,
}; };
score.create_interpret().execute(inventory, topology).await score.create_interpret().execute(inventory, topology).await

6
harmony/src/modules/monitoring/kube_prometheus.rs
View File

@ -36,7 +36,7 @@ additionalPrometheusRulesMap:
namespace: Some(NonBlankString::from_str(ns).unwrap()), namespace: Some(NonBlankString::from_str(ns).unwrap()),
release_name: NonBlankString::from_str("kube-prometheus").unwrap(), release_name: NonBlankString::from_str("kube-prometheus").unwrap(),
chart_name: NonBlankString::from_str( chart_name: NonBlankString::from_str(
"kube-prometheus-stack", //use kube prometheus chart which includes grafana, prometheus, alert "oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack", //use kube prometheus chart which includes grafana, prometheus, alert
//manager, etc //manager, etc
) )
.unwrap(), .unwrap(),
@ -45,8 +45,6 @@ additionalPrometheusRulesMap:
values_yaml: Some(values.to_string()), values_yaml: Some(values.to_string()),
create_namespace: true, create_namespace: true,
install_only: true, install_only: true,
repo_url: Some( repository: None,
NonBlankString::from_str("oci://ghcr.io/prometheus-community/charts/").unwrap(),
),
} }
} }