Merge pull request #1231 from etungsten/restart-commands

models: add restart-commands for docker, kubelet, containerd

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]

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 = []

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"]

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"