diff --git a/dev/trialytix/trialytix-configmap.testing.yml b/dev/trialytix/trialytix-configmap.testing.yml index b1013d0..1bd2368 100644 --- a/dev/trialytix/trialytix-configmap.testing.yml +++ b/dev/trialytix/trialytix-configmap.testing.yml @@ -14,4 +14,5 @@ data: DJANGO_DB_HOST: postgres-lb ALLOWED_HOSTS: '["*"]' FRONTEND_URL: 'http://trialytix-testing.k3s.semapp.lan' - + REACT_APP_PROD_API_URL: 'http://trialytix-testing.k3s.semapp.lan' + \ No newline at end of file diff --git a/dev/trialytix/trialytix-deployment.testing.yml b/dev/trialytix/trialytix-deployment.testing.yml index aa34c93..7e58d2b 100644 --- a/dev/trialytix/trialytix-deployment.testing.yml +++ b/dev/trialytix/trialytix-deployment.testing.yml @@ -17,11 +17,23 @@ spec: app: trialytix spec: containers: + # Backend container - name: trialytix-backend image: packages.semapp.lan:5000/trialytix_backend:1.1.0 + ports: + - containerPort: 5100 envFrom: - configMapRef: name: trialytix-config-backend-testing + # Frontend container + - name: trialytix-frontend + image: packages.semapp.lan:5000/trialytix_frontend:1.1.0 + ports: + - containerPort: 8100 + envFrom: + - configMapRef: + name: trialytix-config-backend-testing + # TODO: kubectl validation hinders us from inserting base64-encoded strings # cf. also `baseline-secret.testing.yml` diff --git a/dev/trialytix/trialytix-ingress.testing.yml b/dev/trialytix/trialytix-ingress.testing.yml index 87678ba..e8122b5 100644 --- a/dev/trialytix/trialytix-ingress.testing.yml +++ b/dev/trialytix/trialytix-ingress.testing.yml @@ -3,16 +3,21 @@ apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: trialytix-ingress - namespace: trialytix + namespace: dev-environment annotations: nginx.ingress.kubernetes.io/rewrite-target: / spec: rules: - - host: trialytix.k8s.semapp.lan + - host: trialytix-testing.k3s.semapp.lan http: paths: - path: / pathType: Prefix backend: - serviceName: trialytix-testing-entrypoint - servicePort: 8000 + 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 59c536a..639b382 100644 --- a/dev/trialytix/trialytix-service.testing.yml +++ b/dev/trialytix/trialytix-service.testing.yml @@ -2,13 +2,27 @@ apiVersion: v1 kind: Service metadata: - name: trialytix-testing-entrypoint - namespace: trialytix + name: backend + namespace: dev-environment spec: type: NodePort selector: app: trialytix ports: - - port: 80 + - port: 5100 + targetPort: 5100 + +--- +apiVersion: v1 +kind: Service +metadata: + name: frontend + namespace: dev-environment +spec: + type: NodePort + selector: + app: trialytix + ports: + - port: 8100 targetPort: 8100 - nodePort: 30002 +