Skip to content

Commit 3ce26a4

Browse files
committed
fix(migration): cert migrate error
1 parent 6cb5293 commit 3ce26a4

4 files changed

Lines changed: 28 additions & 13 deletions

File tree

charts/controller/templates/controller-job-upgrade.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ metadata:
99
spec:
1010
template:
1111
spec:
12+
serviceAccount: drycc-controller
1213
initContainers:
1314
- name: drycc-controller-job-upgrade-init
1415
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest

rootfs/api/migrations/0012_alter_app_options_rename_procfile_type_domain_ptype_and_more.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.2.15 on 2024-09-03 03:48
1+
# Generated by Django 4.2.15 on 2024-09-06 03:57
22

33
import api.utils
44
from django.db import migrations, models
@@ -34,8 +34,7 @@ class Migration(migrations.Migration):
3434
migrations.AddField(
3535
model_name='certificate',
3636
name='app',
37-
field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='api.app'),
38-
preserve_default=False,
37+
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='api.app'),
3938
),
4039
migrations.AddField(
4140
model_name='release',

rootfs/api/migrations/0013_migration_permissions_and_certificates.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@ def migration_permission(apps, schema_editor):
1818
def migration_certificate(apps, schema_editor):
1919
for domain in Domain.objects.all():
2020
if domain.certificate:
21-
if domain.certificate.app == None:
22-
domain.certificate.app = domain.app
23-
domain.certificate.save()
24-
else:
25-
certificate = domain.certificate
26-
certificate.pk = None
27-
certificate.app = domain.app
28-
certificate.save()
29-
domain.certificate = certificate
30-
domain.save()
21+
certificate = domain.certificate
22+
certificate.pk = None
23+
certificate.app = domain.app
24+
certificate.save()
25+
domain.certificate = certificate
26+
domain.save()
3127
Certificate.objects.filter(app=None).delete()
3228

3329

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 4.2.15 on 2024-09-06 03:58
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('api', '0013_migration_permissions_and_certificates'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='certificate',
16+
name='app',
17+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.app'),
18+
),
19+
]

0 commit comments

Comments
 (0)