chore(config): unify lifecycle interface

Author: duanhongyi

rootfs/api/migrations/0027_rename_lifecycle_post_start_config_lifecycle_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.8 on 2025-12-05 13:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0026_app_suspended_state'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='config',
+            old_name='lifecycle_post_start',
+            new_name='lifecycle',
+        ),
+        migrations.RemoveField(
+            model_name='config',
+            name='lifecycle_pre_stop',
+        ),
+    ]

rootfs/api/models/app.py

@@ -1227,7 +1227,6 @@ def _gather_app_settings(self, release, app_settings, ptype, replicas, volumes=N
         routable = True if (
             ptype == PTYPE_WEB and app_settings.routable) else False
 
-        healthcheck = config.healthcheck.get(ptype, {})
         volumes, volume_mounts = self._get_volumes_and_mounts(ptype, volumes)
         volumes.extend(limit_plan.pod_volumes)
         volume_mounts.extend(limit_plan.container_volume_mounts)
@@ -1241,11 +1240,10 @@ def _gather_app_settings(self, release, app_settings, ptype, replicas, volumes=N
             'resources': {"limits": limit_plan.limits, "requests": limit_plan.requests},
             'build_type': release.build.type,
             'annotations': limit_plan.annotations,
-            'healthcheck': healthcheck,
+            'lifecycle': config.lifecycle.get(ptype, {}),
+            'healthcheck': config.healthcheck.get(ptype, {}),
             'runtime_class_name': limit_plan.runtime_class_name,
             'dns_policy': settings.DRYCC_APP_DNS_POLICY,
-            'lifecycle_post_start': config.lifecycle_post_start.get(ptype, {}),
-            'lifecycle_pre_stop': config.lifecycle_pre_stop.get(ptype, {}),
             'routable': routable,
             'deploy_batches': batches,
             'restart_policy': "Always",

rootfs/api/models/config.py

@@ -16,19 +16,18 @@ class Config(UuidAuditedModel):
     Set of configuration values applied as environment variables
     during runtime execution of the Application.
     """
-    ptype_fields = ("lifecycle_post_start", "lifecycle_pre_stop", "tags", "limits",
-                    "values_refs", "healthcheck", "termination_grace_period", "registry")
+    ptype_fields = ("lifecycle", "tags", "limits", "values_refs", "healthcheck",
+                    "termination_grace_period", "registry")
     allof_fields = ("values", ) + ptype_fields
 
     owner = models.ForeignKey(User, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     values = models.JSONField(default=list, blank=True)
     values_refs = models.JSONField(default=dict, blank=True)
-    lifecycle_post_start = models.JSONField(default=dict, blank=True)
-    lifecycle_pre_stop = models.JSONField(default=dict, blank=True)
     tags = models.JSONField(default=dict, blank=True)
     limits = models.JSONField(default=dict, blank=True)
     registry = models.JSONField(default=dict, blank=True)
+    lifecycle = models.JSONField(default=dict, blank=True)
     healthcheck = models.JSONField(default=dict, blank=True)
     termination_grace_period = models.JSONField(default=dict, blank=True)
 

rootfs/api/serializers/__init__.py

@@ -280,8 +280,7 @@ class ConfigSerializer(serializers.ModelSerializer):
     owner = serializers.ReadOnlyField(source='owner.username')
     values = JSONFieldSerializer(required=False, binary=True)
     limits = JSONFieldSerializer(required=False, binary=True)
-    lifecycle_post_start = JSONFieldSerializer(required=False, binary=True)
-    lifecycle_pre_stop = JSONFieldSerializer(required=False, binary=True)
+    lifecycle = JSONFieldSerializer(required=False, binary=True)
     tags = JSONFieldSerializer(required=False, binary=True)
     registry = JSONFieldSerializer(required=False, binary=True)
     healthcheck = JSONFieldSerializer(convert_to_str=False, required=False, binary=True)

rootfs/api/serializers/schemas/healthcheck.py

@@ -3,8 +3,6 @@
 
     "type": "object",
     "properties": {
-        # Exec specifies the action to take.
-        # More info: http://kubernetes.io/docs/api-reference/v1/definitions/#_v1_execaction
         "exec": {
             "type": "object",
             "properties": {
@@ -16,8 +14,14 @@
             },
             "required": ["command"]
         },
-        # HTTPGet specifies the http request to perform.
-        # More info: http://kubernetes.io/docs/api-reference/v1/definitions/#_v1_httpgetaction
+        "grpc": {
+            "type": "object",
+            "properties": {
+                "port": {"type": "integer"},
+                "service": {"type": "string"},
+            },
+            "required": ["port"]
+        },
         "httpGet": {
             "type": "object",
             "properties": {
@@ -39,28 +43,23 @@
             },
             "required": ["port"]
         },
-        # TCPSocket specifies an action involving a TCP port.
-        # More info: http://kubernetes.io/docs/api-reference/v1/definitions/#_v1_tcpsocketaction
         "tcpSocket": {
             "type": "object",
             "properties": {
                 "port": {"type": "integer"},
             },
             "required": ["port"]
         },
-        # Number of seconds after the container has started before liveness probes are initiated.
-        # More info: http://releases.k8s.io/HEAD/docs/user-guide/pod-states.md#container-probes
         "initialDelaySeconds": {"type": "integer"},
-        # Number of seconds after which the probe times out.
-        # More info: http://releases.k8s.io/HEAD/docs/user-guide/pod-states.md#container-probes
         "timeoutSeconds": {"type": "integer"},
-        # How often (in seconds) to perform the probe.
         "periodSeconds": {"type": "integer"},
-        # Minimum consecutive successes for the probe to be considered successful
-        # after having failed.
         "successThreshold": {"type": "integer"},
-        # Minimum consecutive failures for the probe to be considered
-        # failed after having succeeded.
         "failureThreshold": {"type": "integer"},
-    }
+    },
+    "oneOf": [
+        {"required": ["exec"]},
+        {"required": ["grpc"]},
+        {"required": ["httpGet"]},
+        {"required": ["tcpSocket"]},
+    ]
 }

rootfs/api/tests/test_config.py

@@ -368,8 +368,7 @@ def test_response_data(self, mock_requests):
         for key in response.data:
             self.assertIn(key, ['uuid', 'owner', 'created', 'updated', 'app', 'values',
                                 'values_refs', 'limits', 'tags', 'registry', 'healthcheck',
-                                'lifecycle_post_start', 'lifecycle_pre_stop',
-                                'termination_grace_period'])
+                                'lifecycle', 'termination_grace_period'])
         expected = {
             'owner': self.user.username,
             'app': app_id,
@@ -400,8 +399,7 @@ def test_response_data_types_converted(self, mock_requests):
         for key in response.data:
             self.assertIn(key, ['uuid', 'owner', 'created', 'updated', 'app', 'values', 'limits',
                                 'values_refs', 'tags', 'registry', 'healthcheck',
-                                'lifecycle_post_start', 'lifecycle_pre_stop',
-                                'termination_grace_period'])
+                                'lifecycle', 'termination_grace_period'])
         expected = {
             'owner': self.user.username,
             'app': app_id,

rootfs/scheduler/resources/pod.py

@@ -1,4 +1,3 @@
-from collections import defaultdict
 from datetime import datetime, timedelta, timezone
 import operator
 import os
@@ -236,8 +235,8 @@ def _set_container(self, namespace, container_name, data, **kwargs):
         self._set_container_default_env(data)
         # list sorted by dict key name
         data['env'].sort(key=operator.itemgetter('name'))
+        data['lifecycle'] = data.get('lifecycle', {})
         self._set_health_checks(data, env, **kwargs)
-        self._set_lifecycle_hooks(data, env, **kwargs)
 
     def _set_container_default_env(self, data):
         # set fields env
@@ -286,38 +285,6 @@ def _set_health_checks(self, container, env, **kwargs):
             container.update(
                 self._default_container_readiness_probe(env.get('PORT', DEFAULT_CONTAINER_PORT)))
 
-    @staticmethod
-    def _set_lifecycle_hooks(container, env, **kwargs):
-        app_type = kwargs.get("app_type")
-        lifecycle_post_start = kwargs.get('lifecycle_post_start', {})
-        lifecycle_post_start = lifecycle_post_start.get(app_type)
-        lifecycle_pre_stop = kwargs.get('lifecycle_pre_stop', {})
-        lifecycle_pre_stop = lifecycle_pre_stop.get(app_type)
-        if lifecycle_post_start or lifecycle_pre_stop:
-            lifecycle = defaultdict(dict)
-
-            if lifecycle_post_start:
-                lifecycle["postStart"] = {
-                        'exec': {
-                            "command": [
-                                "/bin/bash",
-                                "-c",
-                                "{0}".format(lifecycle_post_start)
-                            ]
-                        }
-                }
-            if lifecycle_pre_stop:
-                lifecycle["preStop"] = {
-                        'exec': {
-                            "command": [
-                                "/bin/bash",
-                                "-c",
-                                "{0}".format(lifecycle_pre_stop)
-                            ]
-                        }
-                }
-            container["lifecycle"] = dict(lifecycle)
-
     @staticmethod
     def _default_container_readiness_probe(port, delay=5, timeout=5, period_seconds=5,
                                            success_threshold=1, failure_threshold=1):