From 0f34381e1970626d616b561370e71e5c88102e1a Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Sat, 29 Jan 2022 04:17:53 +0100 Subject: [PATCH 1/3] Update versions. --- 01_onsite/01_dev/shubbkoarnsru/deployment.yaml | 2 +- 02_hetzner/02_trialytix/trialytix-demo/deployment.yaml | 8 ++++---- .../02_trialytix/trialytix-esculape/deployment.yaml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml index f0f5611..00b88f7 100644 --- a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml +++ b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: schubbkoarnsru - image: packages.semapp.lan:5000/schubbkoarnsru:v1.0.7 + image: packages.semapp.lan:5000/schubbkoarnsru:develop imagePullPolicy: Always resources: requests: diff --git a/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml b/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml index b0edee0..2ff9987 100644 --- a/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml +++ b/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml @@ -18,13 +18,13 @@ spec: containers: # Backend container - name: trialytix-backend - image: packages.semapp.lan:5000/trialytix_backend:1.6.4-rc1 + image: packages.semapp.lan:5000/trialytix_backend:1.7.0-rc1 resources: requests: - memory: "256Mi" + memory: "512Mi" cpu: "100m" limits: - memory: "512Mi" + memory: "1024Mi" cpu: "4" ports: - containerPort: 5100 @@ -36,7 +36,7 @@ spec: imagePullPolicy: Always # Frontend container - name: trialytix-frontend - image: packages.semapp.lan:5000/trialytix_frontend:1.6.4-rc1 + image: packages.semapp.lan:5000/trialytix_frontend:1.7.0-rc1 resources: requests: memory: "256Mi" diff --git a/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml b/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml index 4a2aa77..7f2194a 100644 --- a/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml +++ b/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml @@ -18,13 +18,13 @@ spec: containers: # Backend container - name: trialytix-backend - image: packages.semapp.lan:5000/trialytix_backend:1.6.4-rc1 + image: packages.semapp.lan:5000/trialytix_backend:1.7.0-rc1 resources: requests: - memory: "256Mi" + memory: "512Mi" cpu: "100m" limits: - memory: "512Mi" + memory: "1024Mi" cpu: "4" ports: - containerPort: 5100 @@ -36,7 +36,7 @@ spec: imagePullPolicy: Always # Frontend container - name: trialytix-frontend - image: packages.semapp.lan:5000/trialytix_frontend:1.6.4-rc1 + image: packages.semapp.lan:5000/trialytix_frontend:1.7.0-rc1 resources: requests: memory: "256Mi" From 9c997e8d80b79e4d95b15797142e6de0cf167ae2 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 1 Feb 2022 13:01:15 +0100 Subject: [PATCH 2/3] trialytix resources --- 01_onsite/02_qa/trialytix/deployment.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/01_onsite/02_qa/trialytix/deployment.yaml b/01_onsite/02_qa/trialytix/deployment.yaml index db51ee4..a399f7e 100644 --- a/01_onsite/02_qa/trialytix/deployment.yaml +++ b/01_onsite/02_qa/trialytix/deployment.yaml @@ -22,10 +22,10 @@ spec: resources: requests: - memory: "256Mi" - cpu: "100m" - limits: memory: "512Mi" + cpu: "1" + limits: + memory: "2048Mi" cpu: "4" ports: - containerPort: 5100 @@ -41,10 +41,10 @@ spec: resources: requests: - memory: "256Mi" - cpu: "100m" - limits: memory: "512Mi" + cpu: "1" + limits: + memory: "2048Mi" cpu: "4" ports: - containerPort: 8100 @@ -84,6 +84,7 @@ data: API_URL: 'http://trialytix-qa.k3s.semapp.lan' FRONTEND_PORT: '8100' BACKEND_PORT: '5100' + ENV_TYPE: 'qa' # Nginx configuration --- From 5a0bf4c008e071780aabc644d4b028be73d66251 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Tue, 1 Feb 2022 14:23:05 +0100 Subject: [PATCH 3/3] Fixed minio type path. --- 02_hetzner/01_prod/rm/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02_hetzner/01_prod/rm/deployment.yaml b/02_hetzner/01_prod/rm/deployment.yaml index 6e05792..a2bd579 100644 --- a/02_hetzner/01_prod/rm/deployment.yaml +++ b/02_hetzner/01_prod/rm/deployment.yaml @@ -133,7 +133,7 @@ data: # media_type = django.core.files.storage.FileSystemStorage - media_type = flexrm.kernel.minio.storage.MinIOMediaStorage + media_type = flexrm.kernel.storage.minio.storage.MinIOMediaStorage minio_endpoint = minio-api.semprod.local minio_use_https = False minio_media_bucket = rm-prod