Greatly simplify docker-compose.yaml

Remove pgadmin and specific version for compose

.gitignore

@@ -2,3 +2,4 @@ venv/
 __pycache__/
 db/
 staticfiles/
+.vscode/settings.json

.gitlab-ci.yml

@@ -17,14 +17,18 @@ build:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
   script:
-    - echo $DEPLOY
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
 
 test:
   stage: test
+  variables:
+    POSTGRES_PASSWORD: postgres
   only:
     variables:
     - $CI_COMMIT_TAG
+  services:
+  - name: postgres:12
+    alias: postgres
   image:
     name: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
     entrypoint: [""]
@@ -32,8 +36,6 @@ test:
     - python manage.py test
 
 deploy:
-  variables:
-    DEPLOY: test
   stage: deploy
   only:
     variables:
@@ -46,6 +48,7 @@ deploy:
     - curl -o /usr/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
     - chmod +x /usr/bin/kubectl
     - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
-    - helm install --upgrade $DEPLOY ./helm --set image=$CI_REGISTRY_IMAGE --set tag=$CI_COMMIT_TAG
-    - POD=$(./kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}')
-    - ./kubectl exec $POD -- python manage.py migrate
+    - helm upgrade --install $DEPLOY ./helm --set image=$CI_REGISTRY_IMAGE --set tag=$CI_COMMIT_TAG
+    - sleep 10
+    - POD=$(kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}')
+    - kubectl exec $POD -- python manage.py migrate

.vscode/launch.json

@@ -12,8 +12,11 @@
             "args": [
                 "test",
             ],
+            "env": {
+                "DB_HOST": "localhost"
+            },
             "django": true,
-            "preLaunchTask": "Migrate"
+            "preLaunchTask": "docker-compose up"
         },
         {
             "name": "Run Server",
@@ -22,10 +25,12 @@
             "program": "${workspaceFolder}/manage.py",
             "args": [
                 "runserver",
-                "--noreload"
             ],
+            "env": {
+                "DB_HOST": "localhost"
+            },
             "django": true,
-            "preLaunchTask": "Migrate"
+            "preLaunchTask": "docker-compose up"
         }
     ]
 }

.vscode/tasks.json

@@ -2,23 +2,9 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Collect Static",
-            "command": "venv/bin/python manage.py collectstatic --no-input",
-            "type": "shell",
-            "presentation": {
-                "reveal": "always"
-            },
-            "group": "build"
-        },
-        {
-            "dependsOn": "Collect Static",
-            "label": "Migrate",
-            "command": "venv/bin/python manage.py migrate",
-            "type": "shell",
-            "presentation": {
-                "reveal": "always"
-            },
-            "group": "build"
+            "label": "docker-compose up",
+            "command": "docker-compose up -d",
+            "type": "shell"
         }
     ]
 }

Dockerfile

@@ -1,4 +1,6 @@
-FROM python:3.8.2
+FROM python:3
+
+USER root
 
 WORKDIR /app
 COPY config config
@@ -8,10 +10,13 @@ COPY manage.py manage.py
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 
+COPY scripts scripts
+RUN chmod +x scripts/*
+ENTRYPOINT ["scripts/entrypoint.sh"]
+
 RUN useradd -ms /bin/bash django
 RUN chown -R django .
-
 USER django
-RUN python manage.py collectstatic
+RUN python manage.py collectstatic --no-input
 
-CMD ["gunicorn","-b",":8000", "-w", "4", "config.wsgi"]
+CMD ["scripts/cmd.sh"]

README.md

@@ -2,4 +2,4 @@
 
 My CI testing pipeline for a django project.
 
-[![pipeline status](http://gitlab.ducoterra.net/ducoterra/ci_builder/badges/master/pipeline.svg)](http://gitlab.ducoterra.net/ducoterra/ci_builder/-/commits/master)
+[![pipeline status](https://gitlab.ducoterra.net/ducoterra/ci_builder/badges/master/pipeline.svg)](https://gitlab.ducoterra.net/ducoterra/ci_builder/-/commits/master)

docker-compose.yml

@@ -1,8 +1,9 @@
-version: '3.5'
+version: '3'
 
 services:
   button:
     build: .
+    image: site:local
     labels:
       - "traefik.http.routers.button.rule=Host(`button.localhost`)"
       - "traefik.http.services.button-service.loadbalancer.server.port=8000"
@@ -20,35 +21,25 @@ services:
       - DJANGO_SUPERUSER_PASSWORD=django
 
   postgres:
-    image: postgres:12
+    image: postgres:13
     volumes:
       - data:/var/lib/postgresql/data 
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-
-  pgadmin:
-    image: dpage/pgadmin4:4
-    labels:
-      - "traefik.http.routers.pgadmin.rule=Host(`pgadmin.localhost`)"
-      - "traefik.http.services.pgadmin-service.loadbalancer.server.port=80"
-    volumes:
-      - pgadmin:/var/lib/pgadmin
-    environment:
-      PGADMIN_DEFAULT_EMAIL: postgres
-      PGADMIN_DEFAULT_PASSWORD: postgres
+    ports: 
+      - 5432:5432
 
   traefik:
-    image: traefik:v2.2
+    image: traefik:v2.4
     labels:
       - "traefik.http.routers.traefik.rule=Host(`traefik.localhost`)"
       - "traefik.http.services.traefik-service.loadbalancer.server.port=8080"
     command: --api.insecure=true --providers.docker --log.level=ERROR --accesslog=true
     ports:
-      - "80:80"
+      - 80:80
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
 volumes:
   data:
-  pgadmin:

heavy_load.py

@@ -13,8 +13,8 @@ else:
     burst = False
     sleep = 1 / rate
     print(f"Beginning load test at {rate} calls/second")
-# url = 'https://button.ducoterra.net/button/'
-url = 'http://button.localhost/button/'
+url = 'https://button.ducoterra.net/'
+# url = 'http://button.localhost/'
 
 def timer(func, *args, **kwargs):
     then = time.time()

helm/values.yaml

@@ -0,0 +1,3 @@
+image: hub.ducoterra.net/ducoterra/button
+tag: 1.0.2
+secret: true

k8s/configmap.yaml

@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: $DEPLOY
-data:
-  ALLOWED_HOSTS: localhost,$DEPLOY.ducoterra.net

k8s/deploy.yaml

@@ -1,37 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: $DEPLOY
-spec:
-  selector:
-    matchLabels:
-      app: $DEPLOY
-  template:
-    metadata:
-      labels:
-        app: $DEPLOY
-    spec:
-      containers:
-      - name: $DEPLOY
-        image: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-        envFrom:
-        - configMapRef:
-            name: $DEPLOY
-        - secretRef:
-            name: django-secrets
-        volumeMounts:
-          - mountPath: /app/db
-            name: $DEPLOY
-        resources:
-          limits:
-            memory: "256Mi"
-            cpu: "250m"
-          requests:
-            memory: "1Mi"
-            cpu: "1m"
-        ports:
-        - containerPort: 8000
-      volumes:
-        - name: $DEPLOY
-          persistentVolumeClaim:
-            claimName: $DEPLOY

k8s/prod/ingress.yaml

@@ -1,79 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: $DEPLOY-internal-tls
-  annotations:
-    kubernetes.io/ingress.class: traefik-internal
-spec:
-  entryPoints:
-    - websecure
-  tls:
-    certResolver: myresolver
-    domains:
-    - main: "*.ducoterra.net"
-  routes:
-  - match: Host(`$DEPLOY.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: $DEPLOY
-      port: 8000
-
----
-
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: $DEPLOY-internal-web
-  annotations:
-    kubernetes.io/ingress.class: traefik-internal
-spec:
-  entryPoints:
-    - web
-  routes:
-  - match: Host(`$DEPLOY.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: $DEPLOY
-      port: 8000
-    middlewares:
-      - name: httpsredirect
-
----
-
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: $DEPLOY-external-tls
-  annotations:
-    kubernetes.io/ingress.class: traefik-external
-spec:
-  entryPoints:
-    - websecure
-  tls:
-    certResolver: myresolver
-  routes:
-  - match: Host(`$DEPLOY.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: $DEPLOY
-      port: 8000
-
----
-
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: $DEPLOY-external-web
-  annotations:
-    kubernetes.io/ingress.class: traefik-external
-spec:
-  entryPoints:
-    - web
-  routes:
-  - match: Host(`$DEPLOY.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: $DEPLOY
-      port: 8000
-    middlewares:
-      - name: httpsredirect

k8s/pvc.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: $DEPLOY
-spec:
-  storageClassName: nfs-encrypted
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 8Gi

k8s/service.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: $DEPLOY
-spec:
-  selector:
-    app: $DEPLOY
-  ports:
-  - port: 8000
-    targetPort: 8000

k8s/test/ingress.yaml

@@ -1,39 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: $DEPLOY-internal-tls
-  annotations:
-    kubernetes.io/ingress.class: traefik-internal
-spec:
-  entryPoints:
-    - websecure
-  tls:
-    certResolver: myresolver
-    domains:
-    - main: "*.ducoterra.net"
-  routes:
-  - match: Host(`$DEPLOY.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: $DEPLOY
-      port: 8000
-
----
-
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: $DEPLOY-internal-web
-  annotations:
-    kubernetes.io/ingress.class: traefik-internal
-spec:
-  entryPoints:
-    - web
-  routes:
-  - match: Host(`$DEPLOY.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: $DEPLOY
-      port: 8000
-    middlewares:
-      - name: httpsredirect

scripts/cmd.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gunicorn -b :8000 -w 4 config.wsgi

scripts/entrypoint.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if ! $SKIP_ENTRYPOINT || [ -z $SKIP_ENTRYPOINT ]; then
+
+MIGRATED=false
+
+while ! $MIGRATED; do
+echo "Migrating..."
+python manage.py migrate 2> /dev/null
+
+if [ $? -eq 0 ]; then
+MIGRATED=true
+else
+echo "ERROR - $(date) - Migrate failed."
+sleep 1
+fi
+
+done
+
+fi
+
+$@

ui/tests.py

@@ -13,28 +13,26 @@ class SimpleTest(TestCase):
     def test_button(self):
         # Test initial load
         c = Client()
-        response = c.get('/button')
-        self.assertEqual(response.status_code, 301)
-        response = c.get('/button/')
+        response = c.get('/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context.get("achievement"), {})
 
         # Test first achievement
-        response = c.post('/button/', {})
+        response = c.post('/', {})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json().get("pressed"), 1)
         self.assertEqual(response.json().get("achievement"), "Clicked!")
         self.assertEqual(c.session.get('pressed'), 1)
 
         # Test second achievement
-        response = c.post('/button/', {})
+        response = c.post('/', {})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json().get("pressed"), 2)
         self.assertEqual(response.json().get("achievement"), "Clicked Twice!")
         self.assertEqual(c.session.get('pressed'), 2)
 
         # Test no achievement
-        response = c.post('/button/', {})
+        response = c.post('/', {})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json().get("pressed"), 3)
         self.assertEqual(response.json().get("achievement"), None)

ui/views.py

@@ -10,7 +10,6 @@ achievements = {
     24: "I'm that old",
     32: "2^5",
     64: "2^6",
-    69: "Nice",
     100: "one hundred",
     128: "2^7",
     200: "two hundred",
@@ -18,7 +17,6 @@ achievements = {
     256: "2^8",
     300: "three hundred",
     400: "four hundred",
-    420: "Blaze it",
     500: "half thousand",
     512: "2^9",
     600: "six hundred",
@@ -55,17 +53,17 @@ achievements = {
 def button(request):
     PRESSED = 'pressed'
     ACHIEVE = 'achievement'
-    current = request.session.get(PRESSED, 0)
-    request.session[PRESSED] = current + 1
+    pressed = request.session.get(PRESSED, 0)
 
     if request.method == "POST":
+        pressed = pressed + 1
+        request.session[PRESSED] = pressed
         response = {
-            PRESSED: current,
-            ACHIEVE: achievements.get(current)
+            PRESSED: pressed,
+            ACHIEVE: achievements.get(pressed)
         }
         return JsonResponse(response)
 
-    pressed = current
     response = {PRESSED: pressed}
     achieved = {k:v for k,v in achievements.items() if k <= pressed}
     response.update({ACHIEVE: achieved})