Merge pull request #3595 from sam-berning/extract-ntp-settings-model

settings: add ntp settings extension
bottlerocket-os · Nov 17, 2023 · c4900ee · c4900ee
2 parents 26f1cc9 + 02d4ce1
commit c4900ee
Show file tree

Hide file tree

Showing 28 changed files with 288 additions and 49 deletions.
diff --git a/packages/settings-ntp/Cargo.toml b/packages/settings-ntp/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "settings-ntp"
+version = "0.1.0"
+edition = "2021"
+publish = false
+build = "../build.rs"
+
+[lib]
+path = "../packages.rs"
+
+[package.metadata.build-package]
+source-groups = [
+    "settings-extensions/ntp"
+]
+
+# RPM BuildRequires
+[build-dependencies]
+glibc = { path = "../glibc" }
+
+# RPM Requires
+[dependencies]
diff --git a/packages/settings-ntp/settings-ntp.spec b/packages/settings-ntp/settings-ntp.spec
@@ -0,0 +1,39 @@
+%global _cross_first_party 1
+%undefine _debugsource_packages
+
+%global extension_name ntp
+
+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
@@ -103,6 +103,7 @@ members = [
     "models",
 
     "settings-extensions/motd",
+    "settings-extensions/ntp",
 
     "parse-datetime",
 

diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml
@@ -19,6 +19,7 @@ toml = "0.5"
 
 # settings extensions
 settings-extension-motd = { path = "../settings-extensions/motd", version = "0.1" }
+settings-extension-ntp = { path = "../settings-extensions/ntp", 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
@@ -3,8 +3,8 @@ use std::collections::HashMap;
 
 use crate::{
     AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
-    HostContainer, KernelSettings, MetricsSettings, NetworkSettings, NtpSettings, OciHooks,
-    PemCertificate, RegistrySettings, UpdatesSettings,
+    HostContainer, KernelSettings, MetricsSettings, NetworkSettings, OciHooks, PemCertificate,
+    RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -16,7 +16,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

diff --git a/sources/models/src/aws-ecs-1-nvidia/mod.rs b/sources/models/src/aws-ecs-1-nvidia/mod.rs
@@ -3,8 +3,8 @@ use std::collections::HashMap;
 
 use crate::{
     AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
-    ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings, NtpSettings,
-    OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
+    ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings, OciDefaults,
+    OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -16,7 +16,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     aws: AwsSettings,

diff --git a/sources/models/src/aws-ecs-1/mod.rs b/sources/models/src/aws-ecs-1/mod.rs
@@ -3,8 +3,8 @@ use std::collections::HashMap;
 
 use crate::{
     AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
-    ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings, NtpSettings,
-    OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
+    ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings, OciDefaults,
+    OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -16,7 +16,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     aws: AwsSettings,

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,
-    NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
+    OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -16,7 +16,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

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,
-    NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
+    OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -16,7 +16,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

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,8 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings,
-    UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -18,7 +17,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

diff --git a/sources/models/src/aws-k8s-1.24/mod.rs b/sources/models/src/aws-k8s-1.24/mod.rs
@@ -1,8 +1,8 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings,
-    MetricsSettings, NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate,
-    RegistrySettings, UpdatesSettings,
+    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings,
+    UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -18,7 +18,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

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,8 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings,
-    UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -18,7 +17,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

diff --git a/sources/models/src/aws-k8s-1.25/mod.rs b/sources/models/src/aws-k8s-1.25/mod.rs
@@ -1,8 +1,8 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings,
-    MetricsSettings, NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate,
-    RegistrySettings, UpdatesSettings,
+    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings,
+    UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -18,7 +18,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

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,8 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings,
-    UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -18,7 +17,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

diff --git a/sources/models/src/aws-k8s-1.26/mod.rs b/sources/models/src/aws-k8s-1.26/mod.rs
@@ -1,8 +1,8 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings,
-    MetricsSettings, NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate,
-    RegistrySettings, UpdatesSettings,
+    MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings,
+    UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -18,7 +18,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,

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,8 +1,7 @@
 use crate::{
     AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
     DnsSettings, HostContainer, KernelSettings, KubernetesSettings, MetricsSettings,
-    NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings,
-    UpdatesSettings,
+    NetworkSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
 };
 use modeled_types::Identifier;
 
@@ -18,7 +17,7 @@ struct Settings {
     updates: UpdatesSettings,
     host_containers: HashMap<Identifier, HostContainer>,
     bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
-    ntp: NtpSettings,
+    ntp: settings_extension_ntp::NtpSettingsV1,
     network: NetworkSettings,
     kernel: KernelSettings,
     boot: BootSettings,