Merge remote-tracking branch 'origin/master' into feat/impl_installable_crd_prometheus
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Run Check Script / check (pull_request) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Run Check Script / check (pull_request) Has been cancelled
				
			This commit is contained in:
		
						commit
						c0d54a4466
					
				
							
								
								
									
										24
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										24
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							| @ -1795,6 +1795,18 @@ dependencies = [ | ||||
|  "url", | ||||
| ] | ||||
| 
 | ||||
| [[package]] | ||||
| name = "example-openbao" | ||||
| version = "0.1.0" | ||||
| dependencies = [ | ||||
|  "harmony", | ||||
|  "harmony_cli", | ||||
|  "harmony_macros", | ||||
|  "harmony_types", | ||||
|  "tokio", | ||||
|  "url", | ||||
| ] | ||||
| 
 | ||||
| [[package]] | ||||
| name = "example-opnsense" | ||||
| version = "0.1.0" | ||||
| @ -1810,6 +1822,18 @@ dependencies = [ | ||||
|  "url", | ||||
| ] | ||||
| 
 | ||||
| [[package]] | ||||
| name = "example-penpot" | ||||
| version = "0.1.0" | ||||
| dependencies = [ | ||||
|  "harmony", | ||||
|  "harmony_cli", | ||||
|  "harmony_macros", | ||||
|  "harmony_types", | ||||
|  "tokio", | ||||
|  "url", | ||||
| ] | ||||
| 
 | ||||
| [[package]] | ||||
| name = "example-pxe" | ||||
| version = "0.1.0" | ||||
|  | ||||
							
								
								
									
										14
									
								
								examples/openbao/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								examples/openbao/Cargo.toml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,14 @@ | ||||
| [package] | ||||
| name = "example-openbao" | ||||
| edition = "2024" | ||||
| version.workspace = true | ||||
| readme.workspace = true | ||||
| license.workspace = true | ||||
| 
 | ||||
| [dependencies] | ||||
| harmony = { path = "../../harmony" } | ||||
| harmony_cli = { path = "../../harmony_cli" } | ||||
| harmony_macros = { path = "../../harmony_macros" } | ||||
| harmony_types = { path = "../../harmony_types" } | ||||
| tokio.workspace = true | ||||
| url.workspace = true | ||||
							
								
								
									
										7
									
								
								examples/openbao/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								examples/openbao/README.md
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,7 @@ | ||||
| To install an openbao instance with harmony simply `cargo run -p example-openbao` . | ||||
| 
 | ||||
| Depending on your environement configuration, it will either install a k3d cluster locally and deploy on it, or install to a remote cluster. | ||||
| 
 | ||||
| Then follow the openbao documentation to initialize and unseal, this will make openbao usable. | ||||
| 
 | ||||
| https://openbao.org/docs/platform/k8s/helm/run/ | ||||
							
								
								
									
										67
									
								
								examples/openbao/src/main.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								examples/openbao/src/main.rs
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,67 @@ | ||||
| use std::{collections::HashMap, str::FromStr}; | ||||
| 
 | ||||
| use harmony::{ | ||||
|     inventory::Inventory, | ||||
|     modules::helm::chart::{HelmChartScore, HelmRepository, NonBlankString}, | ||||
|     topology::K8sAnywhereTopology, | ||||
| }; | ||||
| use harmony_macros::hurl; | ||||
| 
 | ||||
| #[tokio::main] | ||||
| async fn main() { | ||||
|     let values_yaml = Some( | ||||
|         r#"server:
 | ||||
|   standalone: | ||||
|     enabled: true | ||||
|     config: | | ||||
|       listener "tcp" { | ||||
|         tls_disable = true | ||||
|         address = "[::]:8200" | ||||
|         cluster_address = "[::]:8201" | ||||
|       } | ||||
| 
 | ||||
|       storage "file" { | ||||
|         path = "/openbao/data" | ||||
|       } | ||||
| 
 | ||||
|   service: | ||||
|     enabled: true | ||||
| 
 | ||||
|   dataStorage: | ||||
|     enabled: true | ||||
|     size: 10Gi | ||||
|     storageClass: null | ||||
|     accessMode: ReadWriteOnce | ||||
| 
 | ||||
|   auditStorage: | ||||
|     enabled: true | ||||
|     size: 10Gi | ||||
|     storageClass: null | ||||
|     accessMode: ReadWriteOnce"#
 | ||||
|             .to_string(), | ||||
|     ); | ||||
|     let openbao = HelmChartScore { | ||||
|         namespace: Some(NonBlankString::from_str("openbao").unwrap()), | ||||
|         release_name: NonBlankString::from_str("openbao").unwrap(), | ||||
|         chart_name: NonBlankString::from_str("openbao/openbao").unwrap(), | ||||
|         chart_version: None, | ||||
|         values_overrides: None, | ||||
|         values_yaml, | ||||
|         create_namespace: true, | ||||
|         install_only: true, | ||||
|         repository: Some(HelmRepository::new( | ||||
|             "openbao".to_string(), | ||||
|             hurl!("https://openbao.github.io/openbao-helm"), | ||||
|             true, | ||||
|         )), | ||||
|     }; | ||||
| 
 | ||||
|     harmony_cli::run( | ||||
|         Inventory::autoload(), | ||||
|         K8sAnywhereTopology::from_env(), | ||||
|         vec![Box::new(openbao)], | ||||
|         None, | ||||
|     ) | ||||
|     .await | ||||
|     .unwrap(); | ||||
| } | ||||
| @ -1,22 +1,20 @@ | ||||
| use std::time::Duration; | ||||
| 
 | ||||
| use derive_new::new; | ||||
| use http::StatusCode; | ||||
| use k8s_openapi::{ | ||||
|     ClusterResourceScope, NamespaceResourceScope, | ||||
|     api::{ | ||||
|         apps::v1::Deployment, | ||||
|         authentication::v1::{TokenRequest, TokenRequestSpec, TokenRequestStatus}, | ||||
|         core::v1::{Pod, ServiceAccount}, | ||||
|     }, | ||||
|     apimachinery::pkg::version::Info, | ||||
| }; | ||||
| use kube::{ | ||||
|     Client, Config, Discovery, Error, Resource, | ||||
|     api::{ | ||||
|         Api, AttachParams, DeleteParams, ListParams, ObjectMeta, Patch, PatchParams, PostParams, | ||||
|         ResourceExt, | ||||
|     }, | ||||
|     api::{Api, AttachParams, DeleteParams, ListParams, Patch, PatchParams, ResourceExt}, | ||||
|     config::{KubeConfigOptions, Kubeconfig}, | ||||
|     core::ErrorResponse, | ||||
|     error::DiscoveryError, | ||||
|     runtime::reflector::Lookup, | ||||
| }; | ||||
| use kube::{api::DynamicObject, runtime::conditions}; | ||||
| @ -26,9 +24,9 @@ use kube::{ | ||||
| }; | ||||
| use log::{debug, error, trace}; | ||||
| use serde::{Serialize, de::DeserializeOwned}; | ||||
| use serde_json::{Value, json}; | ||||
| use serde_json::json; | ||||
| use similar::TextDiff; | ||||
| use tokio::io::AsyncReadExt; | ||||
| use tokio::{io::AsyncReadExt, time::sleep}; | ||||
| 
 | ||||
| #[derive(new, Clone)] | ||||
| pub struct K8sClient { | ||||
| @ -178,6 +176,41 @@ impl K8sClient { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     pub async fn wait_for_pod_ready( | ||||
|         &self, | ||||
|         pod_name: &str, | ||||
|         namespace: Option<&str>, | ||||
|     ) -> Result<(), Error> { | ||||
|         let mut elapsed = 0; | ||||
|         let interval = 5; // seconds between checks
 | ||||
|         let timeout_secs = 120; | ||||
|         loop { | ||||
|             let pod = self.get_pod(pod_name, namespace).await?; | ||||
| 
 | ||||
|             if let Some(p) = pod { | ||||
|                 if let Some(status) = p.status { | ||||
|                     if let Some(phase) = status.phase { | ||||
|                         if phase.to_lowercase() == "running" { | ||||
|                             return Ok(()); | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
| 
 | ||||
|             if elapsed >= timeout_secs { | ||||
|                 return Err(Error::Discovery(DiscoveryError::MissingResource(format!( | ||||
|                     "'{}' in ns '{}' did not become ready within {}s", | ||||
|                     pod_name, | ||||
|                     namespace.unwrap(), | ||||
|                     timeout_secs | ||||
|                 )))); | ||||
|             } | ||||
| 
 | ||||
|             sleep(Duration::from_secs(interval)).await; | ||||
|             elapsed += interval; | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     /// Will execute a commond in the first pod found that matches the specified label
 | ||||
|     /// '{label}={name}'
 | ||||
|     pub async fn exec_app_capture_output( | ||||
| @ -444,9 +477,12 @@ impl K8sClient { | ||||
|             .as_str() | ||||
|             .expect("couldn't get kind as str"); | ||||
| 
 | ||||
|         let split: Vec<&str> = api_version.splitn(2, "/").collect(); | ||||
|         let g = split[0]; | ||||
|         let v = split[1]; | ||||
|         let mut it = api_version.splitn(2, '/'); | ||||
|         let first = it.next().unwrap(); | ||||
|         let (g, v) = match it.next() { | ||||
|             Some(second) => (first, second), | ||||
|             None => ("", first), | ||||
|         }; | ||||
| 
 | ||||
|         let gvk = GroupVersionKind::gvk(g, v, kind); | ||||
|         let api_resource = ApiResource::from_gvk(&gvk); | ||||
|  | ||||
| @ -1,4 +1,5 @@ | ||||
| use async_trait::async_trait; | ||||
| use harmony_macros::hurl; | ||||
| use kube::{Api, api::GroupVersionKind}; | ||||
| use log::{debug, warn}; | ||||
| use non_blank_string_rs::NonBlankString; | ||||
| @ -1051,7 +1052,7 @@ commitServer: | ||||
|         install_only: false, | ||||
|         repository: Some(HelmRepository::new( | ||||
|             "argo".to_string(), | ||||
|             url::Url::parse("https://argoproj.github.io/argo-helm").unwrap(), | ||||
|             hurl!("https://argoproj.github.io/argo-helm"), | ||||
|             true, | ||||
|         )), | ||||
|     } | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| use std::{collections::HashMap, str::FromStr}; | ||||
| 
 | ||||
| use harmony_macros::hurl; | ||||
| use non_blank_string_rs::NonBlankString; | ||||
| use serde::Serialize; | ||||
| use url::Url; | ||||
| @ -33,7 +34,7 @@ impl<T: Topology + HelmCommand> Score<T> for CertManagerHelmScore { | ||||
|             install_only: true, | ||||
|             repository: Some(HelmRepository::new( | ||||
|                 "jetstack".to_string(), | ||||
|                 Url::parse("https://charts.jetstack.io").unwrap(), | ||||
|                 hurl!("https://charts.jetstack.io"), | ||||
|                 true, | ||||
|             )), | ||||
|         } | ||||
|  | ||||
| @ -5,6 +5,7 @@ use crate::score::Score; | ||||
| use crate::topology::{HelmCommand, Topology}; | ||||
| use async_trait::async_trait; | ||||
| use harmony_types::id::Id; | ||||
| use harmony_types::net::Url; | ||||
| use helm_wrapper_rs; | ||||
| use helm_wrapper_rs::blocking::{DefaultHelmExecutor, HelmExecutor}; | ||||
| use log::{debug, info, warn}; | ||||
| @ -15,7 +16,6 @@ use std::path::Path; | ||||
| use std::process::{Command, Output, Stdio}; | ||||
| use std::str::FromStr; | ||||
| use temp_file::TempFile; | ||||
| use url::Url; | ||||
| 
 | ||||
| #[derive(Debug, Clone, Serialize)] | ||||
| pub struct HelmRepository { | ||||
| @ -78,7 +78,8 @@ impl HelmChartInterpret { | ||||
|             repo.name, repo.url, repo.force_update | ||||
|         ); | ||||
| 
 | ||||
|         let mut add_args = vec!["repo", "add", &repo.name, repo.url.as_str()]; | ||||
|         let repo_url = repo.url.to_string(); | ||||
|         let mut add_args = vec!["repo", "add", &repo.name, &repo_url]; | ||||
|         if repo.force_update { | ||||
|             add_args.push("--force-update"); | ||||
|         } | ||||
|  | ||||
| @ -1,364 +0,0 @@ | ||||
| use async_trait::async_trait; | ||||
| use log::debug; | ||||
| use serde::Serialize; | ||||
| use std::collections::HashMap; | ||||
| use std::io::ErrorKind; | ||||
| use std::path::PathBuf; | ||||
| use std::process::{Command, Output}; | ||||
| use temp_dir::{self, TempDir}; | ||||
| use temp_file::TempFile; | ||||
| 
 | ||||
| use crate::data::Version; | ||||
| use crate::interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}; | ||||
| use crate::inventory::Inventory; | ||||
| use crate::score::Score; | ||||
| use crate::topology::{HelmCommand, K8sclient, Topology}; | ||||
| use harmony_types::id::Id; | ||||
| 
 | ||||
| #[derive(Clone)] | ||||
| pub struct HelmCommandExecutor { | ||||
|     pub env: HashMap<String, String>, | ||||
|     pub path: Option<PathBuf>, | ||||
|     pub args: Vec<String>, | ||||
|     pub api_versions: Option<Vec<String>>, | ||||
|     pub kube_version: String, | ||||
|     pub debug: Option<bool>, | ||||
|     pub globals: HelmGlobals, | ||||
|     pub chart: HelmChart, | ||||
| } | ||||
| 
 | ||||
| #[derive(Clone)] | ||||
| pub struct HelmGlobals { | ||||
|     pub chart_home: Option<PathBuf>, | ||||
|     pub config_home: Option<PathBuf>, | ||||
| } | ||||
| 
 | ||||
| #[derive(Debug, Clone, Serialize)] | ||||
| pub struct HelmChart { | ||||
|     pub name: String, | ||||
|     pub version: Option<String>, | ||||
|     pub repo: Option<String>, | ||||
|     pub release_name: Option<String>, | ||||
|     pub namespace: Option<String>, | ||||
|     pub additional_values_files: Vec<PathBuf>, | ||||
|     pub values_file: Option<PathBuf>, | ||||
|     pub values_inline: Option<String>, | ||||
|     pub include_crds: Option<bool>, | ||||
|     pub skip_hooks: Option<bool>, | ||||
|     pub api_versions: Option<Vec<String>>, | ||||
|     pub kube_version: Option<String>, | ||||
|     pub name_template: String, | ||||
|     pub skip_tests: Option<bool>, | ||||
|     pub debug: Option<bool>, | ||||
| } | ||||
| 
 | ||||
| impl HelmCommandExecutor { | ||||
|     pub fn generate(mut self) -> Result<String, std::io::Error> { | ||||
|         if self.globals.chart_home.is_none() { | ||||
|             self.globals.chart_home = Some(PathBuf::from("charts")); | ||||
|         } | ||||
| 
 | ||||
|         if self | ||||
|             .clone() | ||||
|             .chart | ||||
|             .clone() | ||||
|             .chart_exists_locally(self.clone().globals.chart_home.unwrap()) | ||||
|             .is_none() | ||||
|         { | ||||
|             if self.chart.repo.is_none() { | ||||
|                 return Err(std::io::Error::new( | ||||
|                     ErrorKind::Other, | ||||
|                     "Chart doesn't exist locally and no repo specified", | ||||
|                 )); | ||||
|             } | ||||
|             self.clone().run_command( | ||||
|                 self.chart | ||||
|                     .clone() | ||||
|                     .pull_command(self.globals.chart_home.clone().unwrap()), | ||||
|             )?; | ||||
|         } | ||||
| 
 | ||||
|         let out = self.clone().run_command( | ||||
|             self.chart | ||||
|                 .clone() | ||||
|                 .helm_args(self.globals.chart_home.clone().unwrap()), | ||||
|         )?; | ||||
| 
 | ||||
|         // TODO: don't use unwrap here
 | ||||
|         let s = String::from_utf8(out.stdout).unwrap(); | ||||
|         debug!("helm stderr: {}", String::from_utf8(out.stderr).unwrap()); | ||||
|         debug!("helm status: {}", out.status); | ||||
|         debug!("helm output: {s}"); | ||||
| 
 | ||||
|         let clean = s.split_once("---").unwrap().1; | ||||
| 
 | ||||
|         Ok(clean.to_string()) | ||||
|     } | ||||
| 
 | ||||
|     pub fn version(self) -> Result<String, std::io::Error> { | ||||
|         let out = self.run_command(vec![ | ||||
|             "version".to_string(), | ||||
|             "-c".to_string(), | ||||
|             "--short".to_string(), | ||||
|         ])?; | ||||
| 
 | ||||
|         // TODO: don't use unwrap
 | ||||
|         Ok(String::from_utf8(out.stdout).unwrap()) | ||||
|     } | ||||
| 
 | ||||
|     pub fn run_command(mut self, mut args: Vec<String>) -> Result<Output, std::io::Error> { | ||||
|         if let Some(d) = self.debug { | ||||
|             if d { | ||||
|                 args.push("--debug".to_string()); | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         let path = if let Some(p) = self.path { | ||||
|             p | ||||
|         } else { | ||||
|             PathBuf::from("helm") | ||||
|         }; | ||||
| 
 | ||||
|         let config_home = match self.globals.config_home { | ||||
|             Some(p) => p, | ||||
|             None => PathBuf::from(TempDir::new()?.path()), | ||||
|         }; | ||||
| 
 | ||||
|         if let Some(yaml_str) = self.chart.values_inline { | ||||
|             let tf: TempFile = temp_file::with_contents(yaml_str.as_bytes()); | ||||
|             self.chart | ||||
|                 .additional_values_files | ||||
|                 .push(PathBuf::from(tf.path())); | ||||
|         }; | ||||
| 
 | ||||
|         self.env.insert( | ||||
|             "HELM_CONFIG_HOME".to_string(), | ||||
|             config_home.to_str().unwrap().to_string(), | ||||
|         ); | ||||
|         self.env.insert( | ||||
|             "HELM_CACHE_HOME".to_string(), | ||||
|             config_home.to_str().unwrap().to_string(), | ||||
|         ); | ||||
|         self.env.insert( | ||||
|             "HELM_DATA_HOME".to_string(), | ||||
|             config_home.to_str().unwrap().to_string(), | ||||
|         ); | ||||
| 
 | ||||
|         Command::new(path).envs(self.env).args(args).output() | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| impl HelmChart { | ||||
|     pub fn chart_exists_locally(self, chart_home: PathBuf) -> Option<PathBuf> { | ||||
|         let chart_path = | ||||
|             PathBuf::from(chart_home.to_str().unwrap().to_string() + "/" + &self.name.to_string()); | ||||
| 
 | ||||
|         if chart_path.exists() { | ||||
|             Some(chart_path) | ||||
|         } else { | ||||
|             None | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     pub fn pull_command(self, chart_home: PathBuf) -> Vec<String> { | ||||
|         let mut args = vec![ | ||||
|             "pull".to_string(), | ||||
|             "--untar".to_string(), | ||||
|             "--untardir".to_string(), | ||||
|             chart_home.to_str().unwrap().to_string(), | ||||
|         ]; | ||||
| 
 | ||||
|         match self.repo { | ||||
|             Some(r) => { | ||||
|                 if r.starts_with("oci://") { | ||||
|                     args.push( | ||||
|                         r.trim_end_matches("/").to_string() + "/" + self.name.clone().as_str(), | ||||
|                     ); | ||||
|                 } else { | ||||
|                     args.push("--repo".to_string()); | ||||
|                     args.push(r.to_string()); | ||||
| 
 | ||||
|                     args.push(self.name); | ||||
|                 } | ||||
|             } | ||||
|             None => args.push(self.name), | ||||
|         }; | ||||
| 
 | ||||
|         if let Some(v) = self.version { | ||||
|             args.push("--version".to_string()); | ||||
|             args.push(v.to_string()); | ||||
|         } | ||||
| 
 | ||||
|         args | ||||
|     } | ||||
| 
 | ||||
|     pub fn helm_args(self, chart_home: PathBuf) -> Vec<String> { | ||||
|         let mut args: Vec<String> = vec!["template".to_string()]; | ||||
| 
 | ||||
|         match self.release_name { | ||||
|             Some(rn) => args.push(rn.to_string()), | ||||
|             None => args.push("--generate-name".to_string()), | ||||
|         } | ||||
| 
 | ||||
|         args.push( | ||||
|             PathBuf::from(chart_home.to_str().unwrap().to_string() + "/" + self.name.as_str()) | ||||
|                 .to_str() | ||||
|                 .unwrap() | ||||
|                 .to_string(), | ||||
|         ); | ||||
| 
 | ||||
|         if let Some(n) = self.namespace { | ||||
|             args.push("--namespace".to_string()); | ||||
|             args.push(n.to_string()); | ||||
|         } | ||||
| 
 | ||||
|         if let Some(f) = self.values_file { | ||||
|             args.push("-f".to_string()); | ||||
|             args.push(f.to_str().unwrap().to_string()); | ||||
|         } | ||||
| 
 | ||||
|         for f in self.additional_values_files { | ||||
|             args.push("-f".to_string()); | ||||
|             args.push(f.to_str().unwrap().to_string()); | ||||
|         } | ||||
| 
 | ||||
|         if let Some(vv) = self.api_versions { | ||||
|             for v in vv { | ||||
|                 args.push("--api-versions".to_string()); | ||||
|                 args.push(v); | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         if let Some(kv) = self.kube_version { | ||||
|             args.push("--kube-version".to_string()); | ||||
|             args.push(kv); | ||||
|         } | ||||
| 
 | ||||
|         if let Some(crd) = self.include_crds { | ||||
|             if crd { | ||||
|                 args.push("--include-crds".to_string()); | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         if let Some(st) = self.skip_tests { | ||||
|             if st { | ||||
|                 args.push("--skip-tests".to_string()); | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         if let Some(sh) = self.skip_hooks { | ||||
|             if sh { | ||||
|                 args.push("--no-hooks".to_string()); | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         if let Some(d) = self.debug { | ||||
|             if d { | ||||
|                 args.push("--debug".to_string()); | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         args | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| #[derive(Debug, Clone, Serialize)] | ||||
| pub struct HelmChartScoreV2 { | ||||
|     pub chart: HelmChart, | ||||
| } | ||||
| 
 | ||||
| impl<T: Topology + K8sclient + HelmCommand> Score<T> for HelmChartScoreV2 { | ||||
|     fn create_interpret(&self) -> Box<dyn Interpret<T>> { | ||||
|         Box::new(HelmChartInterpretV2 { | ||||
|             score: self.clone(), | ||||
|         }) | ||||
|     } | ||||
| 
 | ||||
|     fn name(&self) -> String { | ||||
|         format!( | ||||
|             "{} {} HelmChartScoreV2", | ||||
|             self.chart | ||||
|                 .release_name | ||||
|                 .clone() | ||||
|                 .unwrap_or("Unknown".to_string()), | ||||
|             self.chart.name | ||||
|         ) | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| #[derive(Debug, Serialize)] | ||||
| pub struct HelmChartInterpretV2 { | ||||
|     pub score: HelmChartScoreV2, | ||||
| } | ||||
| impl HelmChartInterpretV2 {} | ||||
| 
 | ||||
| #[async_trait] | ||||
| impl<T: Topology + K8sclient + HelmCommand> Interpret<T> for HelmChartInterpretV2 { | ||||
|     async fn execute( | ||||
|         &self, | ||||
|         _inventory: &Inventory, | ||||
|         _topology: &T, | ||||
|     ) -> Result<Outcome, InterpretError> { | ||||
|         let _ns = self | ||||
|             .score | ||||
|             .chart | ||||
|             .namespace | ||||
|             .as_ref() | ||||
|             .unwrap_or_else(|| todo!("Get namespace from active kubernetes cluster")); | ||||
| 
 | ||||
|         let helm_executor = HelmCommandExecutor { | ||||
|             env: HashMap::new(), | ||||
|             path: None, | ||||
|             args: vec![], | ||||
|             api_versions: None, | ||||
|             kube_version: "v1.33.0".to_string(), | ||||
|             debug: Some(false), | ||||
|             globals: HelmGlobals { | ||||
|                 chart_home: None, | ||||
|                 config_home: None, | ||||
|             }, | ||||
|             chart: self.score.chart.clone(), | ||||
|         }; | ||||
| 
 | ||||
|         // let mut helm_options = Vec::new();
 | ||||
|         // if self.score.create_namespace {
 | ||||
|         //     helm_options.push(NonBlankString::from_str("--create-namespace").unwrap());
 | ||||
|         // }
 | ||||
| 
 | ||||
|         let res = helm_executor.generate(); | ||||
| 
 | ||||
|         let _output = match res { | ||||
|             Ok(output) => output, | ||||
|             Err(err) => return Err(InterpretError::new(err.to_string())), | ||||
|         }; | ||||
| 
 | ||||
|         // TODO: implement actually applying the YAML from the templating in the generate function to a k8s cluster, having trouble passing in straight YAML into the k8s client
 | ||||
| 
 | ||||
|         // let k8s_resource = k8s_openapi::serde_json::from_str(output.as_str()).unwrap();
 | ||||
| 
 | ||||
|         // let client = topology
 | ||||
|         //     .k8s_client()
 | ||||
|         //     .await
 | ||||
|         //     .expect("Environment should provide enough information to instanciate a client")
 | ||||
|         //     .apply_namespaced(&vec![output], Some(ns.to_string().as_str()));
 | ||||
|         // match client.apply_yaml(output) {
 | ||||
|         //     Ok(_) => return Ok(Outcome::success("Helm chart deployed".to_string())),
 | ||||
|         //     Err(e) => return Err(InterpretError::new(e)),
 | ||||
|         // }
 | ||||
| 
 | ||||
|         Ok(Outcome::success("Helm chart deployed".to_string())) | ||||
|     } | ||||
| 
 | ||||
|     fn get_name(&self) -> InterpretName { | ||||
|         InterpretName::HelmCommand | ||||
|     } | ||||
|     fn get_version(&self) -> Version { | ||||
|         todo!() | ||||
|     } | ||||
|     fn get_status(&self) -> InterpretStatus { | ||||
|         todo!() | ||||
|     } | ||||
|     fn get_children(&self) -> Vec<Id> { | ||||
|         todo!() | ||||
|     } | ||||
| } | ||||
| @ -1,2 +1 @@ | ||||
| pub mod chart; | ||||
| pub mod command; | ||||
|  | ||||
| @ -4,4 +4,5 @@ pub mod application_monitoring; | ||||
| pub mod grafana; | ||||
| pub mod kube_prometheus; | ||||
| pub mod ntfy; | ||||
| pub mod okd; | ||||
| pub mod prometheus; | ||||
|  | ||||
							
								
								
									
										149
									
								
								harmony/src/modules/monitoring/okd/enable_user_workload.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										149
									
								
								harmony/src/modules/monitoring/okd/enable_user_workload.rs
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,149 @@ | ||||
| use std::{collections::BTreeMap, sync::Arc}; | ||||
| 
 | ||||
| use crate::{ | ||||
|     data::Version, | ||||
|     interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, | ||||
|     inventory::Inventory, | ||||
|     score::Score, | ||||
|     topology::{K8sclient, Topology, k8s::K8sClient}, | ||||
| }; | ||||
| use async_trait::async_trait; | ||||
| use harmony_types::id::Id; | ||||
| use k8s_openapi::api::core::v1::ConfigMap; | ||||
| use kube::api::ObjectMeta; | ||||
| use serde::Serialize; | ||||
| 
 | ||||
| #[derive(Clone, Debug, Serialize)] | ||||
| pub struct OpenshiftUserWorkloadMonitoring {} | ||||
| 
 | ||||
| impl<T: Topology + K8sclient> Score<T> for OpenshiftUserWorkloadMonitoring { | ||||
|     fn name(&self) -> String { | ||||
|         "OpenshiftUserWorkloadMonitoringScore".to_string() | ||||
|     } | ||||
| 
 | ||||
|     fn create_interpret(&self) -> Box<dyn Interpret<T>> { | ||||
|         Box::new(OpenshiftUserWorkloadMonitoringInterpret {}) | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| #[derive(Clone, Debug, Serialize)] | ||||
| pub struct OpenshiftUserWorkloadMonitoringInterpret {} | ||||
| 
 | ||||
| #[async_trait] | ||||
| impl<T: Topology + K8sclient> Interpret<T> for OpenshiftUserWorkloadMonitoringInterpret { | ||||
|     async fn execute( | ||||
|         &self, | ||||
|         _inventory: &Inventory, | ||||
|         topology: &T, | ||||
|     ) -> Result<Outcome, InterpretError> { | ||||
|         let client = topology.k8s_client().await.unwrap(); | ||||
|         self.update_cluster_monitoring_config_cm(&client).await?; | ||||
|         self.update_user_workload_monitoring_config_cm(&client) | ||||
|             .await?; | ||||
|         self.verify_user_workload(&client).await?; | ||||
|         Ok(Outcome::success( | ||||
|             "successfully enabled user-workload-monitoring".to_string(), | ||||
|         )) | ||||
|     } | ||||
| 
 | ||||
|     fn get_name(&self) -> InterpretName { | ||||
|         InterpretName::Custom("OpenshiftUserWorkloadMonitoring") | ||||
|     } | ||||
| 
 | ||||
|     fn get_version(&self) -> Version { | ||||
|         todo!() | ||||
|     } | ||||
| 
 | ||||
|     fn get_status(&self) -> InterpretStatus { | ||||
|         todo!() | ||||
|     } | ||||
| 
 | ||||
|     fn get_children(&self) -> Vec<Id> { | ||||
|         todo!() | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| impl OpenshiftUserWorkloadMonitoringInterpret { | ||||
|     pub async fn update_cluster_monitoring_config_cm( | ||||
|         &self, | ||||
|         client: &Arc<K8sClient>, | ||||
|     ) -> Result<Outcome, InterpretError> { | ||||
|         let mut data = BTreeMap::new(); | ||||
|         data.insert( | ||||
|             "config.yaml".to_string(), | ||||
|             r#" | ||||
| enableUserWorkload: true | ||||
| alertmanagerMain: | ||||
|   enableUserAlertmanagerConfig: true | ||||
| "#
 | ||||
|             .to_string(), | ||||
|         ); | ||||
| 
 | ||||
|         let cm = ConfigMap { | ||||
|             metadata: ObjectMeta { | ||||
|                 name: Some("cluster-monitoring-config".to_string()), | ||||
|                 namespace: Some("openshift-monitoring".to_string()), | ||||
|                 ..Default::default() | ||||
|             }, | ||||
|             data: Some(data), | ||||
|             ..Default::default() | ||||
|         }; | ||||
|         client.apply(&cm, Some("openshift-monitoring")).await?; | ||||
| 
 | ||||
|         Ok(Outcome::success( | ||||
|             "updated cluster-monitoring-config-map".to_string(), | ||||
|         )) | ||||
|     } | ||||
| 
 | ||||
|     pub async fn update_user_workload_monitoring_config_cm( | ||||
|         &self, | ||||
|         client: &Arc<K8sClient>, | ||||
|     ) -> Result<Outcome, InterpretError> { | ||||
|         let mut data = BTreeMap::new(); | ||||
|         data.insert( | ||||
|             "config.yaml".to_string(), | ||||
|             r#" | ||||
| alertmanager:  | ||||
|   enabled: true | ||||
|   enableAlertmanagerConfig: true | ||||
| "#
 | ||||
|             .to_string(), | ||||
|         ); | ||||
|         let cm = ConfigMap { | ||||
|             metadata: ObjectMeta { | ||||
|                 name: Some("user-workload-monitoring-config".to_string()), | ||||
|                 namespace: Some("openshift-user-workload-monitoring".to_string()), | ||||
|                 ..Default::default() | ||||
|             }, | ||||
|             data: Some(data), | ||||
|             ..Default::default() | ||||
|         }; | ||||
|         client | ||||
|             .apply(&cm, Some("openshift-user-workload-monitoring")) | ||||
|             .await?; | ||||
| 
 | ||||
|         Ok(Outcome::success( | ||||
|             "updated openshift-user-monitoring-config-map".to_string(), | ||||
|         )) | ||||
|     } | ||||
| 
 | ||||
|     pub async fn verify_user_workload( | ||||
|         &self, | ||||
|         client: &Arc<K8sClient>, | ||||
|     ) -> Result<Outcome, InterpretError> { | ||||
|         let namespace = "openshift-user-workload-monitoring"; | ||||
|         let alertmanager_name = "alertmanager-user-workload-0"; | ||||
|         let prometheus_name = "prometheus-user-workload-0"; | ||||
|         client | ||||
|             .wait_for_pod_ready(alertmanager_name, Some(namespace)) | ||||
|             .await?; | ||||
|         client | ||||
|             .wait_for_pod_ready(prometheus_name, Some(namespace)) | ||||
|             .await?; | ||||
| 
 | ||||
|         Ok(Outcome::success(format!( | ||||
|             "pods: {}, {} ready in ns: {}", | ||||
|             alertmanager_name, prometheus_name, namespace | ||||
|         ))) | ||||
|     } | ||||
| } | ||||
							
								
								
									
										1
									
								
								harmony/src/modules/monitoring/okd/mod.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								harmony/src/modules/monitoring/okd/mod.rs
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | ||||
| pub mod enable_user_workload; | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user