chore(passport): modify boot shell

Author: lijianguo

charts/passport/templates/_helpers.tpl

@@ -32,6 +32,12 @@ env:
   valueFrom:
     fieldRef:
       fieldPath: metadata.namespace
+- name: ADMIN_USERNAME
+  value: {{ .Values.admin_username | default "admin" | quote }}
+- name: ADMIN_PASSWORD
+  value: {{ .Values.admin_password | default "admin" | quote }}
+- name: ADMIN_EMAIN
+  value: {{ .Values.admin_email | default "admin@email.com" | quote }}
 {{- if (.Values.database_url) }}
 - name: DRYCC_DATABASE_URL
   valueFrom:

charts/passport/templates/passport-ingress.yaml

@@ -30,6 +30,6 @@ spec:
   tls:
     - secretName: drycc-passport-certificate-auto
       hosts:
-        - drycc.{{ .Values.global.platform_domain }}
+        - drycc-passport.{{ .Values.global.platform_domain }}
   {{- end }}
 {{- end }}

rootfs/api/management/commands/create_oauth2_application.py

@@ -1,5 +1,4 @@
 import os
-import base64
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
 from oauth2_provider.models import Application
@@ -9,17 +8,19 @@ class Command(BaseCommand):
     """Management command for create Oauth2 application"""
 
     def handle(self, *args, **options):
-        client_id = base64.b64decode(os.environ.get(
-            'SOCIAL_AUTH_DRYCC_CONTROLLER_KEY')) if os.environ.get(
+        client_id = os.environ.get(
+            'SOCIAL_AUTH_DRYCC_CONTROLLER_KEY') if os.environ.get(
             'SOCIAL_AUTH_DRYCC_CONTROLLER_KEY') else None
-        client_secret = base64.b64decode(os.environ.get(
-            'SOCIAL_AUTH_DRYCC_CONTROLLER_SECRET')) if os.environ.get(
+        client_secret = os.environ.get(
+            'SOCIAL_AUTH_DRYCC_CONTROLLER_SECRET') if os.environ.get(
             'SOCIAL_AUTH_DRYCC_CONTROLLER_SECRET') else None
         controller_domain = os.environ.get('DRYCC_CONTROLLER_DOMAIN')
         if not all([client_id, client_secret, controller_domain]):
             self.stdout.write('client_id or client_secret non-existent')
             return
-        user = User.objects.get(username='admin')
+        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,

rootfs/api/management/commands/createadminuser.py

@@ -19,7 +19,11 @@ 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)
+        if user:
+            self.stdout.write('That username is already created')
+            return
         super(Command, self).handle(*args, **options)
 
         if password:

rootfs/bin/boot

@@ -28,8 +28,10 @@ echo "Database Migrations:"
 python /app/manage.py migrate --noinput
 
 echo ""
-echo "Create administrator"
-python /app/manage.py createadminuser --username "${ADMIN_USERNAME}" --password "${ADMIN_PASSWORD}" --noinput --email "${ADMIN_EMAIL}"
+if [ "${ADMIN_USERNAME}" ] && [ "${ADMIN_PASSWORD}" ] && [ "${ADMIN_EMAIL}" ]; then
+  echo "Create administrator"
+  python /app/manage.py createadminuser --username "${ADMIN_USERNAME}" --password "${ADMIN_PASSWORD}" --noinput --email "${ADMIN_EMAIL}"
+fi
 
 echo ""
 echo "Create application for drycc controller "