Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e06c006594 | ||
|
|
b7bfbb30bc | ||
|
|
42c0789c25 | ||
|
|
73842a7be3 | ||
|
|
0afaa17112 | ||
|
|
bf0170aa26 | ||
|
|
dcc948188b | ||
|
|
78b9b9db15 | ||
|
|
2df3373304 | ||
|
|
9b002c6491 | ||
|
|
6df5affe17 | ||
|
|
bf915935ea | ||
|
|
6734c2022b |
No files matched your search
@@ -35,22 +35,6 @@ helm template ci-edge release-charts/mixingx-edge-unit
|
|||||||
|
|
||||||
`mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。
|
`mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。
|
||||||
|
|
||||||
## PostgreSQL on K3s
|
|
||||||
|
|
||||||
PostgreSQL StatefulSets use the Debian image's UID/GID 999 and run the image
|
|
||||||
entrypoint directly. This skips gosu while preserving database initialization
|
|
||||||
and startup on the existing data volume. The readiness probe uses
|
|
||||||
`pg_isready` over TCP so the container is Ready only after PostgreSQL accepts
|
|
||||||
connections, including after recovery.
|
|
||||||
|
|
||||||
Only the PostgreSQL container uses `privileged: true` as a temporary workaround
|
|
||||||
for checkpoint signal failures observed on affected Ubuntu 26.04 / K3s nodes.
|
|
||||||
The namespace's admission policy must permit privileged containers. The
|
|
||||||
[containerd signal-denial report](https://github.com/containerd/containerd/issues/14485)
|
|
||||||
describes the same checkpoint error with AppArmor. Check the host kernel log
|
|
||||||
for an AppArmor signal denial and validate initialization and recovery with the
|
|
||||||
corrected runtime or profile before removing privileged mode.
|
|
||||||
|
|
||||||
## 关联文档
|
## 关联文档
|
||||||
|
|
||||||
- hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南
|
- hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-agent-unit
|
name: mixingx-agent-unit
|
||||||
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
|
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -38,6 +38,9 @@ spec:
|
|||||||
{{ $backendTag := $agentImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
{{ $backendTag := $agentImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
||||||
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
securityContext:
|
||||||
|
appArmorProfile:
|
||||||
|
type: Unconfined
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ .Values.ports.backend }}
|
containerPort: {{ .Values.ports.backend }}
|
||||||
@@ -207,24 +210,24 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ $name }}-postgres
|
app.kubernetes.io/component: {{ $name }}-postgres
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
|
||||||
# Run the image entrypoint as postgres so it does not invoke gosu.
|
|
||||||
runAsUser: 999
|
|
||||||
runAsGroup: 999
|
|
||||||
fsGroup: 999
|
|
||||||
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
|
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
|
||||||
{{- with $.Values.imagePullSecrets }}
|
{{- with $.Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||||
|
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 999
|
||||||
|
runAsGroup: 999
|
||||||
|
fsGroup: 999
|
||||||
containers:
|
containers:
|
||||||
- name: postgres
|
- name: postgres
|
||||||
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command: ["docker-entrypoint.sh", "postgres"]
|
command: ["docker-entrypoint.sh", "postgres"]
|
||||||
securityContext:
|
securityContext:
|
||||||
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
|
|
||||||
privileged: true
|
privileged: true
|
||||||
|
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
value: "{{ .Values.sharedInfra.postgres.password }}"
|
value: "{{ .Values.sharedInfra.postgres.password }}"
|
||||||
@@ -238,15 +241,6 @@ spec:
|
|||||||
- name: tcp
|
- name: tcp
|
||||||
containerPort: {{ .Values.ports.postgres }}
|
containerPort: {{ .Values.ports.postgres }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -ec
|
|
||||||
- >-
|
|
||||||
exec pg_isready -q -h 127.0.0.1 -p {{ .Values.ports.postgres }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
|
|
||||||
periodSeconds: 5
|
|
||||||
timeoutSeconds: 3
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /var/lib/postgresql/data
|
mountPath: /var/lib/postgresql/data
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-audit
|
name: mixingx-audit
|
||||||
description: MixingX audit service.
|
description: MixingX audit service.
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -31,24 +31,24 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
|
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
|
||||||
# Run the image entrypoint as postgres so it does not invoke gosu.
|
|
||||||
runAsUser: 999
|
|
||||||
runAsGroup: 999
|
|
||||||
fsGroup: 999
|
|
||||||
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||||
{{- with $.Values.imagePullSecrets }}
|
{{- with $.Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||||
|
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 999
|
||||||
|
runAsGroup: 999
|
||||||
|
fsGroup: 999
|
||||||
containers:
|
containers:
|
||||||
- name: postgres
|
- name: postgres
|
||||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command: ["docker-entrypoint.sh", "postgres"]
|
command: ["docker-entrypoint.sh", "postgres"]
|
||||||
securityContext:
|
securityContext:
|
||||||
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
|
|
||||||
privileged: true
|
privileged: true
|
||||||
|
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
||||||
@@ -62,15 +62,6 @@ spec:
|
|||||||
- name: tcp
|
- name: tcp
|
||||||
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -ec
|
|
||||||
- >-
|
|
||||||
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
|
|
||||||
periodSeconds: 5
|
|
||||||
timeoutSeconds: 3
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /var/lib/postgresql/data
|
mountPath: /var/lib/postgresql/data
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-codeserver
|
name: mixingx-codeserver
|
||||||
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
|
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-edge-unit
|
name: mixingx-edge-unit
|
||||||
description: "One MixingX edge unit release with durable local revision storage."
|
description: "One MixingX edge unit release with durable local revision storage."
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -71,6 +71,9 @@ spec:
|
|||||||
{{ $backendTag := $edgeImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
{{ $backendTag := $edgeImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
||||||
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
securityContext:
|
||||||
|
appArmorProfile:
|
||||||
|
type: Unconfined
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ .Values.ports.backend }}
|
containerPort: {{ .Values.ports.backend }}
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-gateway
|
name: mixingx-gateway
|
||||||
description: MixingX gateway service, RBAC, and root ingress.
|
description: MixingX gateway service, RBAC, and root ingress.
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -34,6 +34,9 @@ spec:
|
|||||||
- name: gateway
|
- name: gateway
|
||||||
image: {{ .Values.registry }}/{{ $gatewayImage.repository | default "gateway" }}:{{ $gatewayImage.tag | default .Values.tag | default "latest" }}
|
image: {{ .Values.registry }}/{{ $gatewayImage.repository | default "gateway" }}:{{ $gatewayImage.tag | default .Values.tag | default "latest" }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
securityContext:
|
||||||
|
appArmorProfile:
|
||||||
|
type: Unconfined
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ .Values.gateway.port | default 8080 }}
|
containerPort: {{ .Values.gateway.port | default 8080 }}
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-infra
|
name: mixingx-infra
|
||||||
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
|
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-mqttx
|
name: mixingx-mqttx
|
||||||
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
|
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-network-agent
|
name: mixingx-network-agent
|
||||||
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
|
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-platform
|
name: mixingx-platform
|
||||||
description: MixingX central platform services without customer edge/agent instances.
|
description: MixingX central platform services without customer edge/agent instances.
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -33,6 +33,9 @@ spec:
|
|||||||
- name: {{ .name }}
|
- name: {{ .name }}
|
||||||
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
securityContext:
|
||||||
|
appArmorProfile:
|
||||||
|
type: Unconfined
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ $port }}
|
containerPort: {{ $port }}
|
||||||
@@ -231,11 +234,6 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ .name }}-postgres
|
app.kubernetes.io/component: {{ .name }}-postgres
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
|
||||||
# Run the image entrypoint as postgres so it does not invoke gosu.
|
|
||||||
runAsUser: 999
|
|
||||||
runAsGroup: 999
|
|
||||||
fsGroup: 999
|
|
||||||
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
|
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
|
||||||
{{- with $root.Values.imagePullSecrets }}
|
{{- with $root.Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
@@ -245,10 +243,6 @@ spec:
|
|||||||
- name: postgres
|
- name: postgres
|
||||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
command: ["docker-entrypoint.sh", "postgres"]
|
|
||||||
securityContext:
|
|
||||||
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
|
|
||||||
privileged: true
|
|
||||||
env:
|
env:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
||||||
@@ -262,15 +256,6 @@ spec:
|
|||||||
- name: tcp
|
- name: tcp
|
||||||
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -ec
|
|
||||||
- >-
|
|
||||||
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
|
|
||||||
periodSeconds: 5
|
|
||||||
timeoutSeconds: 3
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /var/lib/postgresql/data
|
mountPath: /var/lib/postgresql/data
|
||||||
|
|||||||
@@ -213,24 +213,24 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
|
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
|
||||||
# Run the image entrypoint as postgres so it does not invoke gosu.
|
|
||||||
runAsUser: 999
|
|
||||||
runAsGroup: 999
|
|
||||||
fsGroup: 999
|
|
||||||
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
|
||||||
{{- with $.Values.imagePullSecrets }}
|
{{- with $.Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||||
|
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 999
|
||||||
|
runAsGroup: 999
|
||||||
|
fsGroup: 999
|
||||||
containers:
|
containers:
|
||||||
- name: postgres
|
- name: postgres
|
||||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command: ["docker-entrypoint.sh", "postgres"]
|
command: ["docker-entrypoint.sh", "postgres"]
|
||||||
securityContext:
|
securityContext:
|
||||||
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
|
|
||||||
privileged: true
|
privileged: true
|
||||||
|
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
||||||
@@ -244,15 +244,6 @@ spec:
|
|||||||
- name: tcp
|
- name: tcp
|
||||||
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -ec
|
|
||||||
- >-
|
|
||||||
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
|
|
||||||
periodSeconds: 5
|
|
||||||
timeoutSeconds: 3
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /var/lib/postgresql/data
|
mountPath: /var/lib/postgresql/data
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-protocol-server-unit
|
name: mixingx-protocol-server-unit
|
||||||
description: Deploy one MixingX edge protocol test server instance.
|
description: Deploy one MixingX edge protocol test server instance.
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-sso
|
name: mixingx-sso
|
||||||
description: MixingX SSO standalone release (backend, web, and PostgreSQL).
|
description: MixingX SSO standalone release (backend, web, and PostgreSQL).
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -36,6 +36,9 @@ spec:
|
|||||||
- name: {{ $name }}
|
- name: {{ $name }}
|
||||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.sso.repository | default "sso" }}:{{ $root.Values.images.sso.tag | default $root.Values.tag | default "latest" }}
|
image: {{ $root.Values.registry }}/{{ $root.Values.images.sso.repository | default "sso" }}:{{ $root.Values.images.sso.tag | default $root.Values.tag | default "latest" }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
securityContext:
|
||||||
|
appArmorProfile:
|
||||||
|
type: Unconfined
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ $backendPort }}
|
containerPort: {{ $backendPort }}
|
||||||
@@ -197,24 +200,24 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ $name }}-postgres
|
app.kubernetes.io/component: {{ $name }}-postgres
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
|
||||||
# Run the image entrypoint as postgres so it does not invoke gosu.
|
|
||||||
runAsUser: 999
|
|
||||||
runAsGroup: 999
|
|
||||||
fsGroup: 999
|
|
||||||
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
||||||
{{- with $.Values.imagePullSecrets }}
|
{{- with $.Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||||
|
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 999
|
||||||
|
runAsGroup: 999
|
||||||
|
fsGroup: 999
|
||||||
containers:
|
containers:
|
||||||
- name: postgres
|
- name: postgres
|
||||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command: ["docker-entrypoint.sh", "postgres"]
|
command: ["docker-entrypoint.sh", "postgres"]
|
||||||
securityContext:
|
securityContext:
|
||||||
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
|
|
||||||
privileged: true
|
privileged: true
|
||||||
|
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
||||||
@@ -228,15 +231,6 @@ spec:
|
|||||||
- name: tcp
|
- name: tcp
|
||||||
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -ec
|
|
||||||
- >-
|
|
||||||
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
|
|
||||||
periodSeconds: 5
|
|
||||||
timeoutSeconds: 3
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /var/lib/postgresql/data
|
mountPath: /var/lib/postgresql/data
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: mixingx-ultra
|
name: mixingx-ultra
|
||||||
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
|
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.91
|
version: 1.0.102
|
||||||
appVersion: "1.0.91"
|
appVersion: "1.0.102"
|
||||||
@@ -41,6 +41,9 @@ spec:
|
|||||||
- name: {{ $name }}
|
- name: {{ $name }}
|
||||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.ultra.repository | default "ultra" }}:{{ $root.Values.images.ultra.tag | default $root.Values.tag | default "latest" }}
|
image: {{ $root.Values.registry }}/{{ $root.Values.images.ultra.repository | default "ultra" }}:{{ $root.Values.images.ultra.tag | default $root.Values.tag | default "latest" }}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
securityContext:
|
||||||
|
appArmorProfile:
|
||||||
|
type: Unconfined
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ $port }}
|
containerPort: {{ $port }}
|
||||||
@@ -200,24 +203,24 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ $name }}-postgres
|
app.kubernetes.io/component: {{ $name }}-postgres
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
|
||||||
# Run the image entrypoint as postgres so it does not invoke gosu.
|
|
||||||
runAsUser: 999
|
|
||||||
runAsGroup: 999
|
|
||||||
fsGroup: 999
|
|
||||||
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
|
||||||
{{- with $.Values.imagePullSecrets }}
|
{{- with $.Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||||
|
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 999
|
||||||
|
runAsGroup: 999
|
||||||
|
fsGroup: 999
|
||||||
containers:
|
containers:
|
||||||
- name: postgres
|
- name: postgres
|
||||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command: ["docker-entrypoint.sh", "postgres"]
|
command: ["docker-entrypoint.sh", "postgres"]
|
||||||
securityContext:
|
securityContext:
|
||||||
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
|
|
||||||
privileged: true
|
privileged: true
|
||||||
|
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
value: "{{ $root.Values.sharedInfra.postgres.password }}"
|
||||||
@@ -231,15 +234,6 @@ spec:
|
|||||||
- name: tcp
|
- name: tcp
|
||||||
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
containerPort: {{ $root.Values.sharedInfra.postgres.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command:
|
|
||||||
- sh
|
|
||||||
- -ec
|
|
||||||
- >-
|
|
||||||
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
|
|
||||||
periodSeconds: 5
|
|
||||||
timeoutSeconds: 3
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /var/lib/postgresql/data
|
mountPath: /var/lib/postgresql/data
|
||||||
|
|||||||
Reference in new issue
Block a user