-
Notifications
You must be signed in to change notification settings - Fork 512
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2128 from arnaldo2792/nvidia-ecs-variant
Add aws-ecs-1-nvidia variant
- Loading branch information
Showing
23 changed files
with
196 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
logdog.aws-ecs-1.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# ECS | ||
[services.ecs] | ||
restart-commands = ["/usr/bin/ecs-settings-applier", "/bin/systemctl try-reload-or-restart ecs.service"] | ||
configuration-files = ["ecs-config"] | ||
|
||
[configuration-files.ecs-config] | ||
path = "/etc/ecs/ecs.config" | ||
template-path = "/usr/share/templates/ecs.config" | ||
|
||
[metadata.settings.ecs] | ||
affected-services = ["ecs"] | ||
|
||
[settings.ecs] | ||
allow-privileged-containers = false | ||
logging-drivers = ["json-file", "awslogs", "none"] | ||
loglevel = "info" | ||
|
||
# Metrics | ||
[settings.metrics] | ||
service-checks = ["apiserver", "chronyd", "containerd", "host-containerd", "docker", "ecs"] | ||
|
||
# Network | ||
[metadata.settings.network] | ||
affected-services = ["containerd", "docker", "ecs", "host-containerd", "host-containers"] | ||
|
||
# Image registry credentials | ||
[metadata.settings.container-registry.credentials] | ||
affected-services = ["ecs", "host-containers", "bootstrap-containers"] |
1 change: 1 addition & 0 deletions
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/10-defaults.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/defaults.toml |
1 change: 1 addition & 0 deletions
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/20-aws-host-containers.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/25-cf-signal.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/cf-signal.toml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/metrics.toml |
1 change: 1 addition & 0 deletions
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/51-docker-services.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/docker-services.toml |
1 change: 1 addition & 0 deletions
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/52-aws-ecs-1.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/ecs.toml |
1 change: 1 addition & 0 deletions
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/53-docker-daemon.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/60-lockdown-none.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/lockdown-none.toml |
1 change: 1 addition & 0 deletions
1
sources/models/src/aws-ecs-1-nvidia/defaults.d/70-oci-hooks.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/nvidia-oci-hooks-docker.toml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
use model_derive::model; | ||
use serde::{Deserialize, Serialize}; | ||
use std::collections::HashMap; | ||
|
||
use crate::modeled_types::Identifier; | ||
use crate::{ | ||
AwsSettings, BootstrapContainer, CloudFormationSettings, ECSSettings, HostContainer, | ||
KernelSettings, MetricsSettings, NetworkSettings, NtpSettings, OciHooks, PemCertificate, | ||
RegistrySettings, UpdatesSettings, | ||
}; | ||
|
||
// Note: we have to use 'rename' here because the top-level Settings structure is the only one | ||
// that uses its name in serialization; internal structures use the field name that points to it | ||
#[model(rename = "settings", impl_default = true)] | ||
struct Settings { | ||
motd: String, | ||
updates: UpdatesSettings, | ||
host_containers: HashMap<Identifier, HostContainer>, | ||
bootstrap_containers: HashMap<Identifier, BootstrapContainer>, | ||
ntp: NtpSettings, | ||
network: NetworkSettings, | ||
kernel: KernelSettings, | ||
aws: AwsSettings, | ||
ecs: ECSSettings, | ||
metrics: MetricsSettings, | ||
pki: HashMap<Identifier, PemCertificate>, | ||
container_registry: RegistrySettings, | ||
oci_hooks: OciHooks, | ||
cloudformation: CloudFormationSettings, | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../shared-defaults/ecs.toml |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
[package] | ||
name = "aws-ecs-1-nvidia" | ||
version = "0.1.0" | ||
edition = "2018" | ||
publish = false | ||
build = "build.rs" | ||
|
||
[package.metadata.build-variant.image-layout] | ||
os-image-size-gib = 4 | ||
|
||
[package.metadata.build-variant] | ||
kernel-parameters = [ | ||
"console=tty0", | ||
"console=ttyS0,115200n8", | ||
] | ||
included-packages = [ | ||
# core | ||
"release", | ||
"kernel-5.10", | ||
# docker | ||
"docker-cli", | ||
"docker-engine", | ||
"docker-init", | ||
"docker-proxy", | ||
# ecs | ||
"ecs-agent", | ||
# NVIDIA support | ||
"ecs-gpu-init", | ||
"nvidia-container-toolkit", | ||
"kmod-5.10-nvidia-tesla-470" | ||
] | ||
|
||
[lib] | ||
path = "lib.rs" | ||
|
||
[build-dependencies] | ||
# core | ||
release = { path = "../../packages/release" } | ||
kernel-5_10 = { path = "../../packages/kernel-5.10" } | ||
# docker | ||
docker-cli = { path = "../../packages/docker-cli" } | ||
docker-engine = { path = "../../packages/docker-engine" } | ||
docker-init = { path = "../../packages/docker-init" } | ||
docker-proxy = { path = "../../packages/docker-proxy" } | ||
# ecs | ||
ecs-agent = { path = "../../packages/ecs-agent" } | ||
# NVIDIA | ||
ecs-gpu-init = { path = "../../packages/ecs-gpu-init" } | ||
nvidia-container-toolkit = { path = "../../packages/nvidia-container-toolkit" } | ||
kmod-5_10-nvidia = { path = "../../packages/kmod-5.10-nvidia" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
use std::process::{exit, Command}; | ||
|
||
fn main() -> Result<(), std::io::Error> { | ||
let ret = Command::new("buildsys").arg("build-variant").status()?; | ||
if !ret.success() { | ||
exit(1); | ||
} | ||
Ok(()) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// not used |