Compare commits

...

16 Commits

Author SHA1 Message Date
ducoterra
18aab648c6 you have got to be kidding me 2020-04-25 12:34:03 -04:00
ducoterra
57328a7fc8 need secret mounts 2020-04-25 12:30:04 -04:00
ducoterra
948569a659 spacing... spacing 2020-04-25 12:21:31 -04:00
ducoterra
50cdfd8180 wrong configmap 2020-04-25 12:14:42 -04:00
ducoterra
8393efa3a6 fix yaml find and replace 2020-04-25 12:08:03 -04:00
ducoterra
b3db1816bb list dir 2020-04-25 12:01:07 -04:00
ducoterra
7123f4c389 rogue ' 2020-04-25 11:57:16 -04:00
ducoterra
477ddfe165 forgot quote 2020-04-25 11:52:15 -04:00
ducoterra
6bc472f7fe fix default environment vars 2020-04-25 11:20:15 -04:00
ducoterra
41f4549ffd Merge branch 'master' of gitlab.ducoterra.net:ducoterra/ci_builder 2020-04-25 11:15:57 -04:00
ducoterra
7dd45cc2e8 explain how to use environment variables 2020-04-25 11:15:42 -04:00
ducoterra
8ec174b2c3 default secret in manage.py 2020-04-25 11:15:31 -04:00
ducoterra
7868867908 new standard deploy templates 2020-04-25 11:15:23 -04:00
Reese
d2bf889e1f Update .gitlab-ci.yml 2020-04-25 02:32:29 +00:00
Reese
a70aa8840f Update Dockerfile 2020-04-25 02:32:06 +00:00
ducoterra
8404d43222 use venv for tests 2020-04-24 22:10:36 -04:00
12 changed files with 77 additions and 30 deletions

View File

@@ -36,15 +36,15 @@ deploy:
- $CI_COMMIT_TAG - $CI_COMMIT_TAG
stage: deploy stage: deploy
image: image:
name: debian:latest name: debian:10
entrypoint: [""] entrypoint: [""]
script: script:
- echo $CI_REGISTRY_IMAGE
- apt -qq update >> /dev/null && apt -qq install -y curl gettext >> /dev/null - apt -qq update >> /dev/null && apt -qq install -y curl gettext >> /dev/null
- curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl - curl -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 ./kubectl - chmod +x ./kubectl
- envsubst < k8s/deploy.yaml > out.yaml - mkdir /deploy
- mv out.yaml k8s/deploy.yaml - for f in $(find k8s -regex '.*\.ya*ml'); do envsubst < $f > "/deploy/$(basename $f)"; done
- ./kubectl apply -f k8s - ./kubectl apply -f /deploy
- ./kubectl rollout status deploy $DEPLOY - ./kubectl rollout status deploy $DEPLOY
- ./kubectl exec $(./kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}') -- python manage.py migrate - POD=$(./kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}')
- ./kubectl exec $POD -- python manage.py migrate

View File

@@ -6,13 +6,12 @@ COPY api api
COPY ui ui COPY ui ui
COPY manage.py manage.py COPY manage.py manage.py
COPY requirements.txt requirements.txt COPY requirements.txt requirements.txt
RUN pip install -r requirements.txt
RUN useradd -ms /bin/bash django RUN useradd -ms /bin/bash django
RUN chown -R django . RUN chown -R django .
USER django USER django
RUN python -m venv venv RUN python manage.py collectstatic
RUN venv/bin/pip install -r requirements.txt
RUN venv/bin/python manage.py collectstatic
CMD ["venv/bin/gunicorn","-b",":8000", "-w", "4", "config.wsgi"] CMD ["gunicorn","-b",":8000", "-w", "4", "config.wsgi"]

View File

@@ -2,4 +2,23 @@
My CI testing pipeline for a django project. 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](http://gitlab.ducoterra.net/ducoterra/ci_builder/badges/master/pipeline.svg)](http://gitlab.ducoterra.net/ducoterra/ci_builder/-/commits/master)
## Django Environment Variables
### Django Secret
```bash
kubectl create secret generic django-secrets --from-literal=SECRET_KEY=$(python -c "import secrets ; print(secrets.token_urlsafe(32))")
```
### Django Allowed Hosts
```yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: test
data:
ALLOWED_HOSTS: localhost,test.ducoterra.net
```

View File

@@ -20,13 +20,12 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'b8fi9=f-qj=@-#1iru34-f@a6pzfysgrf(1n_&d=ur%!1w$q*w' SECRET_KEY = os.getenv("SECRET_KEY")
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True if os.getenv("DEBUG") == "True" else False DEBUG = True if os.getenv("DEBUG") == "True" else False
ALLOWED_HOSTS = ["localhost", "test.ducoterra.net"] ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", "localhost").split(",")
# Application definition # Application definition

6
k8s/configmap.yaml Normal file
View File

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

View File

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

View File

@@ -3,7 +3,7 @@ kind: Ingress
metadata: metadata:
annotations: annotations:
ingress.kubernetes.io/ssl-redirect: "true" ingress.kubernetes.io/ssl-redirect: "true"
name: test name: $DEPLOY
spec: spec:
tls: tls:
- hosts: - hosts:
@@ -14,7 +14,7 @@ spec:
http: http:
paths: paths:
- backend: - backend:
serviceName: test serviceName: $DEPLOY
servicePort: 8000 servicePort: 8000
--- ---
@@ -22,7 +22,7 @@ spec:
apiVersion: traefik.containo.us/v1alpha1 apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute kind: IngressRoute
metadata: metadata:
name: test-external-tls name: $DEPLOY-external-tls
spec: spec:
entryPoints: entryPoints:
- websecure - websecure
@@ -32,7 +32,7 @@ spec:
- match: Host(`test.ducoterra.net`) - match: Host(`test.ducoterra.net`)
kind: Rule kind: Rule
services: services:
- name: test - name: $DEPLOY
port: 8000 port: 8000
--- ---
@@ -40,7 +40,7 @@ spec:
apiVersion: traefik.containo.us/v1alpha1 apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute kind: IngressRoute
metadata: metadata:
name: test-external-web name: $DEPLOY-external-web
spec: spec:
entryPoints: entryPoints:
- web - web
@@ -48,7 +48,7 @@ spec:
- match: Host(`test.ducoterra.net`) - match: Host(`test.ducoterra.net`)
kind: Rule kind: Rule
services: services:
- name: test - name: $DEPLOY
port: 8000 port: 8000
middlewares: middlewares:
- name: httpsredirect - name: httpsredirect

View File

@@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
name: test name: $DEPLOY
spec: spec:
storageClassName: nfs-encrypted storageClassName: nfs-encrypted
accessModes: accessModes:

View File

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

View File

@@ -6,6 +6,7 @@ import sys
def main(): def main():
os.environ.setdefault('DEBUG', 'True') os.environ.setdefault('DEBUG', 'True')
os.environ.setdefault('SECRET_KEY', 'SeVOOxOHISQZv82RfCPds0B2l8M6jGju4G8F-GcuSrc')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
try: try:
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line

View File

@@ -0,0 +1,16 @@
html, body {
height: 100%;
width: 100%;
}
.section, .container {
height: 100%;
}
.container {
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
text-align: center;
}

View File

@@ -20,6 +20,7 @@ var count = document.getElementById("COUNT");
button.addEventListener("click", event => { button.addEventListener("click", event => {
button.disabled = true; button.disabled = true;
button.classList.add("is-loading");
fetch('/button', { fetch('/button', {
method: 'POST', method: 'POST',
headers: { headers: {
@@ -34,6 +35,7 @@ button.addEventListener("click", event => {
count.innerText = data.pressed; count.innerText = data.pressed;
}).finally(() => { }).finally(() => {
button.disabled = false; button.disabled = false;
button.classList.remove("is-loading");
}); });
}); });