From 2c0d51bd68895251b2be18204f418b6784d74169 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Fri, 10 Jun 2022 09:17:42 +0200 Subject: [PATCH 1/3] Add rm testing deployment, bioplus and semcust new realise. --- 01_onsite/01_dev/rm/deployment.yaml | 4 ++-- 01_onsite/02_qa/rm-test/deployment.yaml | 4 ++-- 01_onsite/02_qa/rm/deployment.yaml | 4 ++-- 02_hetzner/01_prod/bioplus/deployment.yaml | 15 ++++++++++----- 02_hetzner/01_prod/rm/deployment.yaml | 4 ++-- 02_hetzner/01_prod/semcust/deployment.yaml | 4 ++-- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/01_onsite/01_dev/rm/deployment.yaml b/01_onsite/01_dev/rm/deployment.yaml index 950b97b..cfb4c50 100644 --- a/01_onsite/01_dev/rm/deployment.yaml +++ b/01_onsite/01_dev/rm/deployment.yaml @@ -24,7 +24,7 @@ spec: # fsGroup: 1000 containers: - name: rm-backend - image: packages.semapp.lan:5000/rm-backend:2.5.7 + image: packages.semapp.lan:5000/rm-backend:2.5.8 resources: requests: memory: "512Mi" @@ -42,7 +42,7 @@ spec: name: flexrm-conf imagePullPolicy: Always - name: rm-frontend - image: packages.semapp.lan:5000/rm-frontend:2.5.7 + image: packages.semapp.lan:5000/rm-frontend:2.5.8 resources: requests: memory: "512Mi" diff --git a/01_onsite/02_qa/rm-test/deployment.yaml b/01_onsite/02_qa/rm-test/deployment.yaml index 73a816c..a0153bc 100644 --- a/01_onsite/02_qa/rm-test/deployment.yaml +++ b/01_onsite/02_qa/rm-test/deployment.yaml @@ -24,7 +24,7 @@ spec: # fsGroup: 1000 containers: - name: rm-test-backend - image: packages.semapp.lan:5000/rm-backend:2.5.7 + image: packages.semapp.lan:5000/rm-backend:2.5.8 resources: requests: memory: "512Mi" @@ -45,7 +45,7 @@ spec: value: "development" imagePullPolicy: Always - name: rm-test-frnt - image: packages.semapp.lan:5000/rm-frontend:2.5.7 + image: packages.semapp.lan:5000/rm-frontend:2.5.8 resources: requests: memory: "512Mi" diff --git a/01_onsite/02_qa/rm/deployment.yaml b/01_onsite/02_qa/rm/deployment.yaml index 77c61fd..90c24fc 100644 --- a/01_onsite/02_qa/rm/deployment.yaml +++ b/01_onsite/02_qa/rm/deployment.yaml @@ -24,7 +24,7 @@ spec: # fsGroup: 1000 containers: - name: rm-backend - image: packages.semapp.lan:5000/rm-backend:2.5.7 + image: packages.semapp.lan:5000/rm-backend:2.5.8 resources: requests: memory: "512Mi" @@ -45,7 +45,7 @@ spec: value: "development" imagePullPolicy: Always - name: rm-frontend - image: packages.semapp.lan:5000/rm-frontend:2.5.7 + image: packages.semapp.lan:5000/rm-frontend:2.5.8 resources: requests: memory: "512Mi" diff --git a/02_hetzner/01_prod/bioplus/deployment.yaml b/02_hetzner/01_prod/bioplus/deployment.yaml index 9a915cc..b8b57e9 100644 --- a/02_hetzner/01_prod/bioplus/deployment.yaml +++ b/02_hetzner/01_prod/bioplus/deployment.yaml @@ -24,15 +24,15 @@ spec: fsGroup: 1000 containers: - name: bioplus - image: packages.semapp.lan:5000/bioplus_backend:V1.0.4 + image: packages.semapp.lan:5000/bioplus_backend:gunicorn-test imagePullPolicy: Always resources: requests: - memory: "128Mi" - cpu: "100m" + memory: "512Mi" + cpu: "1" limits: - memory: "256Mi" - cpu: "4" + memory: "2048Mi" + cpu: "8" ports: - containerPort: 8000 name: bioplus-http @@ -62,6 +62,11 @@ data: DJANGO_DB_PASSWORD: "jNeF7PfvrDG1bJLNCibb" DJANGO_DB_HOST: "psql.semprod.local" DJANGO_DB_PORT: "5432" + DEFAULT_FILE_STORAGE: "storages.backends.s3boto3.S3Boto3Storage" + AWS_STORAGE_BUCKET_NAME: "bioplus" + AWS_ACCESS_KEY_ID: "bioplus" + AWS_SECRET_ACCESS_KEY: "1Q7AUQxLRcXCnY3f" + AWS_S3_ENDPOINT_URL: "http://minio-api.semprod.local" --- # Persistent Volume Claim description diff --git a/02_hetzner/01_prod/rm/deployment.yaml b/02_hetzner/01_prod/rm/deployment.yaml index 2a2395a..3a76b12 100644 --- a/02_hetzner/01_prod/rm/deployment.yaml +++ b/02_hetzner/01_prod/rm/deployment.yaml @@ -24,7 +24,7 @@ spec: # fsGroup: 1000 containers: - name: rm-backend - image: packages.semapp.lan:5000/rm-backend:2.5.7 + image: packages.semapp.lan:5000/rm-backend:2.5.5 resources: requests: memory: "512Mi" @@ -45,7 +45,7 @@ spec: value: "development" imagePullPolicy: Always - name: rm-frontend - image: packages.semapp.lan:5000/rm-frontend:2.5.7 + image: packages.semapp.lan:5000/rm-frontend:2.5.5 resources: requests: memory: "512Mi" diff --git a/02_hetzner/01_prod/semcust/deployment.yaml b/02_hetzner/01_prod/semcust/deployment.yaml index 422763c..cd39f68 100644 --- a/02_hetzner/01_prod/semcust/deployment.yaml +++ b/02_hetzner/01_prod/semcust/deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: semcust-frontend - image: packages.semapp.lan:5000/semcust_frontend:1.3.7 + image: packages.semapp.lan:5000/semcust_frontend:1.4.1 resources: requests: memory: "256Mi" @@ -38,7 +38,7 @@ spec: name: nginx-conf imagePullPolicy: Always - name: semcust-backend - image: packages.semapp.lan:5000/semcust_backend:1.3.7 + image: packages.semapp.lan:5000/semcust_backend:1.4.1 resources: requests: memory: "256Mi" From a8ba580d9ebeae7a7e1786ec85c797c4e3fcf24d Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Tue, 14 Jun 2022 08:36:33 +0200 Subject: [PATCH 2/3] Moving other project to new MR. --- 02_hetzner/01_prod/bioplus/deployment.yaml | 7 +------ 02_hetzner/01_prod/semcust/deployment.yaml | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/02_hetzner/01_prod/bioplus/deployment.yaml b/02_hetzner/01_prod/bioplus/deployment.yaml index b8b57e9..35e9435 100644 --- a/02_hetzner/01_prod/bioplus/deployment.yaml +++ b/02_hetzner/01_prod/bioplus/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: bioplus - image: packages.semapp.lan:5000/bioplus_backend:gunicorn-test + image: packages.semapp.lan:5000/bioplus_backend:V1.0.4 imagePullPolicy: Always resources: requests: @@ -62,11 +62,6 @@ data: DJANGO_DB_PASSWORD: "jNeF7PfvrDG1bJLNCibb" DJANGO_DB_HOST: "psql.semprod.local" DJANGO_DB_PORT: "5432" - DEFAULT_FILE_STORAGE: "storages.backends.s3boto3.S3Boto3Storage" - AWS_STORAGE_BUCKET_NAME: "bioplus" - AWS_ACCESS_KEY_ID: "bioplus" - AWS_SECRET_ACCESS_KEY: "1Q7AUQxLRcXCnY3f" - AWS_S3_ENDPOINT_URL: "http://minio-api.semprod.local" --- # Persistent Volume Claim description diff --git a/02_hetzner/01_prod/semcust/deployment.yaml b/02_hetzner/01_prod/semcust/deployment.yaml index cd39f68..422763c 100644 --- a/02_hetzner/01_prod/semcust/deployment.yaml +++ b/02_hetzner/01_prod/semcust/deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: semcust-frontend - image: packages.semapp.lan:5000/semcust_frontend:1.4.1 + image: packages.semapp.lan:5000/semcust_frontend:1.3.7 resources: requests: memory: "256Mi" @@ -38,7 +38,7 @@ spec: name: nginx-conf imagePullPolicy: Always - name: semcust-backend - image: packages.semapp.lan:5000/semcust_backend:1.4.1 + image: packages.semapp.lan:5000/semcust_backend:1.3.7 resources: requests: memory: "256Mi" From d05ccaee1a51591486ed0fd224499f75ce6add55 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Tue, 14 Jun 2022 08:40:26 +0200 Subject: [PATCH 3/3] Bio plus memory test remove --- 02_hetzner/01_prod/bioplus/deployment.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/02_hetzner/01_prod/bioplus/deployment.yaml b/02_hetzner/01_prod/bioplus/deployment.yaml index 35e9435..9a915cc 100644 --- a/02_hetzner/01_prod/bioplus/deployment.yaml +++ b/02_hetzner/01_prod/bioplus/deployment.yaml @@ -28,11 +28,11 @@ spec: imagePullPolicy: Always resources: requests: - memory: "512Mi" - cpu: "1" + memory: "128Mi" + cpu: "100m" limits: - memory: "2048Mi" - cpu: "8" + memory: "256Mi" + cpu: "4" ports: - containerPort: 8000 name: bioplus-http