chore: k8s yaml: merge config

This commit is contained in:
Paul Pan 2023-12-19 23:56:26 +08:00
parent bb0bf6d39f
commit 8fc7181bec
6 changed files with 125 additions and 98 deletions

View File

@ -1,16 +1,5 @@
---
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
metadata:
namespace: woj
@ -45,22 +34,23 @@ spec:
spec:
containers:
- name: cache
image: docker.io/library/redis:7-alpine
image: docker.io/bitnami/redis:7.2
imagePullPolicy: IfNotPresent
ports:
- containerPort: 6379
env:
- name: REDIS_PASSWORD
valueFrom:
configMapKeyRef:
name: shared-config
key: REDIS_PASSWORD
volumeMounts:
- name: cache-vol
mountPath: /data
- name: cache-config
mountPath: /etc/redis/
volumes:
- name: cache-vol
persistentVolumeClaim:
claimName: cache-pvc
- name: cache-config
configMap:
name: cache-config
---
apiVersion: v1
kind: Service

View 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"

View File

@ -1,17 +1,5 @@
---
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
metadata:
namespace: woj
@ -50,9 +38,22 @@ spec:
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5432
envFrom:
- configMapRef:
name: db-config
env:
- name: POSTGRES_USER
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:
- name: db-vol
mountPath: /var/lib/postgresql/data

View File

@ -1,26 +1,5 @@
---
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
metadata:
namespace: woj
@ -60,9 +39,28 @@ spec:
imagePullPolicy: IfNotPresent
args:
- runner
envFrom:
- configMapRef:
name: runner-config
env:
- 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"
securityContext:
privileged: true
volumeMounts:

View File

@ -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
kind: Deployment
metadata:
@ -45,18 +24,69 @@ spec:
imagePullPolicy: IfNotPresent
args:
- init
envFrom:
- configMapRef:
name: server-config
env:
- name: DATABASE_HOST
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:
- name: server
image: git.0x7f.app/woj/woj-server:1.1.0
imagePullPolicy: IfNotPresent
args:
- server
envFrom:
- configMapRef:
name: server-config
env:
- name: DATABASE_HOST
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:
- containerPort: 8000
---

View File

@ -1,17 +1,5 @@
---
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
metadata:
namespace: woj
@ -56,9 +44,17 @@ spec:
ports:
- containerPort: 9000
- containerPort: 9001
envFrom:
- configMapRef:
name: storage-config
env:
- name: MINIO_ROOT_USER
valueFrom:
configMapKeyRef:
name: shared-config
key: MINIO_ROOT_USER
- name: MINIO_ROOT_PASSWORD
valueFrom:
configMapKeyRef:
name: shared-config
key: MINIO_ROOT_PASSWORD
volumeMounts:
- name: storage-vol
mountPath: /data