feat(edge-unit): 去 PostgreSQL + Edge Secret 只读挂载 + data PVC
This commit is contained in:
1 parent
08ed1422fe
commit
5d51b2e1de
9 files changed
+115
-104
No files matched your search
@@ -1,6 +1,6 @@
|
||||
apiVersion: v2
|
||||
name: mixingx-edge-unit
|
||||
description: "One MixingX edge unit release: edge backend, edge web, and edge PostgreSQL."
|
||||
description: "One MixingX edge unit release with durable local revision storage."
|
||||
type: application
|
||||
version: 0.1.0
|
||||
appVersion: "1.0.1"
|
||||
@@ -4,7 +4,7 @@ Deploys one edge site as one Helm release:
|
||||
|
||||
- `edge-<site>` backend
|
||||
- `edge-web-<site>` frontend
|
||||
- `edge-<site>-postgres` StatefulSet and retained PVC
|
||||
- `edge-<site>-data` retained PVC for immutable configuration revisions and the command journal
|
||||
|
||||
Example:
|
||||
|
||||
|
||||
@@ -6,10 +6,6 @@
|
||||
{{- printf "%s-web-%s" .Values.role (.Values.site | toString) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.database" -}}
|
||||
{{- .Values.database | default (printf "%s-db-%s" .Values.role (.Values.site | toString)) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.serviceId" -}}
|
||||
{{- .Values.serviceId | default (include "mixingx-unit.name" .) -}}
|
||||
{{- end -}}
|
||||
|
||||
@@ -1,9 +1,21 @@
|
||||
{{- $name := include "mixingx-unit.name" . -}}
|
||||
{{- $webName := include "mixingx-unit.webName" . -}}
|
||||
{{- $database := include "mixingx-unit.database" . -}}
|
||||
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
|
||||
{{- $basePath := include "mixingx-unit.basePath" . -}}
|
||||
{{- $pgHost := printf "%s-postgres-service" $name -}}
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: {{ $name }}-data
|
||||
{{- if .Values.storage.keep }}
|
||||
annotations:
|
||||
helm.sh/resource-policy: keep
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: ["ReadWriteOnce"]
|
||||
storageClassName: {{ include "mixingx-unit.storageClassName" . }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.storage.size }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
@@ -24,6 +36,15 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}
|
||||
spec:
|
||||
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
|
||||
volumes:
|
||||
- name: edge-data
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ $name }}-data
|
||||
{{- range $index, $secret := .Values.edgeSecrets.mounts }}
|
||||
- name: edge-secret-{{ $index }}
|
||||
secret:
|
||||
secretName: {{ required "edgeSecrets.mounts[].secretName is required" $secret.secretName | quote }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ $name }}
|
||||
{{ $backendImg := .Values.images.backend }}
|
||||
@@ -44,6 +65,22 @@ spec:
|
||||
env:
|
||||
- name: TZ
|
||||
value: "{{ .Values.timezone | default "Asia/Shanghai" }}"
|
||||
- name: EdgeData__Root
|
||||
value: /var/lib/mixingx-edge
|
||||
- name: EdgeIdentity__NodeId
|
||||
value: {{ $name | quote }}
|
||||
- name: EdgeIdentity__IdWorkerId
|
||||
value: {{ required "idWorkerId is required for an Edge unit" .Values.idWorkerId | quote }}
|
||||
- name: EdgeSecrets__Root
|
||||
value: {{ .Values.edgeSecrets.root | quote }}
|
||||
volumeMounts:
|
||||
- name: edge-data
|
||||
mountPath: /var/lib/mixingx-edge
|
||||
{{- range $index, $secret := .Values.edgeSecrets.mounts }}
|
||||
- name: edge-secret-{{ $index }}
|
||||
mountPath: {{ printf "%s/%s" $.Values.edgeSecrets.root (required "edgeSecrets.mounts[].name is required" $secret.name) | quote }}
|
||||
readOnly: true
|
||||
{{- end }}
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
@@ -89,9 +126,6 @@ data:
|
||||
HTTP_PORTS: "{{ .Values.ports.backend }}"
|
||||
REDIS_HOST: "{{ .Values.sharedInfra.redis.host }}"
|
||||
REDIS_PORT: "{{ .Values.sharedInfra.redis.port }}"
|
||||
POSTGRESQL_HOST: "{{ $pgHost }}"
|
||||
POSTGRESQL_PORT: "{{ .Values.sharedInfra.postgres.port }}"
|
||||
POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.username }}"
|
||||
MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}"
|
||||
MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}"
|
||||
MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}"
|
||||
@@ -111,10 +145,6 @@ stringData:
|
||||
ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}"
|
||||
REDIS_PASSWORD: "{{ .Values.sharedInfra.redis.password }}"
|
||||
REDIS_URI: "redis://:{{ .Values.sharedInfra.redis.password }}@{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }}"
|
||||
ConnectionStrings__PostgreSQL: "Host={{ $pgHost }};Port={{ .Values.sharedInfra.postgres.port }};Username={{ .Values.sharedInfra.postgres.username }};Password={{ .Values.sharedInfra.postgres.password }};Database={{ $database }}"
|
||||
POSTGRESQL_PASSWORD: "{{ .Values.sharedInfra.postgres.password }}"
|
||||
POSTGRESQL_URI: "postgresql://{{ .Values.sharedInfra.postgres.username }}:{{ .Values.sharedInfra.postgres.password }}@{{ $pgHost }}:{{ .Values.sharedInfra.postgres.port }}/{{ $database }}"
|
||||
POSTGRESQL_DATABASENAME: "{{ $database }}"
|
||||
ConnectionStrings__messaging: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}"
|
||||
MESSAGING_PASSWORD: "{{ .Values.sharedInfra.rabbitmq.password }}"
|
||||
MESSAGING_URI: "amqp://{{ .Values.sharedInfra.rabbitmq.username }}:{{ .Values.sharedInfra.rabbitmq.password }}@{{ .Values.sharedInfra.rabbitmq.host }}:{{ .Values.sharedInfra.rabbitmq.port }}"
|
||||
@@ -175,72 +205,4 @@ spec:
|
||||
port: {{ .Values.ports.frontend }}
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: {{ $name }}-postgres
|
||||
labels:
|
||||
app.kubernetes.io/name: mixingx
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
spec:
|
||||
serviceName: {{ $name }}-postgres-service
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
volumeClaimTemplates:
|
||||
- metadata:
|
||||
name: data
|
||||
{{- if .Values.storage.keep }}
|
||||
annotations:
|
||||
helm.sh/resource-policy: keep
|
||||
{{- end }}
|
||||
spec:
|
||||
accessModes: ["ReadWriteOnce"]
|
||||
storageClassName: {{ include "mixingx-unit.storageClassName" . }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.storage.size }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
spec:
|
||||
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
|
||||
containers:
|
||||
- name: postgres
|
||||
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
value: "{{ .Values.sharedInfra.postgres.password }}"
|
||||
- name: POSTGRES_DB
|
||||
value: "{{ $database }}"
|
||||
- name: POSTGRES_USER
|
||||
value: "{{ .Values.sharedInfra.postgres.username }}"
|
||||
- name: PGDATA
|
||||
value: /var/lib/postgresql/data/pgdata
|
||||
ports:
|
||||
- name: tcp
|
||||
containerPort: {{ .Values.ports.postgres }}
|
||||
protocol: TCP
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /var/lib/postgresql/data
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ $name }}-postgres-service
|
||||
labels:
|
||||
app.kubernetes.io/name: mixingx
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
spec:
|
||||
selector:
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
ports:
|
||||
- name: tcp
|
||||
port: {{ .Values.ports.postgres }}
|
||||
targetPort: tcp
|
||||
protocol: TCP
|
||||
@@ -6,7 +6,7 @@ role: edge
|
||||
site: "0"
|
||||
description: "Edge 实例 0"
|
||||
serviceId: ""
|
||||
database: ""
|
||||
idWorkerId: 17
|
||||
|
||||
images:
|
||||
backend:
|
||||
@@ -15,30 +15,30 @@ images:
|
||||
frontend:
|
||||
repository: edge-web
|
||||
tag: ""
|
||||
postgres:
|
||||
repository: docker.io/library/postgres
|
||||
tag: "17"
|
||||
edge: {}
|
||||
edgeWeb: {}
|
||||
|
||||
ports:
|
||||
backend: 8080
|
||||
frontend: 80
|
||||
postgres: 5432
|
||||
|
||||
storage:
|
||||
className: local-path
|
||||
size: 5Gi
|
||||
keep: true
|
||||
|
||||
# SecretRef { name, key } resolves to <root>/<name>/<key>.
|
||||
# Each mount projects one existing Kubernetes Secret; its data keys become files.
|
||||
edgeSecrets:
|
||||
root: /var/run/secrets/mixingx-edge
|
||||
mounts: []
|
||||
# - name: plc-main
|
||||
# secretName: edge-0-plc-main
|
||||
|
||||
nodeName: ""
|
||||
nodeSelector: {}
|
||||
|
||||
sharedInfra:
|
||||
postgres:
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
port: 5432
|
||||
redis:
|
||||
host: redis-service
|
||||
port: 6379
|
||||
|
||||
Reference in new issue
Block a user