feat: Add support for shared values files.

src/config.rs

@@ -11,6 +11,20 @@ use serde::{Deserialize, Serialize, Serializer};
 
 use crate::utils::filename_to_string;
 
+
+#[derive(Deserialize, Debug)]
+pub enum ValuesFormat {
+    PlainText,
+    Vals,
+    Sops,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct ValuesFile {
+    pub path: PathBuf,
+    pub format: ValuesFormat,
+}
+
 /// A Env config file.
 ///
 /// Retrieved from `./envs/$env/config.yaml`.
@@ -93,7 +107,7 @@ pub enum AnnouncePolicy {
 /// A release config file.
 ///
 /// Retrieved from `./envs/$env/$cluster/$release_dir/config.yaml`.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct ReleaseConfig {
     #[serde(alias = "charts-version")]
     pub charts_version: Option<String>,
@@ -106,6 +120,14 @@ pub struct ReleaseConfig {
     pub release_chart: ChartReference,
     pub depends: Option<Vec<ReleaseReference>>,
     pub announce_policy: Option<AnnouncePolicy>,
+
+    /// These files are processed first have have lowest priority.
+    #[serde(default)]
+    pub base_values_files: Vec<ValuesFile>,
+
+    /// These files are processed last and have highest priority.
+    #[serde(default)]
+    pub override_values_files: Vec<ValuesFile>,
 }
 
 /// Parsed details concerning an Env.

src/helm.rs

@@ -21,7 +21,7 @@ use url::Url;
 
 use crate::{
     command::{CommandLine, CommandResult, CommandSuccess},
-    config::{AnnouncePolicy, ChartReference, ReleaseReference},
+    config::{AnnouncePolicy, ChartReference, ReleaseReference, ValuesFile, ValuesFormat},
     output::{Message, MultiOutput},
     HelmReposLock, Update,
 };
@@ -60,19 +60,6 @@ fn aws_path() -> OsString {
 /// A unique identifier for an installation.
 pub type InstallationId = u16;
 
-#[derive(Debug)]
-pub enum ValuesFormat {
-    PlainText,
-    Vals,
-    Sops,
-}
-
-#[derive(Debug)]
-pub struct ValuesFile {
-    pub path: PathBuf,
-    pub format: ValuesFormat,
-}
-
 /// All the information required for an helm release to be processed.
 #[derive(Debug)]
 pub struct Installation {

src/main.rs

@@ -35,7 +35,7 @@ use tracing_subscriber::{Layer, Registry};
 mod command;
 
 mod helm;
-use helm::{HelmChart, Installation, ValuesFile, ValuesFormat};
+use helm::{HelmChart, Installation};
 use helm::{HelmRepo, InstallationId};
 
 mod depends;
@@ -45,7 +45,7 @@ mod output;
 use output::{Message, MultiOutput, Output, Sender};
 
 mod config;
-use config::Overrides;
+use config::{Overrides, ValuesFile, ValuesFormat};
 use config::Release;
 use config::{ChartReference, Cluster, Env};
 
@@ -587,11 +587,20 @@ fn create_installation(
     cluster: &Cluster,
     release: Release,
     id: InstallationId,
-    // helm_repos: &HelmRepos,
 ) -> Installation {
     let depends = release.config.depends.unwrap_or_default();
 
     let mut values_files: Vec<ValuesFile> = vec![];
+
+    for base_values_file in release.config.base_values_files {
+        let path = release.dir.join(&base_values_file.path);
+        let values_file = ValuesFile {
+            path,
+            format: base_values_file.format,
+        };
+        values_files.push(values_file);
+    }
+
     let values_file = release.dir.join("values.yaml");
     if values_file.is_file() {
         values_files.push(ValuesFile {
@@ -607,20 +616,13 @@ fn create_installation(
         });
     }
 
-    let encrypted_file = release.dir.join("secrets.sops.yaml");
-    if encrypted_file.is_file() {
-        values_files.push(ValuesFile {
-            path: encrypted_file,
-            format: ValuesFormat::Sops,
-        });
-    }
-
-    let encrypted_file = release.dir.join("secrets.vals.yaml");
-    if encrypted_file.is_file() {
-        values_files.push(ValuesFile {
-            path: encrypted_file,
-            format: ValuesFormat::Vals,
-        });
+    for override_values_file in release.config.override_values_files {
+        let path = release.dir.join(&override_values_file.path);
+        let values_file = ValuesFile {
+            path,
+            format: override_values_file.format,
+        };
+        values_files.push(values_file);
     }
 
     // Turn legacy config into new config