Skip to content
Merged
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
9 changes: 9 additions & 0 deletions sources/shared-defaults/defaults.toml
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,12 @@ template-path = "/usr/share/templates/netdog-toml"
[configuration-files.certdog-toml]
path = "/etc/certdog.toml"
template-path = "/usr/share/templates/certdog-toml"

# thar-be-registries - renders hosts.toml files for containerd registry config
[services.thar-be-registries]
configuration-files = ["thar-be-registries-toml"]
restart-commands = ["/usr/bin/thar-be-registries"]

[configuration-files.thar-be-registries-toml]
path = "/etc/containerd/thar-be-registries.toml"
template-path = "/usr/share/templates/thar-be-registries-toml"
6 changes: 3 additions & 3 deletions sources/shared-defaults/docker-services.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ template-path = "/usr/share/templates/docker-daemon-json"
# Image registries. Retained for backwards compatibility, but superseded by the
# more specific metadata for mirrors and credentials.
[metadata.settings.container-registry]
affected-services = ["docker", "host-containers", "bootstrap-containers"]
affected-services = ["docker", "host-containers", "bootstrap-containers", "thar-be-registries"]

# Image registry mirrors
[metadata.settings.container-registry.mirrors]
affected-services = ["docker", "host-containers", "bootstrap-containers"]
affected-services = ["docker", "host-containers", "bootstrap-containers", "thar-be-registries"]

# Image registry credentials
[metadata.settings.container-registry.credentials]
affected-services = ["host-containers", "bootstrap-containers"]
affected-services = ["host-containers", "bootstrap-containers", "thar-be-registries"]
2 changes: 1 addition & 1 deletion sources/shared-defaults/ecs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ affected-services = ["containerd", "docker", "ecs", "host-containerd", "host-con

# Image registry credentials
[metadata.settings.container-registry.credentials]
affected-services = ["ecs", "host-containers", "bootstrap-containers"]
affected-services = ["ecs", "host-containers", "bootstrap-containers", "thar-be-registries"]
2 changes: 1 addition & 1 deletion sources/shared-defaults/kubernetes-containerd-nvidia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ template-path = "/usr/share/templates/containerd-config-toml_k8s_nvidia_containe

# Image registries
[metadata.settings.container-registry]
affected-services = ["containerd", "host-containers", "bootstrap-containers", "soci-snapshotter"]
affected-services = ["containerd", "host-containers", "bootstrap-containers", "soci-snapshotter", "thar-be-registries"]

[configuration-files.snapshotter-toml]
path = "/etc/containerd/config.d/001-snapshotter.toml"
Expand Down
2 changes: 1 addition & 1 deletion sources/shared-defaults/kubernetes-containerd.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ template-path = "/usr/share/templates/containerd-config-toml_k8s_containerd_sock

# Image registries
[metadata.settings.container-registry]
affected-services = ["containerd", "host-containers", "bootstrap-containers", "soci-snapshotter"]
affected-services = ["containerd", "host-containers", "bootstrap-containers", "soci-snapshotter", "thar-be-registries"]

[configuration-files.snapshotter-toml]
path = "/etc/containerd/config.d/001-snapshotter.toml"
Expand Down