chore: k8s yaml: merge config
This commit is contained in:
parent
bb0bf6d39f
commit
8fc7181bec
@ -1,16 +1,5 @@
|
|||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
namespace: woj
|
|
||||||
name: cache-config
|
|
||||||
labels:
|
|
||||||
app: cache
|
|
||||||
data:
|
|
||||||
redis.conf: |
|
|
||||||
requirepass YeT_An0tHeR_VeRy-S3cUr3^PaSsWoRd
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
namespace: woj
|
namespace: woj
|
||||||
@ -45,22 +34,23 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: cache
|
- name: cache
|
||||||
image: docker.io/library/redis:7-alpine
|
image: docker.io/bitnami/redis:7.2
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 6379
|
- containerPort: 6379
|
||||||
|
env:
|
||||||
|
- name: REDIS_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: REDIS_PASSWORD
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: cache-vol
|
- name: cache-vol
|
||||||
mountPath: /data
|
mountPath: /data
|
||||||
- name: cache-config
|
|
||||||
mountPath: /etc/redis/
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: cache-vol
|
- name: cache-vol
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: cache-pvc
|
claimName: cache-pvc
|
||||||
- name: cache-config
|
|
||||||
configMap:
|
|
||||||
name: cache-config
|
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
|
12
resource/deploy/config.yaml
Normal file
12
resource/deploy/config.yaml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
namespace: woj
|
||||||
|
name: shared-config
|
||||||
|
data:
|
||||||
|
POSTGRES_USER: "woj"
|
||||||
|
POSTGRES_PASSWORD: "A_VeRy-S3cUr3^PaSsWoRd"
|
||||||
|
POSTGRES_DB: "woj"
|
||||||
|
MINIO_ROOT_USER: "A_VeRy_CoMpLeX_AcCeSs_KeY"
|
||||||
|
MINIO_ROOT_PASSWORD: "A_VeRy_CoMpLeX_ScReT_KeY"
|
||||||
|
REDIS_PASSWORD: "YeT_An0tHeR_VeRy-S3cUr3^PaSsWoRd"
|
@ -1,17 +1,5 @@
|
|||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
namespace: woj
|
|
||||||
name: db-config
|
|
||||||
labels:
|
|
||||||
app: db
|
|
||||||
data:
|
|
||||||
POSTGRES_USER: "woj"
|
|
||||||
POSTGRES_PASSWORD: "A_VeRy-S3cUr3^PaSsWoRd"
|
|
||||||
POSTGRES_DB: "woj"
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
namespace: woj
|
namespace: woj
|
||||||
@ -50,9 +38,22 @@ spec:
|
|||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 5432
|
- containerPort: 5432
|
||||||
envFrom:
|
env:
|
||||||
- configMapRef:
|
- name: POSTGRES_USER
|
||||||
name: db-config
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_USER
|
||||||
|
- name: POSTGRES_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_PASSWORD
|
||||||
|
- name: POSTGRES_DB
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_DB
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: db-vol
|
- name: db-vol
|
||||||
mountPath: /var/lib/postgresql/data
|
mountPath: /var/lib/postgresql/data
|
||||||
|
@ -1,26 +1,5 @@
|
|||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
namespace: woj
|
|
||||||
name: runner-config
|
|
||||||
labels:
|
|
||||||
app: runner
|
|
||||||
data:
|
|
||||||
DATABASE_HOST: "db-service.woj.svc.cluster.local"
|
|
||||||
DATABASE_USER: "woj"
|
|
||||||
DATABASE_PASSWORD: "A_VeRy-S3cUr3^PaSsWoRd"
|
|
||||||
DATABASE_NAME: "woj"
|
|
||||||
|
|
||||||
REDIS_ADDRESS: "cache-service.woj.svc.cluster.local"
|
|
||||||
REDIS_PASSWORD: "YeT_An0tHeR_VeRy-S3cUr3^PaSsWoRd"
|
|
||||||
|
|
||||||
STORAGE_ENDPOINT: "storage-service.woj.svc.cluster.local:9000"
|
|
||||||
STORAGE_ACCESS_KEY: "A_VeRy_CoMpLeX_AcCeSs_KeY"
|
|
||||||
STORAGE_SECRET_KEY: "A_VeRy_CoMpLeX_ScReT_KeY"
|
|
||||||
STORAGE_BUCKET: "woj"
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
namespace: woj
|
namespace: woj
|
||||||
@ -60,9 +39,28 @@ spec:
|
|||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
args:
|
args:
|
||||||
- runner
|
- runner
|
||||||
envFrom:
|
env:
|
||||||
- configMapRef:
|
- name: REDIS_ADDRESS
|
||||||
name: runner-config
|
value: "cache-service.woj.svc.cluster.local"
|
||||||
|
- name: REDIS_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: REDIS_PASSWORD
|
||||||
|
- name: STORAGE_ENDPOINT
|
||||||
|
value: "storage-service.woj.svc.cluster.local:9000"
|
||||||
|
- name: STORAGE_ACCESS_KEY
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: MINIO_ROOT_USER
|
||||||
|
- name: STORAGE_SECRET_KEY
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: MINIO_ROOT_PASSWORD
|
||||||
|
- name: STORAGE_BUCKET
|
||||||
|
value: "woj"
|
||||||
securityContext:
|
securityContext:
|
||||||
privileged: true
|
privileged: true
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
@ -1,25 +1,4 @@
|
|||||||
---
|
---
|
||||||
apiVersion: v1
|
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
namespace: woj
|
|
||||||
name: server-config
|
|
||||||
labels:
|
|
||||||
app: server
|
|
||||||
data:
|
|
||||||
DATABASE_HOST: "db-service.woj.svc.cluster.local"
|
|
||||||
DATABASE_USER: "woj"
|
|
||||||
DATABASE_PASSWORD: "A_VeRy-S3cUr3^PaSsWoRd"
|
|
||||||
DATABASE_NAME: "woj"
|
|
||||||
|
|
||||||
REDIS_ADDRESS: "cache-service.woj.svc.cluster.local"
|
|
||||||
REDIS_PASSWORD: "YeT_An0tHeR_VeRy-S3cUr3^PaSsWoRd"
|
|
||||||
|
|
||||||
STORAGE_ENDPOINT: "storage-service.woj.svc.cluster.local:9000"
|
|
||||||
STORAGE_ACCESS_KEY: "A_VeRy_CoMpLeX_AcCeSs_KeY"
|
|
||||||
STORAGE_SECRET_KEY: "A_VeRy_CoMpLeX_ScReT_KeY"
|
|
||||||
STORAGE_BUCKET: "woj"
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
@ -45,18 +24,69 @@ spec:
|
|||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
args:
|
args:
|
||||||
- init
|
- init
|
||||||
envFrom:
|
env:
|
||||||
- configMapRef:
|
- name: DATABASE_HOST
|
||||||
name: server-config
|
value: "db-service.woj.svc.cluster.local"
|
||||||
|
- name: DATABASE_USER
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_USER
|
||||||
|
- name: DATABASE_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_PASSWORD
|
||||||
|
- name: DATABASE_NAME
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_DB
|
||||||
containers:
|
containers:
|
||||||
- name: server
|
- name: server
|
||||||
image: git.0x7f.app/woj/woj-server:1.1.0
|
image: git.0x7f.app/woj/woj-server:1.1.0
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
args:
|
args:
|
||||||
- server
|
- server
|
||||||
envFrom:
|
env:
|
||||||
- configMapRef:
|
- name: DATABASE_HOST
|
||||||
name: server-config
|
value: "db-service.woj.svc.cluster.local"
|
||||||
|
- name: DATABASE_USER
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_USER
|
||||||
|
- name: DATABASE_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_PASSWORD
|
||||||
|
- name: DATABASE_NAME
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: POSTGRES_DB
|
||||||
|
- name: REDIS_ADDRESS
|
||||||
|
value: "cache-service.woj.svc.cluster.local"
|
||||||
|
- name: REDIS_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: REDIS_PASSWORD
|
||||||
|
- name: STORAGE_ENDPOINT
|
||||||
|
value: "storage-service.woj.svc.cluster.local:9000"
|
||||||
|
- name: STORAGE_ACCESS_KEY
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: MINIO_ROOT_USER
|
||||||
|
- name: STORAGE_SECRET_KEY
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: MINIO_ROOT_PASSWORD
|
||||||
|
- name: STORAGE_BUCKET
|
||||||
|
value: "woj"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8000
|
- containerPort: 8000
|
||||||
---
|
---
|
||||||
|
@ -1,17 +1,5 @@
|
|||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
namespace: woj
|
|
||||||
name: storage-config
|
|
||||||
labels:
|
|
||||||
app: storage
|
|
||||||
data:
|
|
||||||
MINIO_ROOT_USER: "A_VeRy_CoMpLeX_AcCeSs_KeY"
|
|
||||||
MINIO_ROOT_PASSWORD: "A_VeRy_CoMpLeX_ScReT_KeY"
|
|
||||||
MINIO_VOLUMES: "/data"
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
metadata:
|
metadata:
|
||||||
namespace: woj
|
namespace: woj
|
||||||
@ -56,9 +44,17 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- containerPort: 9000
|
- containerPort: 9000
|
||||||
- containerPort: 9001
|
- containerPort: 9001
|
||||||
envFrom:
|
env:
|
||||||
- configMapRef:
|
- name: MINIO_ROOT_USER
|
||||||
name: storage-config
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: MINIO_ROOT_USER
|
||||||
|
- name: MINIO_ROOT_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
configMapKeyRef:
|
||||||
|
name: shared-config
|
||||||
|
key: MINIO_ROOT_PASSWORD
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: storage-vol
|
- name: storage-vol
|
||||||
mountPath: /data
|
mountPath: /data
|
||||||
|
Loading…
Reference in New Issue
Block a user