Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

settings: add aws settings extension #3738

Merged
merged 3 commits into from
Feb 9, 2024
Merged

settings: add aws settings extension #3738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef9b4af
settings: create aws settings extension
sam-berning Jan 26, 2024
528e360
settings: use aws settings extension in models
sam-berning Jan 26, 2024
6f870f0
packages: add aws settings extension package
sam-berning Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions packages/settings-aws/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[package]
name = "settings-aws"
version = "0.1.0"
edition = "2021"
publish = false
build = "../build.rs"

[lib]
path = "../packages.rs"

[package.metadata.build-package]
source-groups = [
"settings-extensions/aws"
]

# RPM BuildRequires
[build-dependencies]
glibc = { path = "../glibc" }

# RPM Requires
[dependencies]
39 changes: 39 additions & 0 deletions packages/settings-aws/settings-aws.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
%global _cross_first_party 1
%undefine _debugsource_packages

%global extension_name aws

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}
13 changes: 13 additions & 0 deletions sources/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sources/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ members = [

"models",

"settings-extensions/aws",
"settings-extensions/container-registry",
"settings-extensions/kernel",
"settings-extensions/motd",
Expand Down
1 change: 1 addition & 0 deletions sources/models/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ serde = { version = "1", features = ["derive"] }
toml = "0.5"

# settings extensions
settings-extension-aws = { path = "../settings-extensions/aws", version = "0.1" }
settings-extension-container-registry = { path = "../settings-extensions/container-registry", version = "0.1" }
settings-extension-kernel = { path = "../settings-extensions/kernel", version = "0.1" }
settings-extension-motd = { path = "../settings-extensions/motd", version = "0.1" }
Expand Down
6 changes: 3 additions & 3 deletions sources/models/src/aws-dev/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use model_derive::model;
use std::collections::HashMap;

use crate::{
AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
HostContainer, MetricsSettings, NetworkSettings, OciHooks, PemCertificate,
BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, HostContainer,
MetricsSettings, NetworkSettings, OciHooks, PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -19,7 +19,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
7 changes: 3 additions & 4 deletions sources/models/src/aws-ecs-1-nvidia/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ use model_derive::model;
use std::collections::HashMap;

use crate::{
AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
AutoScalingSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, ECSSettings,
HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -19,7 +18,7 @@ struct Settings {
ntp: settings_extension_ntp::NtpSettingsV1,
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
ecs: ECSSettings,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
Expand Down
7 changes: 3 additions & 4 deletions sources/models/src/aws-ecs-1/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ use model_derive::model;
use std::collections::HashMap;

use crate::{
AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
AutoScalingSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, ECSSettings,
HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -19,7 +18,7 @@ struct Settings {
ntp: settings_extension_ntp::NtpSettingsV1,
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
ecs: ECSSettings,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
Expand Down
8 changes: 4 additions & 4 deletions sources/models/src/aws-ecs-2-nvidia/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use model_derive::model;
use std::collections::HashMap;

use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
DnsSettings, ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults,
OciHooks, PemCertificate,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -20,7 +20,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
ecs: ECSSettings,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
Expand Down
8 changes: 4 additions & 4 deletions sources/models/src/aws-ecs-2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use model_derive::model;
use std::collections::HashMap;

use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
DnsSettings, ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults,
OciHooks, PemCertificate,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
ECSSettings, HostContainer, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -20,7 +20,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
ecs: ECSSettings,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
Expand Down
8 changes: 4 additions & 4 deletions sources/models/src/aws-k8s-1.24-nvidia/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
OciHooks, PemCertificate,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
4 changes: 2 additions & 2 deletions sources/models/src/aws-k8s-1.24/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
8 changes: 4 additions & 4 deletions sources/models/src/aws-k8s-1.25-nvidia/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
OciHooks, PemCertificate,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
4 changes: 2 additions & 2 deletions sources/models/src/aws-k8s-1.25/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
8 changes: 4 additions & 4 deletions sources/models/src/aws-k8s-1.26-nvidia/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
OciHooks, PemCertificate,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
4 changes: 2 additions & 2 deletions sources/models/src/aws-k8s-1.26/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
8 changes: 4 additions & 4 deletions sources/models/src/aws-k8s-1.29-nvidia/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
DnsSettings, HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults,
OciHooks, PemCertificate,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings, DnsSettings,
HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
4 changes: 2 additions & 2 deletions sources/models/src/aws-k8s-1.29/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{
AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
AutoScalingSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
ContainerRuntimeSettings, DnsSettings, HostContainer, KubernetesSettings, MetricsSettings,
NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
Expand All @@ -21,7 +21,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
7 changes: 3 additions & 4 deletions sources/models/src/metal-k8s-1.29/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ use model_derive::model;
use std::collections::HashMap;

use crate::{
AwsSettings, BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings,
HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, HostContainer,
KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -21,7 +20,7 @@ struct Settings {
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
boot: BootSettings,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
container_registry: settings_extension_container_registry::RegistrySettingsV1,
Expand Down
7 changes: 3 additions & 4 deletions sources/models/src/vmware-k8s-1.29/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ use model_derive::model;
use std::collections::HashMap;

use crate::{
AwsSettings, BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings,
HostContainer, KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks,
PemCertificate,
BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, HostContainer,
KubernetesSettings, MetricsSettings, NetworkSettings, OciDefaults, OciHooks, PemCertificate,
};
use modeled_types::Identifier;

Expand All @@ -20,7 +19,7 @@ struct Settings {
ntp: settings_extension_ntp::NtpSettingsV1,
network: NetworkSettings,
kernel: settings_extension_kernel::KernelSettingsV1,
aws: AwsSettings,
aws: settings_extension_aws::AwsSettingsV1,
boot: BootSettings,
metrics: MetricsSettings,
pki: HashMap<Identifier, PemCertificate>,
Expand Down