Skip to content

fix pre check job #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ceciazh wants to merge 2 commits into from
Closed

fix pre check job #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0799fc7
fix pre-check jobs
ceciazh Jun 16, 2026
bc2934e
fix pre-check jobs
ceciazh Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions incubator/adp/charts/deploy-pre-check/scripts/check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,12 @@ def check_object_storage() -> bool:
return False

# 2. 验证subpath是否为公有读
# 若启用了 enableProxy 代理模式，文件通过后端代理访问，无需公有读权限，跳过检查
enable_proxy = os.getenv('ENABLE_PROXY', 'false').lower() in ('true', '1', 'yes')
if enable_proxy:
print_info("已启用 enableProxy 代理模式，跳过 COS 子路径公有读权限检查")
return True

subpath_clean = cos_subpath.strip('/')
subpath_url = f"https://{cos_bucket}.cos.{cos_region}.myqcloud.com/{subpath_clean}/"

Expand Down
224 changes: 113 additions & 111 deletions incubator/adp/charts/deploy-pre-check/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,142 +53,144 @@ spec:
serviceAccountName: {{ include "pre-install-check.serviceAccountName" . }}
{{- end }}
volumes:
- name: check-script
configMap:
name: {{ include "pre-install-check.fullname" . }}-script
defaultMode: 0755
containers:
- name: pre-install-check
image: {{ include "resolveImageUrl" (dict "url" (index .Values.images "pre-install-check").url "context" .) }}
imagePullPolicy: Always
command:
- python3
- -u
- /scripts/check.py
volumeMounts:
- name: check-script
mountPath: /scripts
configMap:
name: {{ include "pre-install-check.fullname" . }}-script
defaultMode: 0755
containers:
- name: pre-install-check
image: {{ include "resolveImageUrl" (dict "url" (index .Values.images "pre-install-check").url "context" .) }}
imagePullPolicy: Always
command:
- python3
- -u
- /scripts/check.py
volumeMounts:
- name: check-script
mountPath: /scripts
{{- if .Values.job.resources }}
resources:
resources:
{{- toYaml .Values.job.resources | nindent 10 }}
{{- end }}
env:
- name: PYTHONUNBUFFERED
value: "1"
- name: NAMESPACE
value: {{ .Release.Namespace }}
env:
- name: PYTHONUNBUFFERED
value: "1"
- name: NAMESPACE
value: {{ .Release.Namespace }}
{{- $components := .Values.global.components }}
# ---------- MySQL ----------
- name: ENABLE_MYSQL
value: {{ dig "db" "enabled" true $components | toString | quote }}
# ---------- MySQL ----------
- name: ENABLE_MYSQL
value: {{ dig "db" "enabled" true $components | toString | quote }}
{{- if ne (dig "db" "enabled" true $components | toString) "false" }}
- name: DB_HOST
value: {{ $components.db.host | quote }}
- name: DB_PORT
value: {{ $components.db.port | quote }}
- name: DB_USER
value: {{ $components.db.user | quote }}
- name: DB_PASSWORD
value: {{ $components.db.password | quote }}
- name: DB_PROVIDER_TYPE
value: {{ $components.db.providerType | quote }}
{{- end }}
# ---------- Elasticsearch ----------
- name: ENABLE_ES
value: {{ dig "es" "enabled" true $components | toString | quote }}
- name: DB_HOST
value: {{ $components.db.host | quote }}
- name: DB_PORT
value: {{ $components.db.port | quote }}
- name: DB_USER
value: {{ $components.db.user | quote }}
- name: DB_PASSWORD
value: {{ $components.db.password | quote }}
- name: DB_PROVIDER_TYPE
value: {{ $components.db.providerType | quote }}
{{- end }}
# ---------- Elasticsearch ----------
- name: ENABLE_ES
value: {{ dig "es" "enabled" true $components | toString | quote }}
{{- if ne (dig "es" "enabled" true $components | toString) "false" }}
- name: ES_HOST
value: {{ index $components.es.hosts 0 | quote }}
- name: ES_PORT
value: {{ $components.es.port | quote }}
- name: ES_USER
value: {{ $components.es.user | quote }}
- name: ES_PASSWORD
value: {{ $components.es.password | quote }}
{{- end }}
# ---------- Redis ----------
- name: ENABLE_REDIS
value: {{ dig "redis" "enabled" true $components | toString | quote }}
- name: ES_HOST
value: {{ index $components.es.hosts 0 | quote }}
- name: ES_PORT
value: {{ $components.es.port | quote }}
- name: ES_USER
value: {{ $components.es.user | quote }}
- name: ES_PASSWORD
value: {{ $components.es.password | quote }}
{{- end }}
# ---------- Redis ----------
- name: ENABLE_REDIS
value: {{ dig "redis" "enabled" true $components | toString | quote }}
{{- if ne (dig "redis" "enabled" true $components | toString) "false" }}
- name: REDIS_HOST
value: {{ index $components.redis.hosts 0 | quote }}
- name: REDIS_PORT
value: {{ $components.redis.port | quote }}
- name: REDIS_PASSWORD
value: {{ $components.redis.password | quote }}
{{- end }}
# ---------- Kafka ----------
- name: ENABLE_KAFKA
value: {{ dig "kafka" "enabled" true $components | toString | quote }}
- name: REDIS_HOST
value: {{ index $components.redis.hosts 0 | quote }}
- name: REDIS_PORT
value: {{ $components.redis.port | quote }}
- name: REDIS_PASSWORD
value: {{ $components.redis.password | quote }}
{{- end }}
# ---------- Kafka ----------
- name: ENABLE_KAFKA
value: {{ dig "kafka" "enabled" true $components | toString | quote }}
{{- if ne (dig "kafka" "enabled" true $components | toString) "false" }}
{{- if hasKey $components "kafka" }}
- name: KAFKA_HOST
value: {{ index $components.kafka.hosts 0 | quote }}
- name: KAFKA_PORT
value: {{ $components.kafka.port | quote }}
- name: KAFKA_HOST
value: {{ index $components.kafka.hosts 0 | quote }}
- name: KAFKA_PORT
value: {{ $components.kafka.port | quote }}
{{- end }}
{{- end }}
# ---------- ClickHouse ----------
# 由 global.components.clickhouse.disabled 控制（默认 false=启用）
# ---------- ClickHouse ----------
# 由 global.components.clickhouse.disabled 控制（默认 false=启用）
{{- if eq (dig "clickhouse" "disabled" false $components | toString) "true" }}
- name: ENABLE_CLICKHOUSE
value: "false"
- name: ENABLE_CLICKHOUSE
value: "false"
{{- else }}
- name: ENABLE_CLICKHOUSE
value: "true"
- name: ENABLE_CLICKHOUSE
value: "true"
{{- end }}
{{- if ne (dig "clickhouse" "disabled" false $components | toString) "true" }}
{{- if hasKey $components "clickhouse" }}
- name: CLICKHOUSE_HOST
value: {{ index $components.clickhouse.hosts 0 | quote }}
- name: CLICKHOUSE_PORT
value: {{ $components.clickhouse.port | quote }}
- name: CLICKHOUSE_USER
value: {{ $components.clickhouse.user | quote }}
- name: CLICKHOUSE_PASSWORD
value: {{ $components.clickhouse.password | quote }}
- name: CLICKHOUSE_HOST
value: {{ index $components.clickhouse.hosts 0 | quote }}
- name: CLICKHOUSE_PORT
value: {{ $components.clickhouse.port | quote }}
- name: CLICKHOUSE_USER
value: {{ $components.clickhouse.user | quote }}
- name: CLICKHOUSE_PASSWORD
value: {{ $components.clickhouse.password | quote }}
{{- end }}
{{- end }}
# ---------- VectorDB ----------
# ---------- VectorDB ----------
{{- $vdbList := dig "vdb" (list) $components | default (list) }}
{{- if gt (len $vdbList) 0 }}
{{- $vdb0 := index $vdbList 0 }}
- name: ENABLE_VDB
value: {{ $vdb0.enabled | default true | toString | quote }}
- name: ENABLE_VDB
value: {{ $vdb0.enabled | default true | toString | quote }}
{{- if ne ($vdb0.enabled | default true | toString) "false" }}
- name: VDB_ADDR
value: {{ $vdb0.addr | quote }}
- name: VDB_ACCOUNT
value: {{ $vdb0.account | quote }}
- name: VDB_APIKEY
value: {{ $vdb0.apiKey | quote }}
- name: VDB_ADDR
value: {{ $vdb0.addr | quote }}
- name: VDB_ACCOUNT
value: {{ $vdb0.account | quote }}
- name: VDB_APIKEY
value: {{ $vdb0.apiKey | quote }}
{{- end }}
{{- else }}
- name: ENABLE_VDB
value: "false"
- name: ENABLE_VDB
value: "false"
{{- end }}
# ---------- 对象存储 ----------
- name: ENABLE_COS
value: {{ dig "s3" "enabled" true $components | toString | quote }}
# ---------- 对象存储 ----------
- name: ENABLE_COS
value: {{ dig "s3" "enabled" true $components | toString | quote }}
{{- if ne (dig "s3" "enabled" true $components | toString) "false" }}
- name: COS_SECRET_ID
value: {{ $components.s3.cos.secretId | quote }}
- name: COS_SECRET_KEY
value: {{ $components.s3.cos.secretKey | quote }}
- name: COS_REGION
value: {{ $components.s3.cos.region | quote }}
- name: COS_BUCKET
value: {{ $components.s3.cos.bucket | quote }}
- name: COS_SUBPATH
value: {{ $components.s3.cos.subPath | quote }}
- name: COS_STS_KEY
value: {{ dig "s3" "cos" "stsKey" "" $components | quote }}
{{- end }}
# ---------- K8s Resources ----------
- name: CHECK_K8S_RESOURCES
value: {{ .Values.global.checkK8sResources | quote }}
- name: REQUIRED_CPU
value: {{ if eq .Values.global.clusterSize "minimal" }}{{ .Values.requirements.minimal.cpu | quote }}{{ else if eq .Values.global.clusterSize "standard" }}{{ .Values.requirements.standard.cpu | quote }}{{ else if eq .Values.global.clusterSize "recommended" }}{{ .Values.requirements.recommended.cpu | quote }}{{ else }}{{ .Values.requirements.standard.cpu | quote }}{{ end }}
- name: REQUIRED_MEMORY
value: {{ if eq .Values.global.clusterSize "minimal" }}{{ .Values.requirements.minimal.memory | quote }}{{ else if eq .Values.global.clusterSize "standard" }}{{ .Values.requirements.standard.memory | quote }}{{ else if eq .Values.global.clusterSize "recommended" }}{{ .Values.requirements.recommended.memory | quote }}{{ else }}{{ .Values.requirements.standard.memory | quote }}{{ end }}
- name: COS_SECRET_ID
value: {{ $components.s3.cos.secretId | quote }}
- name: COS_SECRET_KEY
value: {{ $components.s3.cos.secretKey | quote }}
- name: COS_REGION
value: {{ $components.s3.cos.region | quote }}
- name: COS_BUCKET
value: {{ $components.s3.cos.bucket | quote }}
- name: COS_SUBPATH
value: {{ $components.s3.cos.subPath | quote }}
- name: COS_STS_KEY
value: {{ dig "s3" "cos" "stsKey" "" $components | quote }}
- name: ENABLE_PROXY
value: {{ $components.s3.enableProxy | default false | toString | quote }}
{{- end }}
# ---------- K8s Resources ----------
- name: CHECK_K8S_RESOURCES
value: {{ .Values.global.checkK8sResources | quote }}
- name: REQUIRED_CPU
value: {{ if eq .Values.global.clusterSize "minimal" }}{{ .Values.requirements.minimal.cpu | quote }}{{ else if eq .Values.global.clusterSize "standard" }}{{ .Values.requirements.standard.cpu | quote }}{{ else if eq .Values.global.clusterSize "recommended" }}{{ .Values.requirements.recommended.cpu | quote }}{{ else }}{{ .Values.requirements.standard.cpu | quote }}{{ end }}
- name: REQUIRED_MEMORY
value: {{ if eq .Values.global.clusterSize "minimal" }}{{ .Values.requirements.minimal.memory | quote }}{{ else if eq .Values.global.clusterSize "standard" }}{{ .Values.requirements.standard.memory | quote }}{{ else if eq .Values.global.clusterSize "recommended" }}{{ .Values.requirements.recommended.memory | quote }}{{ else }}{{ .Values.requirements.standard.memory | quote }}{{ end }}
{{- end }}
Loading