chore(release): add version_name

duanhongyi · duanhongyi · commit a48ae7dea312 · 2024-05-10T00:14:44.000+08:00
diff --git a/rootfs/api/models/app.py b/rootfs/api/models/app.py
@@ -240,7 +240,7 @@ def scale(self, user, structure):
         self._scale(user, structure, release, app_settings)
 
     def pipeline(self, release, force_deploy=False, rollback_on_failure=True):
-        prefix = f"[pipeline] release v{release.version}"
+        prefix = f"[pipeline] release {release.version_name}"
         try:
             self.log(f"{prefix} starts running...")
             if release.build.dryccfile:
@@ -518,9 +518,8 @@ def set_application_config(self, release, procfile_type):
         updates it if it already exists
         """
         # env vars are stored in secrets and mapped to env in k8s
-        version = 'v{}'.format(release.version)
         labels = {
-            'version': version,
+            'version': release.version_name,
             'type': procfile_type,
             'class': 'env'
         }
@@ -533,7 +532,7 @@ def set_application_config(self, release, procfile_type):
         # dictionary sorted by key
         secrets_env = OrderedDict(sorted(secrets_env.items(), key=lambda t: t[0]))
 
-        secret_name = "{}-{}-{}-env".format(self.id, procfile_type, version)
+        secret_name = "{}-{}-{}-env".format(self.id, procfile_type, release.version_name)
         try:
             self.scheduler().secret.get(self.id, secret_name)
         except KubeHTTPException:
@@ -645,7 +644,7 @@ def _deploy(self, deploys, procfile_types, prev_release,
                 if (prev_release.canary == release.canary and
                         rollback_on_failure and prev_release.build is not None):
                     err = 'There was a problem deploying {}. Rolling back to release {}.'.format(
-                        'v{}'.format(release.version), "v{}".format(prev_release.version))
+                        release.version_name, prev_release.version_name)
                     # This goes in the log before the rollback starts
                     self.log(err, logging.ERROR)
                     # revert all process types to old release
@@ -925,7 +924,7 @@ def _build_env_vars(self, release, procfile_type):
         # mix in default environment information drycc may require
         default_env = {
             'DRYCC_APP': self.id,
-            'WORKFLOW_RELEASE': 'v{}'.format(release.version),
+            'WORKFLOW_RELEASE': release.version_name,
             'WORKFLOW_RELEASE_SUMMARY': release.summary,
             'WORKFLOW_RELEASE_CREATED_AT': str(release.created.strftime(
                 settings.DRYCC_DATETIME_FORMAT))
@@ -1042,7 +1041,7 @@ def _gather_app_settings(self, release, app_settings, procfile_type, replicas, v
             'envs': envs,
             'registry': config.registry,
             'replicas': replicas,
-            'version': 'v{}'.format(release.version),
+            'version': release.version_name,
             'app_type': procfile_type,
             'resources': {"limits": limit_plan.limits, "requests": limit_plan.requests},
             'build_type': release.build.type,
diff --git a/rootfs/api/models/release.py b/rootfs/api/models/release.py
@@ -44,14 +44,18 @@ class Meta:
         unique_together = (('app', 'version'),)
 
     def __str__(self):
-        return "{0}-v{1}".format(self.app.id, self.version)
+        return "{0}-{1}".format(self.app.id, self.version_name)
 
     @property
     def procfile_types(self):
         if self.build is not None:
             return self.build.procfile_types
         return []
 
+    @property
+    def version_name(self):
+        return f'v{self.version}'
+
     def get_run_image(self):
         """
         In the run phase of dryccfile
@@ -272,9 +276,8 @@ def cleanup_old(self, procfile_types=None):
         Secrets no longer tied to any ReplicaSet
         Stray pods no longer relevant to the latest release
         """
-        latest_version = 'v{}'.format(self.version)
         self.log(
-            'Cleaning up RSs for releases older than {} (latest)'.format(latest_version),
+            'Cleaning up RSs for releases older than {} (latest)'.format(self.version_name),
             level=logging.DEBUG
         )
         # base labels
@@ -287,29 +290,30 @@ def cleanup_old(self, procfile_types=None):
         if not replica_sets:
             replica_sets = []
         for replica_set in replica_sets:
-            current_version = replica_set['metadata']['labels']['version']
+            current_version_name = replica_set['metadata']['labels']['version']
             # skip the latest release
-            if current_version == latest_version:
+            if current_version_name == self.version_name:
                 continue
 
             # aggregate versions together to removal all at once
-            if current_version not in replica_sets_removal:
-                replica_sets_removal.append(current_version)
+            if current_version_name not in replica_sets_removal:
+                replica_sets_removal.append(current_version_name)
 
         if replica_sets_removal:
             self.log(
-                'Found the following versions to cleanup: {}'.format(', '.join(replica_sets_removal)),  # noqa
+                'Found the following versions to cleanup: {}'.format(
+                    ', '.join(replica_sets_removal)),
                 level=logging.DEBUG
             )
         # this is RC related
-        for version in replica_sets_removal:
-            self._delete_release_in_scheduler(self.app.id, procfile_types, version)
+        for version_name in replica_sets_removal:
+            self._delete_release_in_scheduler(self.app.id, procfile_types, version_name)
         # handle Deployments specific cleanups
         self._cleanup_deployment_secrets_and_configs(self.app.id, procfile_types)
         # Remove stray pods
-        self._cleanup_stray_pods(self.app.id, procfile_types, latest_version)
+        self._cleanup_stray_pods(self.app.id, procfile_types, self.version_name)
 
-    def _cleanup_stray_pods(self, namespace, procfile_types, latest_version):
+    def _cleanup_stray_pods(self, namespace, procfile_types, latest_version_name):
         labels = {'heritage': 'drycc'}
         if procfile_types is not None:
             labels['type__in'] = procfile_types
@@ -320,9 +324,9 @@ def _cleanup_stray_pods(self, namespace, procfile_types, latest_version):
             if self.scheduler().pod.deleted(pod):
                 continue
 
-            current_version = pod['metadata']['labels']['version']
+            current_version_name = pod['metadata']['labels']['version']
             # skip the latest release
-            if current_version == latest_version:
+            if current_version_name == latest_version_name:
                 continue
 
             try:
@@ -343,27 +347,27 @@ def _cleanup_deployment_secrets_and_configs(self, namespace, procfile_types=None
         """
 
         # Find all ReplicaSets
-        versions = ['v{}'.format(self.version), ]
+        version_names = [self.version_name, ]
         labels = {'heritage': 'drycc', 'app': namespace}
         replicasets = self.scheduler().rs.get(namespace, labels=labels).json()['items']
         if not replicasets:
             replicasets = []
         for replicaset in replicasets:
             if (
                 'version' not in replicaset['metadata']['labels'] or
-                replicaset['metadata']['labels']['version'] in versions
+                replicaset['metadata']['labels']['version'] in version_names
             ):
                 continue
 
-            versions.append(replicaset['metadata']['labels']['version'])
+            version_names.append(replicaset['metadata']['labels']['version'])
 
         # find all env secrets not owned by any replicaset
         labels = {
             'heritage': 'drycc',
             'app': namespace,
             'class': 'env',
             # http://kubernetes.io/docs/user-guide/labels/#set-based-requirement
-            'version__notin': versions
+            'version__notin': version_names
         }
         if procfile_types is not None:
             labels['type__in'] = procfile_types
@@ -374,7 +378,7 @@ def _cleanup_deployment_secrets_and_configs(self, namespace, procfile_types=None
         for secret in secrets:
             self.scheduler().secret.delete(namespace, secret['metadata']['name'])
 
-    def _delete_release_in_scheduler(self, namespace, procfile_types, version):
+    def _delete_release_in_scheduler(self, namespace, procfile_types, version_name):
         """
         Deletes a specific release in k8s based on ReplicationController
 
@@ -384,7 +388,7 @@ def _delete_release_in_scheduler(self, namespace, procfile_types, version):
         labels = {
             'heritage': 'drycc',
             'app': namespace,
-            'version': version
+            'version': version_name
         }
         if procfile_types is not None:
             labels['type__in'] = procfile_types
diff --git a/rootfs/api/signals.py b/rootfs/api/signals.py
@@ -90,7 +90,7 @@ def _hook_release_created(**kwargs):
             url = deploy_hook
             params = {
                 'app': release.app,
-                'release': 'v{}'.format(release.version),
+                'release': release.version_name,
                 'release_summary': release.summary,
                 'sha': '',
                 'user': release.owner,
