Update Django on GKE (GoogleCloudPlatform#6448)

glasnt · web-flow · commit c7375e57ccca · 2021-07-22T16:28:09.000Z
## Description General updates to the Django on GKE tutorial, including bumping django version, removing `polls` hardcoded value, and adding new Django 3.2 specific setting. ## Checklist - [x] I have followed [Sample Guidelines from AUTHORING_GUIDE.MD](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md) - [x] README is updated to include [all relevant information](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#readme-file) - [x] **Tests** pass: `nox -s py-3.6` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup)) - [x] **Lint** pass: `nox -s lint` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup)) - [x] Please **merge** this PR for me once it is approved. - [x] I updated the [CODEOWNERS file](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/.github/CODEOWNERS) with the codeowners for this sample, as I should be a maintainer going forward.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -46,6 +46,7 @@
 /jobs/**/*.py                          @GoogleCloudPlatform/python-samples-owners
 /kms/**/*.py                           @GoogleCloudPlatform/python-samples-owners
 /kubernetes_engine/**/*.py             @GoogleCloudPlatform/python-samples-owners
+/kubernetes_engine/django_tutorial/**/*.py @glasnt @GoogleCloudPlatform/python-samples-owners
 /language/**/*.py                      @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
 /media/**/*.py                         @irataxy @GoogleCloudPlatform/python-samples-owners
 /memorystore/**/*.py                   @GoogleCloudPlatform/python-samples-owners
diff --git a/kubernetes_engine/django_tutorial/mysite/settings.py b/kubernetes_engine/django_tutorial/mysite/settings.py
@@ -83,7 +83,7 @@
         # If you are using Cloud SQL for MySQL rather than PostgreSQL, set
         # 'ENGINE': 'django.db.backends.mysql' instead of the following.
         'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'polls',
+        'NAME': os.getenv('DATABASE_NAME'),
         'USER': os.getenv('DATABASE_USER'),
         'PASSWORD': os.getenv('DATABASE_PASSWORD'),
         'HOST': '127.0.0.1',
@@ -110,6 +110,12 @@
 
 # [START gke_django_staticconfig]
 STATIC_URL = '/static/'
+# STATIC_URL = 'https://storage.googleapis.com/[YOUR_GCS_BUCKET]/static/'
 # [END gke_django_staticconfig]
 
 STATIC_ROOT = 'static/'
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
diff --git a/kubernetes_engine/django_tutorial/polls.yaml b/kubernetes_engine/django_tutorial/polls.yaml
@@ -49,6 +49,11 @@ spec:
         imagePullPolicy: Always
         env:
             # [START cloudsql_secrets]
+            - name: DATABASE_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: cloudsql
+                  key: database
             - name: DATABASE_USER
               valueFrom:
                 secretKeyRef:
diff --git a/kubernetes_engine/django_tutorial/requirements.txt b/kubernetes_engine/django_tutorial/requirements.txt
@@ -1,6 +1,4 @@
-Django==3.0.2; python_version > '3.5'
-Django==2.2.9; python_version == '3.5'
-Django==1.11.28;python_version < '3.0'
+Django==3.2.5
 # Uncomment the mysqlclient requirement if you are using MySQL rather than
 # PostgreSQL. You must also have a MySQL client installed in that case.
 #mysqlclient==1.4.1
