Skip to content

Commit 0927547

Browse files
kooooshkoooosh
authored
Merge pull request #4685 from koooosh/add-ecs-3-variants
variants: add aws-ecs-3* variants
2 parents bb1a931 + fc14478 commit 0927547

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+557
-0
lines changed

‎Cargo.lock‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ members = [
99
"variants/aws-ecs-2-fips",
1010
"variants/aws-ecs-2-nvidia",
1111
"variants/aws-ecs-2-nvidia-fips",
12+
"variants/aws-ecs-3",
13+
"variants/aws-ecs-3-fips",
14+
"variants/aws-ecs-3-nvidia",
15+
"variants/aws-ecs-3-nvidia-fips",
1216
"variants/aws-k8s-1.28",
1317
"variants/aws-k8s-1.28-fips",
1418
"variants/aws-k8s-1.29",

‎README.md‎

Lines changed: 3 additions & 0 deletions

‎packages/settings-defaults/settings-defaults.spec‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,34 @@ Conflicts: %{_cross_os}settings-defaults(any)
5555
%description aws-ecs-2-nvidia
5656
%{summary}.
5757

58+
%package aws-ecs-3
59+
Summary: Settings defaults for the aws-ecs-3 FIPS and non-FIPS variants
60+
Requires: (%{shrink:
61+
%{_cross_os}variant(aws-ecs-3) or
62+
%{_cross_os}variant(aws-ecs-3-fips)
63+
%{nil}})
64+
Provides: %{_cross_os}settings-defaults(any)
65+
Provides: %{_cross_os}settings-defaults(aws-ecs-3)
66+
Provides: %{_cross_os}settings-defaults(aws-ecs-3-fips)
67+
Conflicts: %{_cross_os}settings-defaults(any)
68+
69+
%description aws-ecs-3
70+
%{summary}.
71+
72+
%package aws-ecs-3-nvidia
73+
Summary: Settings defaults for the aws-ecs-3-nvidia variant
74+
Requires: (%{shrink:
75+
%{_cross_os}variant(aws-ecs-3-nvidia) or
76+
%{_cross_os}variant(aws-ecs-3-nvidia-fips)
77+
%{nil}})
78+
Provides: %{_cross_os}settings-defaults(any)
79+
Provides: %{_cross_os}settings-defaults(aws-ecs-3-nvidia)
80+
Provides: %{_cross_os}settings-defaults(aws-ecs-3-nvidia-fips)
81+
Conflicts: %{_cross_os}settings-defaults(any)
82+
83+
%description aws-ecs-3-nvidia
84+
%{summary}.
85+
5886
%package aws-k8s-1.31
5987
Summary: Settings defaults for the aws-k8s 1.28 through 1.31 variants
6088
Requires: (%{shrink:
@@ -277,6 +305,8 @@ for defaults in \
277305
aws-dev \
278306
aws-ecs-2 \
279307
aws-ecs-2-nvidia \
308+
aws-ecs-3 \
309+
aws-ecs-3-nvidia \
280310
aws-k8s-1.31 \
281311
aws-k8s-1.31-nvidia \
282312
aws-k8s-1.32 \
@@ -313,6 +343,8 @@ for defaults in \
313343
aws-dev \
314344
aws-ecs-2 \
315345
aws-ecs-2-nvidia \
346+
aws-ecs-3 \
347+
aws-ecs-3-nvidia \
316348
aws-k8s-1.31 \
317349
aws-k8s-1.31-nvidia \
318350
aws-k8s-1.32 \
@@ -352,6 +384,14 @@ done
352384
%{_cross_defaultsdir}/aws-ecs-2-nvidia.toml
353385
%{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-2-nvidia.conf
354386

387+
%files aws-ecs-3
388+
%{_cross_defaultsdir}/aws-ecs-3.toml
389+
%{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-3.conf
390+
391+
%files aws-ecs-3-nvidia
392+
%{_cross_defaultsdir}/aws-ecs-3-nvidia.toml
393+
%{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-3-nvidia.conf
394+
355395
%files aws-k8s-1.31
356396
%{_cross_defaultsdir}/aws-k8s-1.31.toml
357397
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.31.conf

‎packages/settings-plugins/settings-plugins.spec‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,24 @@ Conflicts: %{_cross_os}settings-plugin(any)
4848
%description aws-ecs-2
4949
%{summary}.
5050

51+
%package aws-ecs-3
52+
Summary: Settings plugin for the aws-ecs-3 variant
53+
Requires: (%{shrink:
54+
%{_cross_os}variant(aws-ecs-3) or
55+
%{_cross_os}variant(aws-ecs-3-fips) or
56+
%{_cross_os}variant(aws-ecs-3-nvidia) or
57+
%{_cross_os}variant(aws-ecs-3-nvidia-fips)
58+
%{nil}})
59+
Provides: %{_cross_os}settings-plugin(any)
60+
Provides: %{_cross_os}settings-plugin(aws-ecs-3)
61+
Provides: %{_cross_os}settings-plugin(aws-ecs-3-nvidia)
62+
Provides: %{_cross_os}settings-plugin(aws-ecs-3-nvidia-fips)
63+
Provides: %{_cross_os}settings-plugin(aws-ecs-3-fips)
64+
Conflicts: %{_cross_os}settings-plugin(any)
65+
66+
%description aws-ecs-3
67+
%{summary}.
68+
5169
%package aws-k8s
5270
Summary: Settings plugin for the aws-k8s variants
5371
Requires: %{_cross_os}variant-family(aws-k8s)
@@ -146,6 +164,7 @@ Conflicts: %{_cross_os}settings-plugin(any)
146164
%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
147165
-p settings-plugin-aws-dev \
148166
-p settings-plugin-aws-ecs-2 \
167+
-p settings-plugin-aws-ecs-3 \
149168
-p settings-plugin-aws-k8s \
150169
-p settings-plugin-aws-k8s-nvidia \
151170
-p settings-plugin-metal-dev \
@@ -161,6 +180,7 @@ install -d %{buildroot}%{_cross_tmpfilesdir}
161180
for plugin in \
162181
aws-dev \
163182
aws-ecs-2 \
183+
aws-ecs-3 \
164184
aws-k8s-nvidia \
165185
aws-k8s \
166186
metal-dev \
@@ -194,6 +214,11 @@ done
194214
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-ecs-2.conf
195215
%{_cross_tmpfilesdir}/settings-plugin-aws-ecs-2.conf
196216

217+
%files aws-ecs-3
218+
%{_cross_pluginsdir}/aws-ecs-3/libsettings.so
219+
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-ecs-3.conf
220+
%{_cross_tmpfilesdir}/settings-plugin-aws-ecs-3.conf
221+
197222
%files aws-k8s
198223
%{_cross_pluginsdir}/aws-k8s/libsettings.so
199224
%{_cross_factorydir}%{_cross_sysconfdir}/ld.so.conf.d/aws-k8s.conf

‎sources/Cargo.lock‎

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sources/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ members = [
1616
"settings-defaults/aws-dev",
1717
"settings-defaults/aws-ecs-2",
1818
"settings-defaults/aws-ecs-2-nvidia",
19+
"settings-defaults/aws-ecs-3",
20+
"settings-defaults/aws-ecs-3-nvidia",
1921
"settings-defaults/aws-k8s-1.31",
2022
"settings-defaults/aws-k8s-1.31-nvidia",
2123
"settings-defaults/aws-k8s-1.32",
@@ -51,6 +53,7 @@ members = [
5153

5254
"settings-plugins/aws-dev",
5355
"settings-plugins/aws-ecs-2",
56+
"settings-plugins/aws-ecs-3",
5457
"settings-plugins/aws-k8s",
5558
"settings-plugins/aws-k8s-nvidia",
5659
"settings-plugins/metal-dev",

‎sources/settings-defaults/aws-ecs-3-nvidia/Cargo.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[package]
2+
name = "settings-defaults-aws-ecs-3-nvidia"
3+
version = "0.1.0"
4+
edition = "2021"
5+
license = "Apache-2.0 OR MIT"
6+
publish = false
7+
build = "../build-defaults.rs"
8+
9+
[lib]
10+
path = "../defaults-toml.rs"
11+
12+
[build-dependencies]
13+
bottlerocket-defaults-helper.workspace = true

‎sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/10-defaults.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../shared-defaults/defaults.toml

‎sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/15-aws-tuf.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../shared-defaults/aws-tuf.toml

0 commit comments

Comments
 (0)