Merge pull request #3578 from etungsten/wassupdog

shared-defaults: add missing updog to list of network-affected services
bottlerocket-os · Nov 7, 2023 · dbf9ed1 · dbf9ed1
2 parents 42ee808 + 6014898
commit dbf9ed1
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 8 deletions.
diff --git a/Release.toml b/Release.toml
@@ -246,3 +246,6 @@ version = "1.16.0"
     "migrate_v1.16.0_public-control-container-v0-7-5.lz4",
     "migrate_v1.16.0_schnauzer-v2-generators.lz4",
 ]
+"(1.16.0, 1.16.1)" = [
+    "migrate_v1.16.1_updog-network-affected.lz4",
+]
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -78,6 +78,7 @@ members = [
     "api/migration/migrations/v1.16.0/aws-control-container-v0-7-5",
     "api/migration/migrations/v1.16.0/public-control-container-v0-7-5",
     "api/migration/migrations/v1.16.0/schnauzer-v2-generators",
+    "api/migration/migrations/v1.16.1/updog-network-affected",
 
     "bloodhound",
 

diff --git a/sources/api/migration/migrations/v1.16.1/updog-network-affected/Cargo.toml b/sources/api/migration/migrations/v1.16.1/updog-network-affected/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "updog-network-affected"
+version = "0.1.0"
+authors = ["Erikson Tung <etung@amazon.com>"]
+license = "Apache-2.0 OR MIT"
+edition = "2021"
+publish = false
+
+[dependencies]
+migration-helpers = { path = "../../../migration-helpers", version = "0.1.0" }
diff --git a/sources/api/migration/migrations/v1.16.1/updog-network-affected/src/main.rs b/sources/api/migration/migrations/v1.16.1/updog-network-affected/src/main.rs
@@ -0,0 +1,81 @@
+use migration_helpers::common_migrations::{
+    MetadataListReplacement, ReplaceMetadataListsMigration,
+};
+use migration_helpers::{migrate, Result};
+use std::process;
+
+/// We updated the 'affected-services' list metadata for 'settings.network' to include
+/// updog. The metadata list need to be restored to the prior value on downgrade and
+/// updated to include updog on upgrades.
+/// We're trying to match old values for different variants.
+fn run() -> Result<()> {
+    migrate(ReplaceMetadataListsMigration(vec![
+        MetadataListReplacement {
+            setting: "settings.network",
+            metadata: "affected-services",
+            old_vals: &["containerd", "host-containerd", "host-containers"],
+            new_vals: &["containerd", "host-containerd", "host-containers", "updog"],
+        },
+        // For K8S variants
+        MetadataListReplacement {
+            setting: "settings.network",
+            metadata: "affected-services",
+            old_vals: &[
+                "containerd",
+                "kubernetes",
+                "host-containerd",
+                "host-containers",
+            ],
+            new_vals: &[
+                "containerd",
+                "kubernetes",
+                "host-containerd",
+                "host-containers",
+                "updog",
+            ],
+        },
+        // For the ECS variants
+        MetadataListReplacement {
+            setting: "settings.network",
+            metadata: "affected-services",
+            old_vals: &[
+                "containerd",
+                "docker",
+                "ecs",
+                "host-containerd",
+                "host-containers",
+            ],
+            new_vals: &[
+                "containerd",
+                "docker",
+                "ecs",
+                "host-containerd",
+                "host-containers",
+                "updog",
+            ],
+        },
+        // For *-dev variants
+        MetadataListReplacement {
+            setting: "settings.network",
+            metadata: "affected-services",
+            old_vals: &["containerd", "docker", "host-containerd", "host-containers"],
+            new_vals: &[
+                "containerd",
+                "docker",
+                "host-containerd",
+                "host-containers",
+                "updog",
+            ],
+        },
+    ]))
+}
+
+// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
+// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
+// https://github.com/shepmaster/snafu/issues/110
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        process::exit(1);
+    }
+}
diff --git a/sources/models/shared-defaults/defaults.toml b/sources/models/shared-defaults/defaults.toml
@@ -78,7 +78,7 @@ path = "/etc/network/proxy.env"
 template-path = "/usr/share/templates/proxy-env"
 
 [metadata.settings.network]
-affected-services = ["containerd", "host-containerd", "host-containers"]
+affected-services = ["containerd", "host-containerd", "host-containers", "updog"]
 
 [metadata.settings.network.hostname]
 affected-services = ["hostname", "hosts"]

diff --git a/sources/models/shared-defaults/ecs.toml b/sources/models/shared-defaults/ecs.toml
@@ -22,7 +22,7 @@ service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "dock
 
 # Network
 [metadata.settings.network]
-affected-services = ["containerd", "docker", "ecs", "host-containerd", "host-containers"]
+affected-services = ["containerd", "docker", "ecs", "host-containerd", "host-containers", "updog"]
 
 # Image registry credentials
 [metadata.settings.container-registry.credentials]

diff --git a/sources/models/shared-defaults/kubernetes-aws.toml b/sources/models/shared-defaults/kubernetes-aws.toml
@@ -20,7 +20,7 @@ affected-services = ["kubernetes", "containerd"]
 service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "kubelet"]
 
 [metadata.settings.network]
-affected-services = ["containerd", "kubernetes", "host-containerd", "host-containers"]
+affected-services = ["containerd", "kubernetes", "host-containerd", "host-containers", "updog"]
 
 [services.autoscaling-warm-pool]
 configuration-files = ["warm-pool-wait-toml"]

diff --git a/sources/models/shared-defaults/kubernetes-metal.toml b/sources/models/shared-defaults/kubernetes-metal.toml
@@ -16,4 +16,4 @@ service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "kube
 
 # Network
 [metadata.settings.network]
-affected-services = ["containerd", "kubernetes", "host-containerd", "host-containers"]
+affected-services = ["containerd", "kubernetes", "host-containerd", "host-containers", "updog"]
diff --git a/sources/models/shared-defaults/kubernetes-vmware.toml b/sources/models/shared-defaults/kubernetes-vmware.toml
@@ -16,4 +16,4 @@ service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "kube
 
 # Network
 [metadata.settings.network]
-affected-services = ["containerd", "kubernetes", "host-containerd", "host-containers"]
+affected-services = ["containerd", "kubernetes", "host-containerd", "host-containers", "updog"]
diff --git a/sources/models/src/aws-dev/defaults.d/50-aws-dev.toml b/sources/models/src/aws-dev/defaults.d/50-aws-dev.toml
@@ -5,4 +5,4 @@ service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "dock
 
 # Network
 [metadata.settings.network]
-affected-services = ["containerd", "docker", "host-containerd", "host-containers"]
+affected-services = ["containerd", "docker", "host-containerd", "host-containers", "updog"]
diff --git a/sources/models/src/metal-dev/defaults.d/50-metal-dev.toml b/sources/models/src/metal-dev/defaults.d/50-metal-dev.toml
@@ -5,4 +5,4 @@ service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "dock
 
 # Network
 [metadata.settings.network]
-affected-services = ["containerd", "docker", "host-containerd", "host-containers"]
+affected-services = ["containerd", "docker", "host-containerd", "host-containers", "updog"]
diff --git a/sources/models/src/vmware-dev/defaults.d/50-vmware-dev.toml b/sources/models/src/vmware-dev/defaults.d/50-vmware-dev.toml
@@ -5,4 +5,4 @@ service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "dock
 
 # Network
 [metadata.settings.network]
-affected-services = ["containerd", "docker", "host-containerd", "host-containers"]
+affected-services = ["containerd", "docker", "host-containerd", "host-containers", "updog"]