chore(chart): modify secret

Author: lijianguo

charts/passport/templates/_helpers.tpl

@@ -17,7 +17,7 @@ env:
 - name: "TZ"
   value: {{ .Values.time_zone | default "UTC" | quote }}
 - name: "DRYCC_CONTROLLER_DOMAIN"
-  value: drycc.{{ .Values.global.platform_domain }}
+  value: http://drycc.{{ .Values.global.platform_domain }}
 - name: SOCIAL_AUTH_DRYCC_CONTROLLER_KEY
   valueFrom:
     secretKeyRef:
@@ -36,7 +36,7 @@ env:
   value: {{ .Values.admin_username | default "admin" | quote }}
 - name: ADMIN_PASSWORD
   value: {{ .Values.admin_password | default "admin" | quote }}
-- name: ADMIN_EMAIN
+- name: ADMIN_EMAIL
   value: {{ .Values.admin_email | default "admin@email.com" | quote }}
 {{- if (.Values.database_url) }}
 - name: DRYCC_DATABASE_URL

charts/passport/templates/passport-secret-creds.yaml

@@ -12,7 +12,7 @@ data:
   database-url: {{ .Values.database_url | b64enc }}
   {{- end }}
   django-secret-key: {{ randAscii 64 | b64enc }}
-  social-auth-drycc-controller-key: {{ randAscii 40 | b64enc }}
-  social-auth-drycc-controller-secret: {{ randAscii 64 | b64enc }}
+  social-auth-drycc-controller-key: {{ randAlphaNum 40 | b64enc }}
+  social-auth-drycc-controller-secret: {{ randAlphaNum 64 | b64enc }}
   oidc-rsa-private-key: "{{genPrivateKey "rsa" | b64enc}}"
 {{- end }}

rootfs/Dockerfile

@@ -2,8 +2,7 @@ FROM docker.io/library/python:3.9-alpine
 
 COPY requirements.txt /app/requirements.txt
 
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories \
-  && apk add --update --virtual .build-deps \
+RUN apk add --update --virtual .build-deps \
     postgresql-dev \
     gcc \
     libffi-dev \

rootfs/api/management/commands/create_oauth2_application.py

@@ -21,19 +21,19 @@ def handle(self, *args, **options):
         user = User.objects.filter(is_superuser=True).first()
         if not user:
             self.stdout.write("Cannot create because there is no superuser")
-        application, created = Application.objects.get_or_create(
-            client_id=client_id,
-            client_secret=client_secret,
+        application, updated = Application.objects.update_or_create(
+            name='Drycc Controller',
             defaults={
-                'name': 'Drycc Controller',
+                'client_id': client_id,
+                'client_secret': client_secret,
                 'user': user,
-                'redirect_uris': f'{controller_domain}/complete/drycc/',
+                'redirect_uris': f'{controller_domain}/v2/complete/drycc/',
                 'authorization_grant_type': 'authorization-code',
                 'client_type': 'Public',
                 'algorithm': 'RS256'
             }
         )
-        if created:
+        if updated:
             self.stdout.write('Drycc controller app created')
         else:
-            self.stdout.write("Drycc controller app already exists")
+            self.stdout.write("Drycc controller app updated")

rootfs/api/management/commands/createadminuser.py

@@ -20,7 +20,7 @@ def handle(self, *args, **options):
         if password and not username:
             raise CommandError("--username is required if specifying --password")
         user = self.UserModel._default_manager.db_manager(database).\
-                get(username=username)
+            filter(username=username)
         if user:
             self.stdout.write('That username is already created')
             return