Revert "Updated project to be compatible with new k8s clusters"

This reverts commit fda83af1

.gitlab-ci.yml

@@ -63,7 +63,7 @@ deploy-dev:
   variables:
     NAMESPACE: ${CI_PROJECT_NAME}-dev
   environment:
-    name: k8sdev-01-${CI_PROJECT_NAME}-dev
+    name: ${CI_PROJECT_NAME}-dev
     url: https://${CI_PROJECT_NAME}-dev.pasteur.cloud
   script:
     - sh ci/deploy/deploy.sh
@@ -79,7 +79,7 @@ deploy-prod:
   variables:
     NAMESPACE: ${CI_PROJECT_NAME}
   environment:
-    name: k8sprod-02-${CI_PROJECT_NAME}
+    name: ${CI_PROJECT_NAME}
     url: https://${CI_PROJECT_NAME}.pasteur.cloud
   script:
     - sh ci/deploy/deploy.sh

ci/kubernetes/backend.yaml

@@ -51,9 +51,6 @@ spec:
           value: "8000"
         - name: ALLOWED_HOSTS
           value: "${NAMESPACE}.pasteur.cloud"
-        securityContext:
-          runAsUser: 1000
-          runAsGroup: 1000
         ports:
         - containerPort: 8000
         resources:
@@ -70,7 +67,7 @@ spec:
         image: $CI_REGISTRY_IMAGE/django-static:${CI_COMMIT_REF_NAME}
         imagePullPolicy: Always
         ports:
-        - containerPort: 8080
+        - containerPort: 80
         resources:
           requests:
             memory: "64Mi"
@@ -106,6 +103,6 @@ spec:
   - name: django-static
     protocol: TCP
     port: 8080
-    targetPort: 8080
+    targetPort: 80
   selector:
     app: backend

ci/kubernetes/frontend.yaml

@@ -22,7 +22,7 @@ spec:
         - name: NODE_ENV
           value: "production"
         ports:
-        - containerPort: 8080
+        - containerPort: 80
         resources:
           requests:
             memory: "128Mi"

ci/kubernetes/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.class: internal
+    kubernetes.io/ingress.class: traefik
   labels:
     app: metagenedb
   name: metagenedb

ci/kubernetes/postgresql.yaml

@@ -30,8 +30,6 @@ spec:
         app: postgresql
         tier: postgreSQL
     spec:
-      securityContext:
-        fsGroup: 70
       containers:
       - name: postgresql
         image: postgres:11.4-alpine
@@ -51,9 +49,6 @@ spec:
             secretKeyRef:
               name: postgresql-credentials
               key: password
-        securityContext:
-          runAsUser: 70
-          runAsGroup: 70
         ports:
         - containerPort: 5432
           name: postgresql

ci/kubernetes/redis.yaml

@@ -26,9 +26,6 @@ spec:
             memory: "200Mi"
         ports:
         - containerPort: 6379
-        securityContext:
-          runAsUser: 1000
-          runAsGroup: 1000
 ---
 apiVersion: v1
 kind: Service

frontend/nginx.conf

+user  nginx;
 worker_processes  1;
 error_log  /var/log/nginx/error.log warn;
-pid        /tmp/nginx.pid;
+pid        /var/run/nginx.pid;
 events {
   worker_connections  1024;
 }
@@ -14,7 +15,7 @@ http {
   sendfile on;
   keepalive_timeout 65;
   server {
-    listen 8080;
+    listen 80;
     server_name localhost;
     location / {
       root   /app;
@@ -26,4 +27,4 @@ http {
       root   /usr/share/nginx/html;
     }
   }
-}
+}
\ No newline at end of file

nginx/dev/nginx.conf

+user  nginx;
 worker_processes  1;
 
 events {
@@ -26,7 +27,7 @@ http {
   }
 
   server {
-    listen 8080;
+    listen 80;
     charset utf-8;
 
     # frontend urls

nginx/prod_django_static/nginx.conf

@@ -7,7 +7,7 @@ http {
   client_max_body_size 100m;
 
   server {
-    listen 8080;
+    listen 80;
     root  /usr/src/app/;
 
     location /static/ {