Browse Source

Change some names of services, passwords for db and minio and lower the resources.

master
Antun Franjin 4 years ago
parent
commit
c7cf5df219
  1. 42
      02_hetzner/01_prod/rm-croatia/deployment.yaml
  2. 42
      02_hetzner/01_prod/rm-fulda/deployment.yaml

42
02_hetzner/01_prod/rm-croatia/deployment.yaml

@ -27,10 +27,10 @@ spec:
image: packages.semapp.lan:5000/rm-backend:2.5.1 image: packages.semapp.lan:5000/rm-backend:2.5.1
resources: resources:
requests: requests:
memory: "512Mi" memory: "256Mi"
cpu: "1" cpu: "100m"
limits: limits:
memory: "2Gi" memory: "512Mi"
cpu: "4" cpu: "4"
ports: ports:
- containerPort: 5000 - containerPort: 5000
@ -39,7 +39,7 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /etc/flexrm/ - mountPath: /etc/flexrm/
readOnly: true readOnly: true
name: flexrm-conf name: flexrm-cro-conf
env: env:
- name: DJANGO_ENV - name: DJANGO_ENV
value: "development" value: "development"
@ -48,10 +48,10 @@ spec:
image: packages.semapp.lan:5000/rm-frontend:2.5.1 image: packages.semapp.lan:5000/rm-frontend:2.5.1
resources: resources:
requests: requests:
memory: "512Mi" memory: "256Mi"
cpu: "1" cpu: "100m"
limits: limits:
memory: "2Gi" memory: "512Mi"
cpu: "4" cpu: "4"
ports: ports:
- containerPort: 80 - containerPort: 80
@ -60,15 +60,15 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /etc/nginx/conf.d/ - mountPath: /etc/nginx/conf.d/
readOnly: true readOnly: true
name: flexrm-frontend-conf name: flexrm-front-cro-conf
imagePullPolicy: Always imagePullPolicy: Always
volumes: volumes:
- name: flexrm-frontend-conf - name: flexrm-front-cro-conf
configMap: configMap:
name: flexrm-frontend-conf name: flexrm-front-cro-conf
- name: flexrm-conf - name: flexrm-cro-conf
configMap: configMap:
name: flexrm-conf name: flexrm-cro-conf
--- ---
@ -77,7 +77,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
namespace: prod-environment namespace: prod-environment
name: flexrm-conf name: flexrm-cro-conf
data: data:
flexrm.conf: | flexrm.conf: |
[general] [general]
@ -88,7 +88,7 @@ data:
driver = postgresql driver = postgresql
db_name = rm_cro_prod db_name = rm_cro_prod
db_user = rm_cro_prod db_user = rm_cro_prod
db_password = NsG}e(EgT\b+95Q'L:+{ db_password = MxaQ6fBWpCAyCY5z
db_host = psql.semprod.local db_host = psql.semprod.local
[analytics] [analytics]
@ -138,7 +138,7 @@ data:
minio_use_https = False minio_use_https = False
minio_media_bucket = rm-cro-prod minio_media_bucket = rm-cro-prod
minio_access_key = rm-cro-prod minio_access_key = rm-cro-prod
minio_secret_key = uM7(zFm3;4H9PTz!m~ww minio_secret_key = uYmyu68AD6JVbXzF
minio_auto_create_bucket = True minio_auto_create_bucket = True
--- ---
@ -147,11 +147,11 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
namespace: prod-environment namespace: prod-environment
name: flexrm-frontend-conf name: flexrm-front-cro-conf
data: data:
default.conf: | default.conf: |
upstream backend { upstream backend {
server rm-backend-srv:5000; server rm-cro-backend-srv:5000;
} }
server { server {
@ -204,7 +204,7 @@ data:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: rm-backend-srv name: rm-cro-backend-srv
namespace: prod-environment namespace: prod-environment
spec: spec:
selector: selector:
@ -221,7 +221,7 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: rm-frontend-srv name: rm-cro-frontend-srv
namespace: prod-environment namespace: prod-environment
spec: spec:
selector: selector:
@ -249,7 +249,7 @@ spec:
paths: paths:
- backend: - backend:
service: service:
name: rm-frontend-srv name: rm-cro-frontend-srv
port: port:
number: 80 number: 80
path: / path: /
@ -259,7 +259,7 @@ spec:
paths: paths:
- backend: - backend:
service: service:
name: rm-frontend-srv name: rm-cro-frontend-srv
port: port:
number: 80 number: 80
path: / path: /

42
02_hetzner/01_prod/rm-fulda/deployment.yaml

@ -27,10 +27,10 @@ spec:
image: packages.semapp.lan:5000/rm-backend:2.5.1 image: packages.semapp.lan:5000/rm-backend:2.5.1
resources: resources:
requests: requests:
memory: "512Mi" memory: "256Mi"
cpu: "1" cpu: "100m"
limits: limits:
memory: "2Gi" memory: "512Mi"
cpu: "4" cpu: "4"
ports: ports:
- containerPort: 5000 - containerPort: 5000
@ -39,7 +39,7 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /etc/flexrm/ - mountPath: /etc/flexrm/
readOnly: true readOnly: true
name: flexrm-conf name: rmfulda-conf
env: env:
- name: DJANGO_ENV - name: DJANGO_ENV
value: "development" value: "development"
@ -48,10 +48,10 @@ spec:
image: packages.semapp.lan:5000/rm-frontend:2.5.1 image: packages.semapp.lan:5000/rm-frontend:2.5.1
resources: resources:
requests: requests:
memory: "512Mi" memory: "256Mi"
cpu: "1" cpu: "100m"
limits: limits:
memory: "2Gi" memory: "512Mi"
cpu: "4" cpu: "4"
ports: ports:
- containerPort: 80 - containerPort: 80
@ -60,15 +60,15 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /etc/nginx/conf.d/ - mountPath: /etc/nginx/conf.d/
readOnly: true readOnly: true
name: flexrm-frontend-conf name: rmfulda-frontend-conf
imagePullPolicy: Always imagePullPolicy: Always
volumes: volumes:
- name: flexrm-frontend-conf - name: rmfulda-frontend-conf
configMap: configMap:
name: flexrm-frontend-conf name: rmfulda-frontend-conf
- name: flexrm-conf - name: rmfulda-conf
configMap: configMap:
name: flexrm-conf name: rmfulda-conf
--- ---
@ -77,7 +77,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
namespace: prod-environment namespace: prod-environment
name: flexrm-conf name: rmfulda-conf
data: data:
flexrm.conf: | flexrm.conf: |
[general] [general]
@ -88,7 +88,7 @@ data:
driver = postgresql driver = postgresql
db_name = rm_fulda_prod db_name = rm_fulda_prod
db_user = rm_fulda_prod db_user = rm_fulda_prod
db_password = NsG}e(EgT\b+95Q'L:+{ db_password = 2VXb6g4gChrhA2Wg
db_host = psql.semprod.local db_host = psql.semprod.local
[analytics] [analytics]
@ -138,7 +138,7 @@ data:
minio_use_https = False minio_use_https = False
minio_media_bucket = rm-fulda-prod minio_media_bucket = rm-fulda-prod
minio_access_key = rm-fulda-prod minio_access_key = rm-fulda-prod
minio_secret_key = uM7(zFm3;4H9PTz!m~ww minio_secret_key = u5w77PS8Dp9qVLuQ
minio_auto_create_bucket = True minio_auto_create_bucket = True
--- ---
@ -147,11 +147,11 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
namespace: prod-environment namespace: prod-environment
name: flexrm-frontend-conf name: rmfulda-frontend-conf
data: data:
default.conf: | default.conf: |
upstream backend { upstream backend {
server rm-backend-srv:5000; server rm-fulda-backend-srv:5000;
} }
server { server {
@ -204,7 +204,7 @@ data:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: rm-backend-srv name: rm-fulda-backend-srv
namespace: prod-environment namespace: prod-environment
spec: spec:
selector: selector:
@ -221,7 +221,7 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: rm-frontend-srv name: rm-fulda-frontend-srv
namespace: prod-environment namespace: prod-environment
spec: spec:
selector: selector:
@ -249,7 +249,7 @@ spec:
paths: paths:
- backend: - backend:
service: service:
name: rm-frontend-srv name: rm-fulda-frontend-srv
port: port:
number: 80 number: 80
path: / path: /
@ -259,7 +259,7 @@ spec:
paths: paths:
- backend: - backend:
service: service:
name: rm-frontend-srv name: rm-fulda-frontend-srv
port: port:
number: 80 number: 80
path: / path: /

Loading…
Cancel
Save