connected ingress to servicemodified rust application helm chart deployment to not use tls and cert-manager annotation

examples/try_rust_webapp/src/main.rs

@@ -3,7 +3,7 @@ use harmony::{
     modules::{
         application::{
             ApplicationScore, RustWebFramework, RustWebapp,
-            features::{ContinuousDelivery, Monitoring},
+            features::{ContinuousDelivery, Monitoring, rhob_monitoring::RHOBMonitoring},
         },
         monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
     },
@@ -31,7 +31,7 @@ async fn main() {
             Box::new(ContinuousDelivery {
                 application: application.clone(),
             }),
-            Box::new(Monitoring {
+            Box::new(RHOBMonitoring {
                 application: application.clone(),
                 alert_receiver: vec![Box::new(discord_receiver)],
             }),

harmony/src/modules/application/rust.rs

@@ -464,7 +464,6 @@ ingress:
   enabled: true
   # Annotations for cert-manager to handle SSL.
   annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
     # Add other annotations like nginx ingress class if needed
     # kubernetes.io/ingress.class: nginx
   hosts:
@@ -472,13 +471,8 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
-  tls:
-   - secretName: {}-tls
-     hosts:
-       - {}
-
 "#,
-            chart_name, image_repo, image_tag, self.service_port, domain, self.name, domain
+            chart_name, image_repo, image_tag, self.service_port, domain,
         );
         fs::write(chart_dir.join("values.yaml"), values_yaml)?;
 

harmony/src/modules/k8s/ingress.rs

@@ -56,9 +56,7 @@ impl<T: Topology + K8sclient> Score<T> for K8sIngressScore {
         };
 
         let ingress_class = match self.ingress_class_name.clone() {
-            Some(ingress_class_name) => {
+            Some(ingress_class_name) => ingress_class_name,
-                 ingress_class_name
-            }
             None => format!("\"default\""),
         };
 

harmony/src/modules/prometheus/rhob_alerting_score.rs

@@ -275,9 +275,11 @@ impl RHOBAlertingInterpret {
             .await
             .map_err(|e| InterpretError::new(e.to_string()))?;
 
-        let alert_manager_domain = topology.get_domain("alert-manager".into()).await?;
+        let alert_manager_domain = topology
+            .get_domain(format!("alert-manager-{}", self.sender.namespace.clone()))
+            .await?;
         let name = format!("{}-alert-manager", self.sender.namespace.clone());
-        let backend_service = format!("{}-alert-manager", self.sender.namespace.clone());
+        let backend_service = format!("alertmanager-operated");
         let namespace = self.sender.namespace.clone();
         let alert_manager_ingress = K8sIngressScore {
             name: fqdn!(&name),
@@ -290,9 +292,11 @@ impl RHOBAlertingInterpret {
             ingress_class_name: Some("openshift-default".to_string()),
         };
 
-        let prometheus_domain = topology.get_domain("prometheus".into()).await?;
+        let prometheus_domain = topology
+            .get_domain(format!("prometheus-{}", self.sender.namespace.clone()))
+            .await?;
         let name = format!("{}-prometheus", self.sender.namespace.clone());
-        let backend_service = format!("{}-prometheus", self.sender.namespace.clone());
+        let backend_service = format!("prometheus-operated");
         let prometheus_ingress = K8sIngressScore {
             name: fqdn!(&name),
             host: fqdn!(&prometheus_domain),
@@ -511,14 +515,16 @@ impl RHOBAlertingInterpret {
             .apply(&grafana, Some(&self.sender.namespace.clone()))
             .await
             .map_err(|e| InterpretError::new(e.to_string()))?;
-        let domain = topology.get_domain("grafana".into()).await?;
+        let domain = topology
+            .get_domain(format!("grafana-{}", self.sender.namespace.clone()))
+            .await?;
         let name = format!("{}-grafana", self.sender.namespace.clone());
-        let backend_service = format!("{}-grafana", self.sender.namespace.clone());
+        let backend_service = format!("grafana-{}-service", self.sender.namespace.clone());
         let grafana_ingress = K8sIngressScore {
             name: fqdn!(&name),
             host: fqdn!(&domain),
             backend_service: fqdn!(&backend_service),
-            port: 9090,
+            port: 3000,
             path: Some("/".to_string()),
             path_type: Some(PathType::Prefix),
             namespace: Some(fqdn!(&namespace)),