diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 990438bbccb09094691eac32beba553e3e5f48d8..b6536c3bd31f6eef15a32e39f32b4d83a3040600 100644 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -26,6 +26,9 @@ kubectl -n ${NAMESPACE} wait --for=condition=available --timeout=600s deployment ## Backend envsubst < ci/kubernetes/backend.yaml | kubectl apply -n ${NAMESPACE} -f - kubectl -n ${NAMESPACE} patch deployment backend -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}" +## Django static +envsubst < ci/kubernetes/django-static.yaml | kubectl apply -n ${NAMESPACE} -f - +kubectl -n ${NAMESPACE} patch deployment django-static -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}" ## Celery worker # envsubst < ci/kubernetes/celery-worker.yaml | kubectl apply -n ${NAMESPACE} -f - ## Frontend diff --git a/ci/kubernetes/backend.yaml b/ci/kubernetes/backend.yaml index 6065182fa072e2f3f3a0c2d245cc7602f5231438..37e538f232b686ac570d3f819a2c4410fe6c1972 100644 --- a/ci/kubernetes/backend.yaml +++ b/ci/kubernetes/backend.yaml @@ -63,21 +63,6 @@ spec: volumeMounts: - name: static-data mountPath: /code/public/static - - name: django-static-app - image: $CI_REGISTRY_IMAGE/django-static:${CI_COMMIT_REF_NAME} - imagePullPolicy: Always - ports: - - containerPort: 80 - resources: - requests: - memory: "64Mi" - cpu: "50m" - limits: - memory: "128Mi" - cpu: "100m" - volumeMounts: - - name: static-data - mountPath: /usr/src/app/static/ imagePullSecrets: - name: registry-gitlab volumes: @@ -100,9 +85,5 @@ spec: protocol: TCP port: 8000 targetPort: 8000 - - name: django-static - protocol: TCP - port: 8080 - targetPort: 80 selector: app: backend diff --git a/ci/kubernetes/django-static.yaml b/ci/kubernetes/django-static.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6996c6cb024294cc8e7789f7c3211f21b28e2355 --- /dev/null +++ b/ci/kubernetes/django-static.yaml @@ -0,0 +1,51 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: django-static + labels: + app: django-static +spec: + replicas: 1 + selector: + matchLabels: + app: django-static + template: + metadata: + labels: + app: django-static + spec: + containers: + - name: django-static-app + image: $CI_REGISTRY_IMAGE/django-static:${CI_COMMIT_REF_NAME} + imagePullPolicy: Always + ports: + - containerPort: 80 + resources: + requests: + memory: "64Mi" + cpu: "50m" + limits: + memory: "128Mi" + cpu: "100m" + volumeMounts: + - name: static-data + mountPath: /usr/src/app/static/ + volumes: + - name: static-data + emptyDir: {} +--- +apiVersion: v1 +kind: Service +metadata: + name: django-static + labels: + app: django-static +spec: + type: ClusterIP + ports: + - name: django-static-app + protocol: TCP + port: 8080 + targetPort: 80 + selector: + app: django-static diff --git a/ci/kubernetes/ingress.yaml b/ci/kubernetes/ingress.yaml index f5684f7ba431ad21a0cb9c613f8375d87c2b8433..d10ef605ec1a5f9426b8d1742f7699973f654d94 100644 --- a/ci/kubernetes/ingress.yaml +++ b/ci/kubernetes/ingress.yaml @@ -21,7 +21,7 @@ spec: servicePort: 8000 - path: /static backend: - serviceName: backend + serviceName: django-static servicePort: 8080 - path: /api backend: