This commit is contained in:
parent
d0d80aee28
commit
c573e7f64c
@ -1,19 +1,14 @@
|
|||||||
use std::{path::PathBuf, sync::Arc};
|
use std::{path::PathBuf, sync::Arc};
|
||||||
|
|
||||||
use harmony::{
|
use harmony::{
|
||||||
data::Id,
|
|
||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
maestro::Maestro,
|
maestro::Maestro,
|
||||||
modules::{
|
modules::application::{
|
||||||
application::{
|
|
||||||
ApplicationScore, RustWebFramework, RustWebapp,
|
ApplicationScore, RustWebFramework, RustWebapp,
|
||||||
features::{ContinuousDelivery, Monitoring},
|
features::{ContinuousDelivery, Monitoring},
|
||||||
},
|
},
|
||||||
tenant::TenantScore,
|
|
||||||
},
|
|
||||||
topology::{
|
topology::{
|
||||||
K8sAnywhereTopology, Url,
|
K8sAnywhereTopology, Url,
|
||||||
tenant::{ResourceLimits, TenantConfig, TenantNetworkPolicy},
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -2,10 +2,7 @@ use derive_new::new;
|
|||||||
use futures_util::StreamExt;
|
use futures_util::StreamExt;
|
||||||
use k8s_openapi::{
|
use k8s_openapi::{
|
||||||
ClusterResourceScope, NamespaceResourceScope,
|
ClusterResourceScope, NamespaceResourceScope,
|
||||||
api::{
|
api::{apps::v1::Deployment, core::v1::Pod},
|
||||||
apps::v1::Deployment,
|
|
||||||
core::v1::Pod,
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
use kube::{
|
use kube::{
|
||||||
Client, Config, Error, Resource,
|
Client, Config, Error, Resource,
|
||||||
|
|||||||
@ -29,6 +29,8 @@ pub struct Helm {
|
|||||||
#[derive(Clone, Debug, Serialize)]
|
#[derive(Clone, Debug, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct Source {
|
pub struct Source {
|
||||||
|
// Using string for this because URL enforces a URL scheme at the beginning but Helm, ArgoCD, etc do not, and it can be counterproductive,
|
||||||
|
// as the only way I've found to get OCI working isn't by using oci:// but rather no scheme at all
|
||||||
#[serde(rename = "repoURL")]
|
#[serde(rename = "repoURL")]
|
||||||
pub repo_url: String,
|
pub repo_url: String,
|
||||||
pub target_revision: Option<String>,
|
pub target_revision: Option<String>,
|
||||||
@ -256,7 +258,6 @@ spec:
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use pretty_assertions::assert_eq;
|
use pretty_assertions::assert_eq;
|
||||||
|
|
||||||
|
|
||||||
use crate::modules::application::features::{
|
use crate::modules::application::features::{
|
||||||
ArgoApplication, Automated, Backoff, Helm, Retry, Source, SyncPolicy,
|
ArgoApplication, Automated, Backoff, Helm, Retry, Source, SyncPolicy,
|
||||||
|
|||||||
@ -8,7 +8,6 @@ use crate::{
|
|||||||
application::ApplicationFeature,
|
application::ApplicationFeature,
|
||||||
monitoring::{
|
monitoring::{
|
||||||
alert_channel::webhook_receiver::WebhookReceiver,
|
alert_channel::webhook_receiver::WebhookReceiver,
|
||||||
application_monitoring::k8s_application_monitoring_score::ApplicationPrometheusMonitoringScore,
|
|
||||||
kube_prometheus::{
|
kube_prometheus::{
|
||||||
helm_prometheus_alert_score::HelmPrometheusAlertingScore,
|
helm_prometheus_alert_score::HelmPrometheusAlertingScore,
|
||||||
types::{NamespaceSelector, ServiceMonitor},
|
types::{NamespaceSelector, ServiceMonitor},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user