Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ members = [
"variants/aws-k8s-1.32-nvidia",
"variants/aws-k8s-1.32-nvidia-fips",
"variants/aws-k8s-1.33-nvidia",
"variants/aws-k8s-1.33-nvidia-595",
"variants/aws-k8s-1.33-nvidia-fips",
"variants/aws-k8s-1.34-nvidia",
"variants/aws-k8s-1.34-nvidia-595",
"variants/aws-k8s-1.34-nvidia-fips",
"variants/aws-k8s-1.35-nvidia",
"variants/aws-k8s-1.35-nvidia-595",
"variants/aws-k8s-1.35-nvidia-fips",
"variants/aws-k8s-1.36-nvidia",
"variants/aws-k8s-1.36-nvidia-595",
"variants/aws-k8s-1.36-nvidia-fips",
"variants/metal-dev",
"variants/vmware-dev",
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ The following variants support EKS, as described above:
* `aws-k8s-1.34-nvidia`
* `aws-k8s-1.35-nvidia`
* `aws-k8s-1.36-nvidia`
* `aws-k8s-1.33-nvidia-595`
* `aws-k8s-1.34-nvidia-595`
* `aws-k8s-1.35-nvidia-595`
* `aws-k8s-1.36-nvidia-595`

The following variants support ECS:

Expand Down
6 changes: 3 additions & 3 deletions Twoliter.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ digest = "9cSjjYDqIrlIjnOjLYbHGG5khRYA+wCek8I0BqP3sII="

[[kit]]
name = "bottlerocket-kernel-kit"
version = "6.2.0"
version = "6.2.2"
vendor = "bottlerocket"
source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v6.2.0"
digest = "XflEic+k1EnVos73r+TCzFGY82iadrXtBcgbAkJqmGY="
source = "public.ecr.aws/bottlerocket/bottlerocket-kernel-kit:v6.2.2"
digest = "Euek+5PjWtgY/Y5jJ6od3nx65RnDsMBP2JlgYlWJ0FU="

[[kit]]
name = "bottlerocket-core-kit"
Expand Down
2 changes: 1 addition & 1 deletion Twoliter.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ vendor = "bottlerocket"

[[kit]]
name = "bottlerocket-kernel-kit"
version = "6.2.0"
version = "6.2.2"
vendor = "bottlerocket"

[[kit]]
Expand Down
64 changes: 64 additions & 0 deletions packages/settings-defaults/settings-defaults.spec
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,46 @@ Conflicts: %{_cross_os}settings-defaults(any)
%description aws-k8s-1.36-nvidia
%{summary}.

%package aws-k8s-1.33-nvidia-595
Summary: Settings defaults for the aws-k8s 1.33 nvidia-595 variant
Requires: %{_cross_os}variant(aws-k8s-1.33-nvidia-595)
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.33-nvidia-595)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-k8s-1.33-nvidia-595
%{summary}.

%package aws-k8s-1.34-nvidia-595
Summary: Settings defaults for the aws-k8s 1.34 nvidia-595 variant
Requires: %{_cross_os}variant(aws-k8s-1.34-nvidia-595)
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.34-nvidia-595)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-k8s-1.34-nvidia-595
%{summary}.

%package aws-k8s-1.35-nvidia-595
Summary: Settings defaults for the aws-k8s 1.35 nvidia-595 variant
Requires: %{_cross_os}variant(aws-k8s-1.35-nvidia-595)
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.35-nvidia-595)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-k8s-1.35-nvidia-595
%{summary}.

%package aws-k8s-1.36-nvidia-595
Summary: Settings defaults for the aws-k8s 1.36 nvidia-595 variant
Requires: %{_cross_os}variant(aws-k8s-1.36-nvidia-595)
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.36-nvidia-595)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-k8s-1.36-nvidia-595
%{summary}.

%package metal-dev
Summary: Settings defaults for the metal-dev variant
Requires: %{_cross_os}variant(metal-dev)
Expand Down Expand Up @@ -407,6 +447,10 @@ for defaults in \
aws-k8s-1.35-nvidia \
aws-k8s-1.36 \
aws-k8s-1.36-nvidia \
aws-k8s-1.33-nvidia-595 \
aws-k8s-1.34-nvidia-595 \
aws-k8s-1.35-nvidia-595 \
aws-k8s-1.36-nvidia-595 \
metal-dev \
vmware-dev \
vmware-k8s-1.32 \
Expand Down Expand Up @@ -453,6 +497,10 @@ for defaults in \
aws-k8s-1.35-nvidia \
aws-k8s-1.36 \
aws-k8s-1.36-nvidia \
aws-k8s-1.33-nvidia-595 \
aws-k8s-1.34-nvidia-595 \
aws-k8s-1.35-nvidia-595 \
aws-k8s-1.36-nvidia-595 \
metal-dev \
vmware-dev \
vmware-k8s-1.32 \
Expand Down Expand Up @@ -550,6 +598,22 @@ done
%{_cross_defaultsdir}/aws-k8s-1.36-nvidia.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.36-nvidia.conf

%files aws-k8s-1.33-nvidia-595
%{_cross_defaultsdir}/aws-k8s-1.33-nvidia-595.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.33-nvidia-595.conf

%files aws-k8s-1.34-nvidia-595
%{_cross_defaultsdir}/aws-k8s-1.34-nvidia-595.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.34-nvidia-595.conf

%files aws-k8s-1.35-nvidia-595
%{_cross_defaultsdir}/aws-k8s-1.35-nvidia-595.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.35-nvidia-595.conf

%files aws-k8s-1.36-nvidia-595
%{_cross_defaultsdir}/aws-k8s-1.36-nvidia-595.toml
%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.36-nvidia-595.conf

%files metal-dev
%{_cross_defaultsdir}/metal-dev.toml
%{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf
Expand Down
4 changes: 4 additions & 0 deletions packages/settings-plugins/settings-plugins.spec
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-nvidia)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-nvidia-fips)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-nvidia)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-nvidia-fips)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-nvidia-595)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-nvidia-595)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-nvidia-595)
Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-nvidia-595)
Conflicts: %{_cross_os}settings-plugin(any)

%description aws-k8s-nvidia
Expand Down
4 changes: 4 additions & 0 deletions sources/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,16 @@ members = [
"settings-defaults/aws-k8s-1.32-nvidia",
"settings-defaults/aws-k8s-1.33",
"settings-defaults/aws-k8s-1.33-nvidia",
"settings-defaults/aws-k8s-1.33-nvidia-595",
"settings-defaults/aws-k8s-1.34",
"settings-defaults/aws-k8s-1.34-nvidia",
"settings-defaults/aws-k8s-1.34-nvidia-595",
"settings-defaults/aws-k8s-1.35",
"settings-defaults/aws-k8s-1.35-nvidia",
"settings-defaults/aws-k8s-1.35-nvidia-595",
"settings-defaults/aws-k8s-1.36",
"settings-defaults/aws-k8s-1.36-nvidia",
"settings-defaults/aws-k8s-1.36-nvidia-595",
"settings-defaults/metal-dev",
"settings-defaults/metal-k8s-1.30",
"settings-defaults/vmware-dev",
Expand Down
13 changes: 13 additions & 0 deletions sources/settings-defaults/aws-k8s-1.33-nvidia-595/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "settings-defaults-aws-k8s-1_33-nvidia-595"
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
13 changes: 13 additions & 0 deletions sources/settings-defaults/aws-k8s-1.34-nvidia-595/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "settings-defaults-aws-k8s-1_34-nvidia-595"
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
13 changes: 13 additions & 0 deletions sources/settings-defaults/aws-k8s-1.35-nvidia-595/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "settings-defaults-aws-k8s-1_35-nvidia-595"
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
Loading