T6686: adds container health checks

Author: nvollmar

interface-definitions/container.xml.in

@@ -556,6 +556,52 @@
             </properties>
              <defaultValue>journald</defaultValue>
           </leafNode>
+          <node name="health-check">
+            <properties>
+              <help>Configure health check for the container</help>
+            </properties>
+            <children>
+              <leafNode name="command">
+                <properties>
+                  <help>Health check command to run for the container</help>
+                </properties>
+              </leafNode>
+              <leafNode name="interval">
+                <properties>
+                  <help>Interval for the health checks</help>
+                  <completionHelp>
+                    <list>30s disable</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>disable</format>
+                    <description>Run health checks manually</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>^(?:disable|(?:\d+(?:\.\d+)?(?:ms|s|m|h))+)$</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="timeout">
+                <properties>
+                  <help>Timeout for the health check to complete</help>
+                  <completionHelp>
+                    <list>30s</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>^(?:\d+(?:\.\d+)?(?:ms|s|m|h))+$</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="retries">
+                <properties>
+                  <help>The number of retries before container is consider unhealthy</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-255"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
         </children>
       </tagNode>
       <tagNode name="network">

smoketest/scripts/cli/test_container.py

@@ -112,6 +112,27 @@ def test_basic(self):
 
         l = cmd_to_json(f'sudo podman container inspect {cont_name}')
         self.assertEqual(l['HostConfig']['LogConfig']['Type'], 'journald')
+        self.assertEqual(l['Config']['Healthcheck']['Test'], ['NONE'])
+
+
+    def test_healthcheck(self):
+        cont_name = 'health-test'
+
+        self.cli_set(base_path + ['name', cont_name, 'allow-host-networks'])
+        self.cli_set(base_path + ['name', cont_name, 'image', busybox_image])
+
+        self.cli_set(base_path + ['name', cont_name, 'health-check', 'command', 'true'])
+        self.cli_set(base_path + ['name', cont_name, 'health-check', 'interval', '10s'])
+        self.cli_set(base_path + ['name', cont_name, 'health-check', 'timeout', '1s'])
+        self.cli_set(base_path + ['name', cont_name, 'health-check', 'retries', '2'])
+        self.cli_commit()
+
+        l = cmd_to_json(f'sudo podman container inspect {cont_name}')
+        self.assertEqual(l['HostConfig']['LogConfig']['Type'], 'journald')
+        self.assertEqual(l['Config']['Healthcheck']['Test'], ['CMD-SHELL', 'true'])
+        self.assertEqual(l['Config']['Healthcheck']['Interval'], 10000000000)
+        self.assertEqual(l['Config']['Healthcheck']['Timeout'], 1000000000)
+        self.assertEqual(l['Config']['Healthcheck']['Retries'], 2)
 
 
     def test_name_server(self):

src/conf_mode/container.py

@@ -418,6 +418,23 @@ def generate_run_arguments(name, container_config):
         entrypoint = json_write(container_config['entrypoint'].split()).replace('"', """)
         entrypoint = f'--entrypoint '{entrypoint}''
 
+    healthcheck = ''
+    if 'health_check' in container_config:
+      if 'command' in container_config['health_check']:
+        health_cmd = container_config['health_check']['command']
+        healthcheck += f' --health-cmd="{health_cmd}"'
+      if 'interval' in container_config['health_check']:
+        health_int = container_config['health_check']['interval']
+        healthcheck += f' --health-interval={health_int}'
+      if 'timeout' in container_config['health_check']:
+        health_to = container_config['health_check']['timeout']
+        healthcheck += f' --health-timeout={health_to}'
+      if 'retries' in container_config['health_check']:
+        health_rt = container_config['health_check']['retries']
+        healthcheck += f' --health-retries={health_rt}'
+    else:
+      healthcheck = ' --no-healthcheck'
+
     command = ''
     if 'command' in container_config:
         command = container_config['command'].strip()
@@ -427,7 +444,7 @@ def generate_run_arguments(name, container_config):
         command_arguments = container_config['arguments'].strip()
 
     if 'allow_host_networks' in container_config:
-        return f'{container_base_cmd} --net host {entrypoint} {image} {command} {command_arguments}'.strip()
+        return f'{container_base_cmd} {healthcheck} --net host {entrypoint} {image} {command} {command_arguments}'.strip()
 
     ip_param = ''
     networks = ",".join(container_config['network'])
@@ -440,7 +457,7 @@ def generate_run_arguments(name, container_config):
             else:
                 ip_param += f' --ip {address}'
 
-    return f'{container_base_cmd} --no-healthcheck --net {networks} {ip_param} {entrypoint} {image} {command} {command_arguments}'.strip()
+    return f'{container_base_cmd} {healthcheck} --net {networks} {ip_param} {entrypoint} {image} {command} {command_arguments}'.strip()
 
 
 def generate(container):