fixed minikube settings, added migration job

Author: briancaffey

backend/backend/settings/base.py

@@ -27,7 +27,7 @@
 SECRET_KEY = os.environ.get('SECRET_KEY', '')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = bool(os.environ.get('DEBUG', False))
+DEBUG = bool(os.environ.get('DEBUG', True))
 
 ALLOWED_HOSTS = ['*']
 

backend/backend/settings/minikube.py

@@ -8,7 +8,7 @@
         'NAME': os.environ.get('POSTGRES_NAME', 'kubernetes_django'), # noqa
         'USER': os.environ.get('POSTGRES_USER', 'postgres'), # noqa
         'PASSWORD': os.environ.get('POSTGRES_PASSWORD', 'postgres'), # noqa
-        'HOST': os.environ.get('POSTGRES_HOST', 'postgres'), # noqa
-        'PORT': os.environ.get('POSTGRES_PORT', 5432), # noqa
+        'HOST': os.environ.get('POSTGRES_SERVICE_HOST', 'postgres'), # noqa
+        'PORT': os.environ.get('POSTGRES_SERVICE_PORT', 5432), # noqa
     }
 }

compose/minikube.yml

@@ -0,0 +1,22 @@
+version: '3.7'
+
+services:
+
+  frontend:
+    image: frontend:1
+    build:
+      context: ../
+      dockerfile: nginx/minikube/Dockerfile
+      args:
+        - DOMAIN_NAME=test.dev
+        - GOOGLE_OAUTH2_KEY=google123
+        - GITHUB_KEY=github123
+        - WS_PROTOCOL=ws
+        - HTTP_PROTOCOL=http
+
+  backend:
+    image: backend:2
+    build:
+      context: ../backend/
+      dockerfile: scripts/dev/Dockerfile
+

documentation/docs/topics/minikube/README.md

@@ -231,6 +231,14 @@ Running migrations:
 Try this again with a clean version of minikube and using the Secrets resource.
 :::
 
+## Secrets
+
+Let's use base64 encoding to define a username and password for our Postgres username and password:
+
+```
+echo -n "my-string" | base64
+```
+
 I initially started the postgres container with a password set by environment variable. This may have set data in the
 
 ::: tip kubectl cheatsheet from kubernetes documentation
@@ -272,30 +280,33 @@ This works from inside of a pod, but we can't use this for our static site since
 
 **minikube/Dockerfile**
 
-```Dockerfile
-# build stage
-FROM node:10-alpine as build-stage
-WORKDIR /app/
-ENV DOMAIN_NAME 192.168.99.101:30958 <-- this is the nodePort for the backend service
-ENV HTTP_PROTOCOL http
-COPY quasar/package.json /app/
-RUN npm cache verify
-RUN npm install -g @quasar/cli
-RUN npm install --progress=false
-COPY quasar /app/
-RUN quasar build -m pwa
-
-# minikube stage
-FROM nginx:1.13.12-alpine as minikube
-COPY nginx/minikube/minikube.conf /etc/nginx/nginx.conf
-COPY --from=build-stage /app/dist/pwa /dist/
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+Use the following command to build the frontend resources in minikube:
+
 ```
+docker-compose -f compose/minikube.yml build frontend
+```
+
+Make sure that your current shell has the correct environment variables set for the `DOCKER_HOST` by running:
+
+```
+eval $(minikube docker-env)
+```
+
+
+
+We can pass the environment variables needed during the build process with `ARG` and `ENV`.
+
+For `DOMAIN_NAME`, want to use an address that will point to the minikube Kubernetes cluster. Since the IP might change, we can set this to a named domain such as `test.dev`, and add a line to `/etc/hosts` that will point `test.dev` to the minikube IP. Then, we will need to setup a ingress to point `test.dev` to our `kubernetes-django-service` service.
 
-We need to set the `DOMAIN_NAME` environment variable to `kubernetes-django-service`, and also set the port, and we should be able to access the backend from frontend AJAX calls.
 
 ## Troubleshooting and Misc
 
 https://stackoverflow.com/questions/55573426/virtualbox-is-configured-with-multiple-host-only-adapters-with-the-same-ip-whe
 
+
+
+## Enable Ingress Addon in Minikibe
+
+```
+minikube addons enable ingress
+```

kubernetes/django/deployment.yml

@@ -15,7 +15,7 @@ spec:
       containers:
         - name: backend
           imagePullPolicy: IfNotPresent
-          image: backend:12
+          image: backend:2
           command: ["./manage.py", "runserver", "0.0.0.0:8000"]
           ports:
           - containerPort: 8000
@@ -26,25 +26,20 @@ spec:
             - name: SECRET_KEY
               value: "my-secret-key"
 
-            - name: POSTGRES_USER
-              value: postgres
-              # valueFrom:
-              #   secretKeyRef:
-              #     name: postgres-credentials
-              #     key: user
-
-            - name: POSTGRES_PASSWORD
+            - name: POSTGRES_NAME
               value: postgres
-              # valueFrom:
-              #   secretKeyRef:
-              #     name: postgres-credentials
-              #     key: password
 
-            - name: DEBUG
-              value: "True"
+            - name: POSTGRES_USER
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: user
 
-            - name: POSTGRES_HOST
-              value: postgres-service
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: password
 
           volumeMounts:
             - name: postgres-volume-mount

kubernetes/django/migration.yml

@@ -0,0 +1,32 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: django-migrations
+spec:
+  template:
+    spec:
+      containers:
+        - name: django
+          image: backend:2
+          command: ['python', 'manage.py', 'migrate']
+          env:
+            - name: POSTGRES_USER
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: user
+
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: password
+
+            - name: POSTGRES_NAME
+              value: postgres
+
+            - name: DJANGO_SETTINGS_MODULE
+              value: 'backend.settings.minikube'
+
+      restartPolicy: Never
+  backoffLimit: 5

kubernetes/frontend/deployment.yml

@@ -17,4 +17,4 @@ spec:
       containers:
         - name: frontend
           imagePullPolicy: IfNotPresent
-          image: frontend:one
+          image: frontend:1

kubernetes/frontend/service.yml

@@ -6,7 +6,7 @@ spec:
   selector:
     app: frontend-container
   ports:
-  - nodePort: 30001
+  - nodePort: 30002
     protocol: TCP
     port: 80
     targetPort: 80

kubernetes/postgres/deployment.yml

@@ -18,21 +18,16 @@ spec:
           image: postgres:9.6.6
           env:
             - name: POSTGRES_USER
-              value: postgres
-              # valueFrom:
-              #   secretKeyRef:
-              #     name: postgres-credentials
-              #     key: user
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: user
 
             - name: POSTGRES_PASSWORD
-              value: postgres
-              # valueFrom:
-              #   secretKeyRef:
-              #     name: postgres-credentials
-              #     key: password
-
-            - name: POSTGRES_NAME
-              value: kubernetes_django
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: password
 
           ports:
             - containerPort: 5432
@@ -43,4 +38,4 @@ spec:
       volumes:
         - name: postgres-volume-mount
           persistentVolumeClaim:
-            claimName: postgres-pvc
+            claimName: postgres-pvc

kubernetes/postgres/secrets.yml

@@ -4,5 +4,5 @@ metadata:
   name: postgres-credentials
 type: Opaque
 data:
-  user: postgres
-  password: postgres
+  user: YnJpYW4=
+  password: cGFzc3dvcmQx