Merge pull request #3689 from sam-berning/update-settings-extension-r…

…ebase settings: add updates settings extension
bottlerocket-os · Jan 4, 2024 · 481fa35 · 481fa35
2 parents 49db7d4 + 4f722a1
commit 481fa35
Show file tree

Hide file tree

Showing 31 changed files with 270 additions and 44 deletions.
diff --git a/packages/settings-updates/Cargo.toml b/packages/settings-updates/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "settings-updates"
+version = "0.1.0"
+edition = "2021"
+publish = false
+build = "../build.rs"
+
+[lib]
+path = "../packages.rs"
+
+[package.metadata.build-package]
+source-groups = [
+    "settings-extensions/updates"
+]
+
+# RPM BuildRequires
+[build-dependencies]
+glibc = { path = "../glibc" }
+
+# RPM Requires
+[dependencies]
diff --git a/packages/settings-updates/settings-updates.spec b/packages/settings-updates/settings-updates.spec
@@ -0,0 +1,39 @@
+%global _cross_first_party 1
+%undefine _debugsource_packages
+
+%global extension_name updates
+
+Name: %{_cross_os}settings-%{extension_name}
+Version: 0.0
+Release: 0%{?dist}
+Summary: settings-%{extension_name}
+License: Apache-2.0 OR MIT
+URL: https://github.com/bottlerocket-os/bottlerocket
+
+BuildRequires: %{_cross_os}glibc-devel
+
+%description
+%{summary}.
+
+%prep
+%setup -T -c
+%cargo_prep
+
+%build
+%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
+    -p settings-extension-%{extension_name}
+
+%install
+install -d %{buildroot}%{_cross_libexecdir}
+install -p -m 0755 \
+    ${HOME}/.cache/%{__cargo_target}/release/settings-extension-%{extension_name} \
+    %{buildroot}%{_cross_libexecdir}
+
+install -d %{buildroot}%{_cross_libexecdir}/settings
+ln -sf \
+    ../settings-extension-%{extension_name} \
+    %{buildroot}%{_cross_libexecdir}/settings/%{extension_name}
+
+%files
+%{_cross_libexecdir}/settings-extension-%{extension_name}
+%{_cross_libexecdir}/settings/%{extension_name}
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 = [
     "settings-extensions/motd",
     "settings-extensions/ntp",
     "settings-extensions/container-registry",
+    "settings-extensions/updates",
 
     "parse-datetime",
 

diff --git a/sources/api/bork/Cargo.toml b/sources/api/bork/Cargo.toml
@@ -9,5 +9,7 @@ publish = false
 exclude = ["README.md"]
 
 [dependencies]
-rand = "0.8"
 serde_json = "1"
+
+# generation logic moved to updates settings extension
+settings-extension-updates = { path = "../../settings-extensions/updates", version = "0.1" }
diff --git a/sources/api/bork/src/main.rs b/sources/api/bork/src/main.rs
@@ -1,8 +1,5 @@
-use rand::{thread_rng, Rng};
-
 fn main() {
-    let mut rng = thread_rng();
-    let val = rng.gen_range(0..2048);
+    let val = settings_extension_updates::generate::generate_seed();
 
     // sundog expects JSON-serialized output so that many types can be represented, allowing the
     // API model to use more accurate types.

diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml
@@ -21,6 +21,7 @@ toml = "0.5"
 settings-extension-motd = { path = "../settings-extensions/motd", version = "0.1" }
 settings-extension-ntp = { path = "../settings-extensions/ntp", version = "0.1" }
 settings-extension-container-registry = { path = "../settings-extensions/container-registry", version = "0.1" }
+settings-extension-updates = { path = "../settings-extensions/updates", version = "0.1" }
 
 [build-dependencies]
 bottlerocket-variant = { version = "0.1", path = "../bottlerocket-variant" }

diff --git a/sources/models/src/aws-dev/mod.rs b/sources/models/src/aws-dev/mod.rs
@@ -4,7 +4,6 @@ use std::collections::HashMap;
 use crate::{
     AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
     HostContainer, KernelSettings, MetricsSettings, NetworkSettings, OciHooks, PemCertificate,
-    UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -13,7 +12,7 @@ use modeled_types::Identifier;
 #[model(rename = "settings", impl_default = true)]
 struct Settings {
     motd: settings_extension_motd::MotdV1,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-ecs-1-nvidia/mod.rs b/sources/models/src/aws-ecs-1-nvidia/mod.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use crate::{
     AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
     ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate, UpdatesSettings,
+    OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -13,7 +13,7 @@ use modeled_types::Identifier;
 #[model(rename = "settings", impl_default = true)]
 struct Settings {
     motd: settings_extension_motd::MotdV1,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-ecs-1/mod.rs b/sources/models/src/aws-ecs-1/mod.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use crate::{
     AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
     ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings, OciDefaults,
-    OciHooks, PemCertificate, UpdatesSettings,
+    OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -13,7 +13,7 @@ use modeled_types::Identifier;
 #[model(rename = "settings", impl_default = true)]
 struct Settings {
     motd: settings_extension_motd::MotdV1,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-ecs-2-nvidia/mod.rs b/sources/models/src/aws-ecs-2-nvidia/mod.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings,
-    OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -13,7 +13,7 @@ use modeled_types::Identifier;
 #[model(rename = "settings", impl_default = true)]
 struct Settings {
     motd: settings_extension_motd::MotdV1,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-ecs-2/mod.rs b/sources/models/src/aws-ecs-2/mod.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings,
-    OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -13,7 +13,7 @@ use modeled_types::Identifier;
 #[model(rename = "settings", impl_default = true)]
 struct Settings {
     motd: settings_extension_motd::MotdV1,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.24-nvidia/mod.rs b/sources/models/src/aws-k8s-1.24-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.24/mod.rs b/sources/models/src/aws-k8s-1.24/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings,
-    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.25-nvidia/mod.rs b/sources/models/src/aws-k8s-1.25-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.25/mod.rs b/sources/models/src/aws-k8s-1.25/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings,
-    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.26-nvidia/mod.rs b/sources/models/src/aws-k8s-1.26-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.26/mod.rs b/sources/models/src/aws-k8s-1.26/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings,
-    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.28-nvidia/mod.rs b/sources/models/src/aws-k8s-1.28-nvidia/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/aws-k8s-1.28/mod.rs b/sources/models/src/aws-k8s-1.28/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings,
-    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate, UpdatesSettings,
+    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -14,7 +14,7 @@ use std::collections::HashMap;
 struct Settings {
     motd: settings_extension_motd::MotdV1,
     kubernetes: KubernetesSettings,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,

diff --git a/sources/models/src/metal-dev/mod.rs b/sources/models/src/metal-dev/mod.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 
 use crate::{
     BootSettings, BootstrapContainer, DnsSettings, HostContainer, KernelSettings, MetricsSettings,
-    NetworkSettings, OciHooks, PemCertificate, UpdatesSettings,
+    NetworkSettings, OciHooks, PemCertificate,
 };
 use modeled_types::Identifier;
 
@@ -12,7 +12,7 @@ use modeled_types::Identifier;
 #[model(rename = "settings", impl_default = true)]
 struct Settings {
     motd: settings_extension_motd::MotdV1,
-    updates: UpdatesSettings,
+    updates: settings_extension_updates::UpdatesSettingsV1,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
     ntp: settings_extension_ntp::NtpSettingsV1,