diff --git a/dev/trialytix/trialytix-configmap.testing.yml b/dev/trialytix/trialytix-configmap.testing.yml index 0d05362..ea678d4 100644 --- a/dev/trialytix/trialytix-configmap.testing.yml +++ b/dev/trialytix/trialytix-configmap.testing.yml @@ -15,6 +15,57 @@ data: ALLOWED_HOSTS: '["*"]' FRONTEND_URL: 'http://trialytix-testing.k3s.semapp.lan' REACT_APP_PROD_API_URL: 'http://trialytix-testing.k3s.semapp.lan' + api_url: 'http://trialytix-testing.k3s.semapp.lan' FRONTEND_PORT: '8100' BACKEND_PORT: '5100' - \ No newline at end of file + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: dev-environment + name: nginx-trialytix-conf +data: + default.conf: | + upstream backend { + server backend:5100; + } + + server { + listen 8100; + + #server_name trialytix-qa.semapp.lan; + + access_log /var/log/nginx/access.log; + charset utf-8; + client_max_body_size 1G; + + location / { + root /srv/trialytix; + #add_header X-Frame-Options "SAMEORIGIN"; + index index.html index.htm; + try_files $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; + } + diff --git a/dev/trialytix/trialytix-deployment.testing.yml b/dev/trialytix/trialytix-deployment.testing.yml index 7e58d2b..7bdf07b 100644 --- a/dev/trialytix/trialytix-deployment.testing.yml +++ b/dev/trialytix/trialytix-deployment.testing.yml @@ -19,34 +19,31 @@ spec: containers: # Backend container - name: trialytix-backend - image: packages.semapp.lan:5000/trialytix_backend:1.1.0 + image: packages.semapp.lan:5000/trialytix_backend:kubernetes-test ports: - containerPort: 5100 + name: trialytix-back + protocol: TCP envFrom: - configMapRef: name: trialytix-config-backend-testing + imagePullPolicy: Always # Frontend container - name: trialytix-frontend - image: packages.semapp.lan:5000/trialytix_frontend:1.1.0 + image: packages.semapp.lan:5000/trialytix_frontend:kubernetes-test ports: - containerPort: 8100 + name: trialytix-front + protocol: TCP + volumeMounts: + - mountPath: /etc/nginx/conf.d + readOnly: true + name: nginx-trialytix-conf envFrom: - configMapRef: name: trialytix-config-backend-testing - - - # TODO: kubectl validation hinders us from inserting base64-encoded strings - # cf. also `baseline-secret.testing.yml` - #- name: APP_KEY - # valueFrom: - # secretKeyRef: - # name: baseline-secret-testing - # key: app_key - # - name: trialytix-frontend - # image: packages.semapp.lan:5000/trialytix_frontend:1.1.0 - # env: - # - name: NODE_ENV - # valueFrom: - # configMapKeyRef: - # name: trialytix-config-testing - # key: node_env + imagePullPolicy: Always + volumes: + - name: nginx-trialytix-conf + configMap: + name: nginx-trialytix-conf diff --git a/dev/trialytix/trialytix-ingress.testing.yml b/dev/trialytix/trialytix-ingress.testing.yml index e8122b5..5b1daf3 100644 --- a/dev/trialytix/trialytix-ingress.testing.yml +++ b/dev/trialytix/trialytix-ingress.testing.yml @@ -5,19 +5,13 @@ metadata: name: trialytix-ingress namespace: dev-environment annotations: - nginx.ingress.kubernetes.io/rewrite-target: / + kubernetes.io/ingress.class: "traefik" spec: rules: - host: trialytix-testing.k3s.semapp.lan http: paths: - path: / - pathType: Prefix backend: serviceName: frontend servicePort: 8100 - - path: /api - pathType: Prefix - backend: - serviceName: backend - servicePort: 5100 diff --git a/dev/trialytix/trialytix-service.testing.yml b/dev/trialytix/trialytix-service.testing.yml index 639b382..23998f0 100644 --- a/dev/trialytix/trialytix-service.testing.yml +++ b/dev/trialytix/trialytix-service.testing.yml @@ -5,12 +5,13 @@ metadata: name: backend namespace: dev-environment spec: - type: NodePort selector: app: trialytix ports: - - port: 5100 - targetPort: 5100 + - name: trialytix-back + port: 5100 + targetPort: trialytix-back + type: NodePort --- apiVersion: v1 @@ -19,10 +20,10 @@ metadata: name: frontend namespace: dev-environment spec: - type: NodePort selector: app: trialytix ports: - - port: 8100 - targetPort: 8100 - + - name: trialytix-front + port: 8100 + targetPort: trialytix-front + type: NodePort