Merge branch 'develop/v.1.0.1'
# Conflicts: # release-charts/mixingx-agent-unit/Chart.yaml # release-charts/mixingx-agent-unit/templates/unit.yaml
This commit is contained in:
commit
5bc1b52721
7 files changed
+205
-10
No files matched your search
@@ -14,6 +14,10 @@
|
||||
{{- .Values.serviceId | default (include "mixingx-unit.name" .) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.postgresCredentialsSecretName" -}}
|
||||
{{- .Values.sharedInfra.postgres.credentialsSecret.name | default (printf "%s-postgres-credentials" (include "mixingx-unit.name" .)) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "mixingx-unit.basePath" -}}
|
||||
{{- printf "/%s-%s" .Values.role (.Values.site | toString) -}}
|
||||
{{- end -}}
|
||||
@@ -59,7 +63,8 @@ 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 }}"
|
||||
POSTGRESQL_USERNAME: "{{ .Values.sharedInfra.postgres.appUsername }}"
|
||||
POSTGRESQL_DATABASENAME: "{{ include "mixingx-unit.database" . }}"
|
||||
MESSAGING_HOST: "{{ .Values.sharedInfra.rabbitmq.host }}"
|
||||
MESSAGING_PORT: "{{ .Values.sharedInfra.rabbitmq.port }}"
|
||||
MESSAGING_USERNAME: "{{ .Values.sharedInfra.rabbitmq.username }}"
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
{{- $name := include "mixingx-unit.name" . -}}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ $name }}-postgres-role-provisioning
|
||||
labels:
|
||||
app.kubernetes.io/name: mixingx
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/component: {{ $name }}-postgres
|
||||
data:
|
||||
provision-agent-role.sql: |
|
||||
{{ .Files.Get "files/provision-agent-role.sql" | nindent 4 }}
|
||||
@@ -4,6 +4,7 @@
|
||||
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
|
||||
{{- $basePath := include "mixingx-unit.basePath" . -}}
|
||||
{{- $pgHost := printf "%s-postgres-service" $name -}}
|
||||
{{- $pgCredentialsSecretName := include "mixingx-unit.postgresCredentialsSecretName" . -}}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
@@ -24,12 +25,62 @@ spec:
|
||||
app.kubernetes.io/component: {{ $name }}
|
||||
annotations:
|
||||
checksum/config: {{ include "mixingx-unit.backendConfigData" . | sha256sum }}
|
||||
checksum/postgres-role-sql: {{ .Files.Get "files/provision-agent-role.sql" | sha256sum }}
|
||||
spec:
|
||||
{{ include "mixingx-unit.backendScheduling" . | nindent 6 }}
|
||||
{{- with $.Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
initContainers:
|
||||
- name: provision-postgres-role
|
||||
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
command: ["/bin/sh", "-ec"]
|
||||
args:
|
||||
- |
|
||||
attempt=0
|
||||
until pg_isready --host="$POSTGRESQL_HOST" --port="$POSTGRESQL_PORT" --username="$POSTGRES_ADMIN_USERNAME" --dbname="$POSTGRESQL_DATABASENAME"; do
|
||||
attempt=$((attempt + 1))
|
||||
if [ "$attempt" -ge 60 ]; then
|
||||
echo "PostgreSQL did not become ready within 120 seconds" >&2
|
||||
exit 1
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
exec psql \
|
||||
--host="$POSTGRESQL_HOST" \
|
||||
--port="$POSTGRESQL_PORT" \
|
||||
--username="$POSTGRES_ADMIN_USERNAME" \
|
||||
--dbname="$POSTGRESQL_DATABASENAME" \
|
||||
--file=/opt/mixingx/postgres/provision-agent-role.sql
|
||||
env:
|
||||
- name: POSTGRESQL_HOST
|
||||
value: "{{ $pgHost }}"
|
||||
- name: POSTGRESQL_PORT
|
||||
value: "{{ .Values.sharedInfra.postgres.port }}"
|
||||
- name: POSTGRESQL_DATABASENAME
|
||||
value: "{{ $database }}"
|
||||
- name: POSTGRES_ADMIN_USERNAME
|
||||
value: "{{ .Values.sharedInfra.postgres.adminUsername }}"
|
||||
- name: AGENT_DB_USERNAME
|
||||
value: "{{ .Values.sharedInfra.postgres.appUsername }}"
|
||||
- name: IDLE_IN_TRANSACTION_SESSION_TIMEOUT
|
||||
value: "{{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}"
|
||||
- name: PGPASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }}
|
||||
- name: AGENT_DB_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }}
|
||||
volumeMounts:
|
||||
- name: postgres-role-provisioning
|
||||
mountPath: /opt/mixingx/postgres
|
||||
readOnly: true
|
||||
containers:
|
||||
- name: {{ $name }}
|
||||
{{ $backendImg := .Values.images.backend }}
|
||||
@@ -50,6 +101,16 @@ spec:
|
||||
env:
|
||||
- name: TZ
|
||||
value: "{{ .Values.timezone | default "Asia/Shanghai" }}"
|
||||
- name: ConnectionStrings__PostgreSQL
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.connectionStringKey }}
|
||||
- name: POSTGRESQL_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.appPasswordKey }}
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
@@ -66,6 +127,10 @@ spec:
|
||||
periodSeconds: 30
|
||||
timeoutSeconds: 10
|
||||
failureThreshold: 8
|
||||
volumes:
|
||||
- name: postgres-role-provisioning
|
||||
configMap:
|
||||
name: {{ $name }}-postgres-role-provisioning
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
@@ -103,10 +168,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 }}"
|
||||
@@ -218,11 +279,14 @@ spec:
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: POSTGRES_PASSWORD
|
||||
value: "{{ .Values.sharedInfra.postgres.password }}"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ $pgCredentialsSecretName }}
|
||||
key: {{ .Values.sharedInfra.postgres.credentialsSecret.adminPasswordKey }}
|
||||
- name: POSTGRES_DB
|
||||
value: "{{ $database }}"
|
||||
- name: POSTGRES_USER
|
||||
value: "{{ .Values.sharedInfra.postgres.username }}"
|
||||
value: "{{ .Values.sharedInfra.postgres.adminUsername }}"
|
||||
- name: PGDATA
|
||||
value: /var/lib/postgresql/data/pgdata
|
||||
ports:
|
||||
|
||||
Reference in new issue
Block a user