chore(python): bump python 3.12

Author: duanhongyi

charts/controller/templates/controller-api-deployment.yaml

@@ -84,11 +84,3 @@ spec:
             name: http
         {{- include "controller.limits" . | indent 8 }}
         {{- include "controller.envs" . | indent 8 }}
-        volumeMounts:
-        - name: controller-config
-          readOnly: false
-          mountPath: /etc/controller
-      volumes:
-      - name: controller-config
-        configMap:
-          name: controller-config

charts/controller/templates/controller-cronjob-daily.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       template:
         metadata:
-          labels:
+          labels: {{- include "common.labels.standard" . | nindent 12 }}
             app: drycc-controller-conjob
         spec:
           restartPolicy: OnFailure

charts/controller/templates/controller-cronjob-hourly.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       template:
         metadata:
-          labels:
+          labels: {{- include "common.labels.standard" . | nindent 12 }}
             app: drycc-controller-conjob
         spec:
           restartPolicy: OnFailure

…oller/templates/controller-job-init.yaml …er/templates/controller-job-upgrade.yamlcharts/controller/templates/controller-job-init.yaml renamed to charts/controller/templates/controller-job-upgrade.yaml charts/controller/templates/controller-job-init.yaml renamed to charts/controller/templates/controller-job-upgrade.yaml

@@ -1,12 +1,19 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: drycc-controller-job-init
+  name: drycc-controller-job-upgrade
+  labels:
+    heritage: drycc
+  annotations:
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   template:
+    metadata:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
+        app: drycc-controller-job-upgrade
     spec:
       initContainers:
-      - name: drycc-controller-job-init
+      - name: drycc-controller-job-upgrade-init
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
         imagePullPolicy: {{.Values.imagePullPolicy}}
         args:
@@ -15,10 +22,10 @@ spec:
         - -u
         - $(DRYCC_DATABASE_URL),$(DRYCC_DATABASE_REPLICA_URL),$(DRYCC_RABBITMQ_URL)
         - -a
-        - $(DRYCC_REDIS_ADDRS),$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)
-        {{- include "controller.envs" . | indent 6 }}
+        - $(DRYCC_REDIS_ADDRS)
+        {{- include "controller.envs" . | indent 8 }}
       containers:
-      - name: drycc-controller-job-init
+      - name: drycc-controller-job-upgrade
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         {{- if .Values.diagnosticMode.enabled }}
@@ -37,6 +44,14 @@ spec:
           python -u /workspace/manage.py cluster_lock unlock
         {{- end }}
         {{- include "controller.envs" . | indent 8 }}
+        volumeMounts:
+        - name: controller-config
+          readOnly: false
+          mountPath: /etc/controller
+      volumes:
+      - name: controller-config
+        configMap:
+          name: controller-config
       restartPolicy: Never
   backoffLimit: 0
   ttlSecondsAfterFinished: 3600

rootfs/Dockerfile

@@ -4,7 +4,7 @@ FROM registry.drycc.cc/drycc/base:${CODENAME}
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/workspace \
-  PYTHON_VERSION="3.11"
+  PYTHON_VERSION="3.12"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}

rootfs/Dockerfile.test

@@ -7,11 +7,11 @@ COPY requirements.txt ${DRYCC_HOME_DIR}/requirements.txt
 COPY dev_requirements.txt ${DRYCC_HOME_DIR}/dev_requirements.txt
 
 ENV PGDATA="/opt/drycc/postgresql/data" \
-  PYTHON_VERSION="3.11" \
-  REDIS_VERSION="7.0.11" \
-  RABBITMQ_VERSION="3.12.0" \
-  POSTGRES_VERSION="15.3" \
-  GOSU_VERSION="1.16"
+  PYTHON_VERSION="3.12" \
+  REDIS_VERSION="7.2.4" \
+  RABBITMQ_VERSION="3.12.13" \
+  POSTGRES_VERSION="15.5" \
+  GOSU_VERSION="1.17"
 
 RUN buildDeps='gcc rustc cargo  libffi-dev musl-dev openssl'; \
   install-packages mercurial ca-certificates git $buildDeps \

rootfs/api/management/commands/cluster_lock.py

@@ -20,16 +20,16 @@ def add_arguments(self, parser):
         )
 
     def lock(self):
-        cache.set(lock_key, settings.VERSION)
+        cache.delete(lock_key)
         print("lock completed!")
 
     def unlock(self):
-        cache.delete(lock_key)
+        cache.set(lock_key, settings.VERSION)
         print("unlock completed!")
 
     def waitting(self):
         while True:
-            version = cache.get("drycc:controller:version")
+            version = cache.get(lock_key, None)
             if version != settings.VERSION:
                 print(waitting_init_msg % (version, settings.VERSION))
             else:

rootfs/api/models/appsettings.py

@@ -9,6 +9,7 @@
 from .base import UuidAuditedModel
 
 User = get_user_model()
+logger = logging.getLogger(__name__)
 
 
 class AppSettings(UuidAuditedModel):
@@ -35,6 +36,17 @@ def __init__(self, *args, **kwargs):
     def __str__(self):
         return "{}-{}".format(self.app.id, str(self.uuid)[:7])
 
+    def log(self, message, level=logging.INFO):
+        """Logs a message in the context of this application.
+
+        This prefixes log messages with an application "tag" that the customized
+        drycc-logspout will be on the lookout for.  When it's seen, the message-- usually
+        an application event of some sort like releasing or scaling, will be considered
+        as "belonging" to the application instead of the controller and will be handled
+        accordingly.
+        """
+        logger.log(level, "[{}]: {}".format(self.app.id, message))
+
     def previous(self):
         """
         Return the previous Release to this one.
@@ -167,7 +179,7 @@ def _update_fields(self, ignore_update_fields=None):
             self.delete()
             raise AlreadyExists("{} changed nothing".format(self.owner))
         summary = ' '.join(self.summary)
-        self.app.log('summary of app setting changes: {}'.format(summary), logging.DEBUG)
+        self.log('summary of app setting changes: {}'.format(summary), logging.DEBUG)
 
     def diff_canaries(self):
         prev_app_settings = self.previous()

rootfs/api/models/release.py

@@ -43,6 +43,17 @@ def __str__(self):
     def image(self):
         return self.build.image
 
+    def log(self, message, level=logging.INFO):
+        """Logs a message in the context of this application.
+
+        This prefixes log messages with an application "tag" that the customized
+        drycc-logspout will be on the lookout for.  When it's seen, the message-- usually
+        an application event of some sort like releasing or scaling, will be considered
+        as "belonging" to the application instead of the controller and will be handled
+        accordingly.
+        """
+        logger.log(level, "[{}]: {}".format(self.app.id, message))
+
     def new(self, user, config, build, summary=None, canary=False):
         """
         Create a new application release using the provided Build and Config
@@ -69,7 +80,7 @@ def get_port(self):
             creds = self.get_registry_auth()
 
             if self.build.type == "buildpack":
-                self.app.log(
+                self.log(
                     'buildpack type detected. Defaulting to $PORT %s' % DEFAULT_CONTAINER_PORT)
                 return DEFAULT_CONTAINER_PORT
 
@@ -172,7 +183,7 @@ def cleanup_old(self):  # noqa
         Stray pods no longer relevant to the latest release
         """
         latest_version = 'v{}'.format(self.version)
-        self.app.log(
+        self.log(
             'Cleaning up RSs for releases older than {} (latest)'.format(latest_version),
             level=logging.DEBUG
         )
@@ -194,7 +205,7 @@ def cleanup_old(self):  # noqa
                 replica_sets_removal.append(current_version)
 
         if replica_sets_removal:
-            self.app.log(
+            self.log(
                 'Found the following versions to cleanup: {}'.format(', '.join(replica_sets_removal)),  # noqa
                 level=logging.DEBUG
             )
@@ -260,7 +271,7 @@ def _cleanup_deployment_secrets_and_configs(self, namespace):
             # http://kubernetes.io/docs/user-guide/labels/#set-based-requirement
             'version__notin': versions
         }
-        self.app.log('Cleaning up orphaned env var secrets for application {}'.format(namespace), level=logging.DEBUG)  # noqa
+        self.log('Cleaning up orphaned env var secrets for application {}'.format(namespace), level=logging.DEBUG)  # noqa
         secrets = self.scheduler().secret.get(namespace, labels=labels).json()['items']
         if not secrets:
             secrets = []

rootfs/api/models/resource.py

@@ -117,7 +117,7 @@ def log(self, message, level=logging.INFO):
         as "belonging" to the application instead of the controller and will be handled
         accordingly.
         """
-        logger.log(level, "[{}]: {}".format(self.uuid, message))
+        logger.log(level, "[{}]: {}".format(self.app.id, message))
 
     def bind(self, *args, **kwargs):
         if self.status != "Ready":