From a9e16170348491ef3ee1e229764f20871e4342d5 Mon Sep 17 00:00:00 2001
From: Erikson Tung <etung@amazon.com>
Date: Thu, 3 Dec 2020 12:17:30 -0800
Subject: [PATCH] models: add restart-commands for docker, kubelet, containerd

Add `restart-commands` for `services.kubernetes`, `services.docker`,
`services.containerd`, `services.host-containerd`.
---
 sources/models/defaults.toml                           | 8 +++++++-
 sources/models/src/aws-dev/override-defaults.toml      | 5 +++++
 sources/models/src/aws-ecs-1/override-defaults.toml    | 5 +++++
 sources/models/src/aws-k8s-1.15/override-defaults.toml | 2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sources/models/defaults.toml b/sources/models/defaults.toml
index cc14fb36541..5d6cb460a3e 100644
--- a/sources/models/defaults.toml
+++ b/sources/models/defaults.toml
@@ -23,12 +23,18 @@ template-path = "/usr/share/templates/motd"
 
 [services.containerd]
 configuration-files = ["containerd-config-toml"]
-restart-commands = []
+restart-commands = ["/bin/systemctl try-restart containerd.service"]
 
 [configuration-files.containerd-config-toml]
 path = "/etc/containerd/config.toml"
 template-path = "/usr/share/templates/containerd-config-toml"
 
+# Host-container runtime
+
+[services.host-containerd]
+configuration-files = []
+restart-commands = ["/bin/systemctl try-restart host-containerd.service"]
+
 # Updates.
 
 [settings.updates]
diff --git a/sources/models/src/aws-dev/override-defaults.toml b/sources/models/src/aws-dev/override-defaults.toml
index 6a28637912f..3b3df6bf7a7 100644
--- a/sources/models/src/aws-dev/override-defaults.toml
+++ b/sources/models/src/aws-dev/override-defaults.toml
@@ -1,3 +1,8 @@
 [configuration-files.containerd-config-toml]
 # No override to path
 template-path = "/usr/share/templates/containerd-config-toml_aws-dev"
+
+# Docker
+[services.docker]
+restart-commands = ["/bin/systemctl try-restart docker.service"]
+configuration-files = []
diff --git a/sources/models/src/aws-ecs-1/override-defaults.toml b/sources/models/src/aws-ecs-1/override-defaults.toml
index 5ccc561b3be..91c9b12bc58 100644
--- a/sources/models/src/aws-ecs-1/override-defaults.toml
+++ b/sources/models/src/aws-ecs-1/override-defaults.toml
@@ -2,6 +2,11 @@
 # No override to path
 template-path = "/usr/share/templates/containerd-config-toml_aws-ecs-1"
 
+# Docker
+[services.docker]
+restart-commands = ["/bin/systemctl try-restart docker.service"]
+configuration-files = []
+
 # ECS
 [services.ecs]
 restart-commands = ["/usr/bin/ecs-settings-applier", "/bin/systemctl try-reload-or-restart ecs.service"]
diff --git a/sources/models/src/aws-k8s-1.15/override-defaults.toml b/sources/models/src/aws-k8s-1.15/override-defaults.toml
index 0635fc46afd..765254f7147 100644
--- a/sources/models/src/aws-k8s-1.15/override-defaults.toml
+++ b/sources/models/src/aws-k8s-1.15/override-defaults.toml
@@ -6,7 +6,7 @@ template-path = "/usr/share/templates/containerd-config-toml_aws-k8s"
 
 [services.kubernetes]
 configuration-files = ["kubelet-env", "kubelet-config", "kubelet-kubeconfig", "kubernetes-ca-crt"]
-restart-commands = []
+restart-commands = ["/bin/systemctl try-restart kubelet.service"]
 
 [configuration-files.kubelet-env]
 path = "/etc/kubernetes/kubelet/env"