Skip to content

variants: add aws-ecs-3* variants #4685

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

Merged
koooosh merged 2 commits into from
Nov 13, 2025
+557 −0
Merged

variants: add aws-ecs-3* variants #4685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b3eac
variants: add aws-ecs-3* variants
koooosh Nov 7, 2025
fc14478
variants: add preview description to ecs-3* amispecs
koooosh Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ members = [
"variants/aws-ecs-2-fips",
"variants/aws-ecs-2-nvidia",
"variants/aws-ecs-2-nvidia-fips",
"variants/aws-ecs-3",
"variants/aws-ecs-3-fips",
"variants/aws-ecs-3-nvidia",
"variants/aws-ecs-3-nvidia-fips",
"variants/aws-k8s-1.28",
"variants/aws-k8s-1.28-fips",
"variants/aws-k8s-1.29",
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ The following variants support ECS:

* `aws-ecs-2`
* `aws-ecs-2-nvidia`
* `aws-ecs-3`
* `aws-ecs-3-fips`
* `aws-ecs-3-nvidia`

We also have variants that are designed to be Kubernetes worker nodes in VMware:

Expand Down
40 changes: 40 additions & 0 deletions packages/settings-defaults/settings-defaults.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,34 @@ Conflicts: %{_cross_os}settings-defaults(any)
%description aws-ecs-2-nvidia
%{summary}.

%package aws-ecs-3
Summary: Settings defaults for the aws-ecs-3 FIPS and non-FIPS variants
Requires: (%{shrink:
%{_cross_os}variant(aws-ecs-3) or
%{_cross_os}variant(aws-ecs-3-fips)
%{nil}})
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-ecs-3)
Provides: %{_cross_os}settings-defaults(aws-ecs-3-fips)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-ecs-3
%{summary}.

%package aws-ecs-3-nvidia
Summary: Settings defaults for the aws-ecs-3-nvidia variant
Requires: (%{shrink:
%{_cross_os}variant(aws-ecs-3-nvidia) or
%{_cross_os}variant(aws-ecs-3-nvidia-fips)
%{nil}})
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-ecs-3-nvidia)
Provides: %{_cross_os}settings-defaults(aws-ecs-3-nvidia-fips)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-ecs-3-nvidia
%{summary}.

%package aws-k8s-1.31
Summary: Settings defaults for the aws-k8s 1.28 through 1.31 variants
Requires: (%{shrink:
Expand Down Expand Up @@ -277,6 +305,8 @@ for defaults in \
aws-dev \
aws-ecs-2 \
aws-ecs-2-nvidia \
aws-ecs-3 \
aws-ecs-3-nvidia \
aws-k8s-1.31 \
aws-k8s-1.31-nvidia \
aws-k8s-1.32 \
Expand Down Expand Up @@ -313,6 +343,8 @@ for defaults in \
aws-dev \
aws-ecs-2 \
aws-ecs-2-nvidia \
aws-ecs-3 \
aws-ecs-3-nvidia \
aws-k8s-1.31 \
aws-k8s-1.31-nvidia \
aws-k8s-1.32 \
Expand Down Expand Up @@ -352,6 +384,14 @@ done
%{_cross_defaultsdir}/aws-ecs-2-nvidia.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-2-nvidia.conf

%files aws-ecs-3
%{_cross_defaultsdir}/aws-ecs-3.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-3.conf

%files aws-ecs-3-nvidia
%{_cross_defaultsdir}/aws-ecs-3-nvidia.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-3-nvidia.conf

%files aws-k8s-1.31
%{_cross_defaultsdir}/aws-k8s-1.31.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.31.conf
Expand Down
25 changes: 25 additions & 0 deletions packages/settings-plugins/settings-plugins.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,24 @@ Conflicts: %{_cross_os}settings-plugin(any)
%description aws-ecs-2
%{summary}.

%package aws-ecs-3
Summary: Settings plugin for the aws-ecs-3 variant
Requires: (%{shrink:
%{_cross_os}variant(aws-ecs-3) or
%{_cross_os}variant(aws-ecs-3-fips) or
%{_cross_os}variant(aws-ecs-3-nvidia) or
%{_cross_os}variant(aws-ecs-3-nvidia-fips)
%{nil}})
Provides: %{_cross_os}settings-plugin(any)
Provides: %{_cross_os}settings-plugin(aws-ecs-3)
Provides: %{_cross_os}settings-plugin(aws-ecs-3-nvidia)
Provides: %{_cross_os}settings-plugin(aws-ecs-3-nvidia-fips)
Provides: %{_cross_os}settings-plugin(aws-ecs-3-fips)
Conflicts: %{_cross_os}settings-plugin(any)

%description aws-ecs-3
%{summary}.

%package aws-k8s
Summary: Settings plugin for the aws-k8s variants
Requires: %{_cross_os}variant-family(aws-k8s)
Expand Down Expand Up @@ -146,6 +164,7 @@ Conflicts: %{_cross_os}settings-plugin(any)
%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
-p settings-plugin-aws-dev \
-p settings-plugin-aws-ecs-2 \
-p settings-plugin-aws-ecs-3 \
-p settings-plugin-aws-k8s \
-p settings-plugin-aws-k8s-nvidia \
-p settings-plugin-metal-dev \
Expand All @@ -161,6 +180,7 @@ install -d %{buildroot}%{_cross_tmpfilesdir}
for plugin in \
aws-dev \
aws-ecs-2 \
aws-ecs-3 \
aws-k8s-nvidia \
aws-k8s \
metal-dev \
Expand Down Expand Up @@ -194,6 +214,11 @@ done
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-ecs-2.conf
%{_cross_tmpfilesdir}/settings-plugin-aws-ecs-2.conf

%files aws-ecs-3
%{_cross_pluginsdir}/aws-ecs-3/libsettings.so
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-ecs-3.conf
%{_cross_tmpfilesdir}/settings-plugin-aws-ecs-3.conf

%files aws-k8s
%{_cross_pluginsdir}/aws-k8s/libsettings.so
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-k8s.conf
Expand Down
25 changes: 25 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.

3 changes: 3 additions & 0 deletions sources/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ members = [
"settings-defaults/aws-dev",
"settings-defaults/aws-ecs-2",
"settings-defaults/aws-ecs-2-nvidia",
"settings-defaults/aws-ecs-3",
"settings-defaults/aws-ecs-3-nvidia",
"settings-defaults/aws-k8s-1.31",
"settings-defaults/aws-k8s-1.31-nvidia",
"settings-defaults/aws-k8s-1.32",
Expand Down Expand Up @@ -51,6 +53,7 @@ members = [

"settings-plugins/aws-dev",
"settings-plugins/aws-ecs-2",
"settings-plugins/aws-ecs-3",
"settings-plugins/aws-k8s",
"settings-plugins/aws-k8s-nvidia",
"settings-plugins/metal-dev",
Expand Down
13 changes: 13 additions & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "settings-defaults-aws-ecs-3-nvidia"
version = "0.1.0"
edition = "2021"
license = "Apache-2.0 OR MIT"
publish = false
build = "../build-defaults.rs"

[lib]
path = "../defaults-toml.rs"

[build-dependencies]
bottlerocket-defaults-helper.workspace = true
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/10-defaults.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/defaults.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/15-aws-tuf.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-tuf.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/20-aws-host-containers.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-host-containers.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/21-aws-bootstrap-container.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-bootstrap-container.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/25-cf-signal.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/cf-signal.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/26-aws-autoscaling.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-autoscaling.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/30-metrics.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/metrics.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/31-send-metrics-aws.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/send-metrics-aws.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/40-aws-creds.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-creds.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/51-docker-services.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/docker-services.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/52-aws-ecs-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/ecs.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/53-docker-daemon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/docker-daemon-nvidia.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/54-docker-pki.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/docker-pki.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/55-image-verification.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/image-verification.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/60-lockdown-none.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/lockdown-none.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/70-oci-hooks.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-hooks.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/75-oci-defaults-docker.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-defaults-docker.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/76-oci-defaults-capabilities.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-defaults-capabilities.toml
1 change: 1 addition & 0 deletions ...settings-defaults/aws-ecs-3-nvidia/defaults.d/77-oci-defaults-docker-resource-limits.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-defaults-docker-resource-limits.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/80-boot.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/boot.toml
13 changes: 13 additions & 0 deletions sources/settings-defaults/aws-ecs-3/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "settings-defaults-aws-ecs-3"
version = "0.1.0"
edition = "2021"
license = "Apache-2.0 OR MIT"
publish = false
build = "../build-defaults.rs"

[lib]
path = "../defaults-toml.rs"

[build-dependencies]
bottlerocket-defaults-helper.workspace = true
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/10-defaults.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/defaults.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/15-aws-tuf.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-tuf.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/20-aws-host-containers.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-host-containers.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/21-aws-bootstrap-container.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-bootstrap-container.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/25-cf-signal.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/cf-signal.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/26-aws-autoscaling.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-autoscaling.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/30-metrics.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/metrics.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/31-send-metrics-aws.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/send-metrics-aws.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/40-aws-creds.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/aws-creds.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/51-docker-services.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/docker-services.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/52-aws-ecs-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/ecs.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/53-docker-pki.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/docker-pki.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/55-image-verification.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/image-verification.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/60-lockdown-integrity.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/lockdown-integrity.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/70-oci-hooks.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-hooks.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/75-oci-defaults-docker.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-defaults-docker.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/76-oci-defaults-capabilities.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-defaults-capabilities.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/77-oci-defaults-docker-resource-limits.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/oci-defaults-docker-resource-limits.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/80-boot.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/boot.toml
Loading