From b767dea568f19cc749660934a5b1824bba9ea1c5 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 27 Oct 2021 22:19:42 +0200 Subject: [PATCH] Add deployments for efc and efc shop. --- dev/efc-shop/deployment.yaml | 142 +++++++++++++++++++++++++++++++++++ dev/efc/deployment.yaml | 13 ++-- 2 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 dev/efc-shop/deployment.yaml diff --git a/dev/efc-shop/deployment.yaml b/dev/efc-shop/deployment.yaml new file mode 100644 index 0000000..b779b5f --- /dev/null +++ b/dev/efc-shop/deployment.yaml @@ -0,0 +1,142 @@ +# Deployment description +apiVersion: apps/v1 +kind: Deployment +metadata: + name: efc-shop-deployment + namespace: dev-environment + labels: + app: efc-shop-dev +spec: + strategy: + type: Recreate + replicas: 1 + selector: + matchLabels: + app: efc-shop-dev + template: + metadata: + labels: + app: efc--shop-dev + spec: + # securityContext: + # runAsUser: 1000 + # runAsGroup: 1000 + # fsGroup: 1000 + containers: + - name: efc-shop-frontend + image: packages.semapp.lan:5000/efc-shop_frontend:develop + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "4" + ports: + - containerPort: 8501 + name: efc-shop-http + protocol: TCP + volumeMounts: + - mountPath: /etc/nginx/conf.d + readOnly: true + name: nginx-conf + imagePullPolicy: Always + volumes: + - name: nginx-conf + configMap: + name: nginx-conf + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: dev-environment + name: efc-shop-dev-config-dev + labels: + app: efc-shop-dev +data: + REACT_APP_PROD_API_URL: "http://efc-shop-dev.k3s.semapp.lan/" + REACT_APP_DEV_API_URL: http://efc-shop-dev.k3s.semapp.lan/ + + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: dev-environment + name: nginx-conf +data: + default.conf: | + upstream backend { + server efc-backend-dev:5500; + } + + server { + listen 8501; + access_log /var/log/nginx/access.log; + charset utf-8; + client_max_body_size 1G; + + location / { + root /srv/efc-shop; + index index.html index.htm; + try_files $uri $uri /index.html =404; + } + + location ~ ^/api { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + error_page 404 =200 /index.html; + + add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; + + expires off; + open_file_cache off; + sendfile off; + } + +--- +# EFC Service +apiVersion: v1 +kind: Service +metadata: + name: efc-shop-frontend-dev + namespace: dev-environment +spec: + selector: + app: efc-shop-dev + ports: + - name: efc-http + port: 8501 + targetPort: efc-shop-http + type: NodePort + +--- + +# Ingress description +apiVersion: networking.k8s.io/v1beta1 +kind: Ingress +metadata: + name: efc-shop-dev-ingress + namespace: dev-environment + annotations: + kubernetes.io/ingress.class: "traefik" +spec: + rules: + - host: efc-shop-dev.k3s.semapp.lan + http: + paths: + - path: / + backend: + serviceName: efc-shop-frontend-dev + servicePort: 8501 \ No newline at end of file diff --git a/dev/efc/deployment.yaml b/dev/efc/deployment.yaml index b48bb5e..29de5ec 100644 --- a/dev/efc/deployment.yaml +++ b/dev/efc/deployment.yaml @@ -79,8 +79,13 @@ data: DJANGO_DB_HOST: "postgres-lb" DJANGO_DB_PORT: "5432" ALLOWED_HOSTS: '["*"]' - FRONTEND_URL: "efc-dev.k3s.semapp.lan" - API_URL: "http://efc-dev.k3s.semapp.lan/" + FRONTEND_URL: "http://efc-dev.k3s.semapp.lan" + # API_URL: "http://efc-dev.k3s.semapp.lan/" + REACT_APP_PROD_API_URL: "http://efc-dev.k3s.semapp.lan/" + REACT_APP_DEV_API_URL: http://efc-dev.k3s.semapp.lan/ + PORT_FRONTEND: '8500' + SHOP_FRONTEND_URL: "http://efc-shop-dev.k3s.semapp.lan/" + SHOP_PORT_FRONTEND: '8501' --- apiVersion: v1 @@ -96,16 +101,12 @@ data: server { listen 8500; - - #server_name efc-dev.semapp.lan; - access_log /var/log/nginx/access.log; charset utf-8; client_max_body_size 1G; location / { root /srv/efc; - #add_header X-Frame-Options "SAMEORIGIN"; index index.html index.htm; try_files $uri $uri /index.html =404; }