dzecevic
/
k8s_deployments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'refactor/final-rm-prod-pwd' into 'master' 

refactor/final-rm-prod-pwd

See merge request devops/k8s-deployments!74
master
Domagoj Zecevic 4 years ago
parent
35f9d7ab23 c7cf5df219
commit
e1e376b499
2 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

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

Write Preview
Loading…
Cancel
Save