From ac6a7ee27567df3315f5bf52158507c0b05822b8 Mon Sep 17 00:00:00 2001 From: ylzhangah <1194926515@qq.com> Date: Tue, 24 Sep 2024 17:13:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=95=9C=E5=83=8F=E9=89=B4?= =?UTF-8?q?=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/templates/framework/framework-deployment.yaml | 4 +--- .../chart/templates/mysql/mysql-deployment.yaml | 2 -- .../chart/templates/pgsql/pgsql-deployment.yaml | 2 -- euler-copilot-helm/chart/templates/rag/rag-deployment.yaml | 4 +--- .../chart/templates/redis/redis-deployment.yaml | 4 +--- .../chart/templates/vectorize/vectorize-deployment.yaml | 4 +--- euler-copilot-helm/chart/templates/web/web-deployment.yaml | 4 +--- euler-copilot-helm/chart/values.yaml | 3 --- euler-copilot-helm/scripts/download_file.sh | 2 +- 9 files changed, 6 insertions(+), 23 deletions(-) diff --git a/euler-copilot-helm/chart/templates/framework/framework-deployment.yaml b/euler-copilot-helm/chart/templates/framework/framework-deployment.yaml index c1409cc40..0b1fa690d 100644 --- a/euler-copilot-helm/chart/templates/framework/framework-deployment.yaml +++ b/euler-copilot-helm/chart/templates/framework/framework-deployment.yaml @@ -21,8 +21,6 @@ spec: automountServiceAccountToken: false securityContext: fsGroup: 1001 - imagePullSecrets: - {{- toYaml .Values.globals.imagePullSecrets | nindent 8 }} containers: - name: framework image: "{{if ne ( .Values.euler_copilot.framework.image.registry | toString ) ""}}{{ .Values.euler_copilot.framework.image.registry }}{{ else }}{{ .Values.globals.imageRegistry }}{{ end }}/{{ .Values.euler_copilot.framework.image.repository }}:{{ .Values.euler_copilot.framework.image.tag | toString }}" @@ -97,4 +95,4 @@ spec: - name: framework-shared-secret-volume emptyDir: medium: Memory -{{- end }} \ No newline at end of file +{{- end }} diff --git a/euler-copilot-helm/chart/templates/mysql/mysql-deployment.yaml b/euler-copilot-helm/chart/templates/mysql/mysql-deployment.yaml index 36e5fbc0b..0bb8e8465 100644 --- a/euler-copilot-helm/chart/templates/mysql/mysql-deployment.yaml +++ b/euler-copilot-helm/chart/templates/mysql/mysql-deployment.yaml @@ -19,8 +19,6 @@ spec: app: mysql-{{ .Release.Name }} spec: automountServiceAccountToken: false - imagePullSecrets: - {{- toYaml .Values.globals.imagePullSecrets | nindent 8 }} containers: - name: mysql image: "{{ if ne (.Values.euler_copilot.mysql.image.registry | toString ) "" }}{{ .Values.euler_copilot.mysql.image.registry }}{{ else }}{{ .Values.globals.imageRegistry }}{{ end }}/{{ .Values.euler_copilot.mysql.image.repository }}:{{ .Values.euler_copilot.mysql.image.tag | toString }}" diff --git a/euler-copilot-helm/chart/templates/pgsql/pgsql-deployment.yaml b/euler-copilot-helm/chart/templates/pgsql/pgsql-deployment.yaml index 7af91f4d7..06141a718 100644 --- a/euler-copilot-helm/chart/templates/pgsql/pgsql-deployment.yaml +++ b/euler-copilot-helm/chart/templates/pgsql/pgsql-deployment.yaml @@ -19,8 +19,6 @@ spec: app: pgsql-{{ .Release.Name }} spec: automountServiceAccountToken: false - imagePullSecrets: - {{- toYaml .Values.globals.imagePullSecrets | nindent 8 }} containers: - name: pgsql image: "{{if ne ( .Values.euler_copilot.pgsql.image.registry | toString ) ""}}{{ .Values.euler_copilot.pgsql.image.registry }}{{ else }}{{ .Values.globals.imageRegistry }}{{ end }}/{{ .Values.euler_copilot.pgsql.image.repository }}:{{ .Values.euler_copilot.pgsql.image.tag | toString }}" diff --git a/euler-copilot-helm/chart/templates/rag/rag-deployment.yaml b/euler-copilot-helm/chart/templates/rag/rag-deployment.yaml index 1a57abd31..743f4c97f 100644 --- a/euler-copilot-helm/chart/templates/rag/rag-deployment.yaml +++ b/euler-copilot-helm/chart/templates/rag/rag-deployment.yaml @@ -21,8 +21,6 @@ spec: automountServiceAccountToken: false securityContext: fsGroup: 1001 - imagePullSecrets: - {{- toYaml .Values.globals.imagePullSecrets | nindent 8 }} containers: - name: rag image: "{{if ne ( .Values.euler_copilot.rag.image.registry | toString ) ""}}{{ .Values.euler_copilot.rag.image.registry }}{{ else }}{{ .Values.globals.imageRegistry }}{{ end }}/{{ .Values.euler_copilot.rag.image.repository }}:{{ .Values.euler_copilot.rag.image.tag | toString }}" @@ -99,4 +97,4 @@ spec: hostPath: path: {{ .Values.euler_copilot.rag.docs_dir }} type: Directory -{{- end }} \ No newline at end of file +{{- end }} diff --git a/euler-copilot-helm/chart/templates/redis/redis-deployment.yaml b/euler-copilot-helm/chart/templates/redis/redis-deployment.yaml index 7113dd077..fb092e894 100644 --- a/euler-copilot-helm/chart/templates/redis/redis-deployment.yaml +++ b/euler-copilot-helm/chart/templates/redis/redis-deployment.yaml @@ -19,8 +19,6 @@ spec: app: redis-{{ .Release.Name }} spec: automountServiceAccountToken: false - imagePullSecrets: - {{- toYaml .Values.globals.imagePullSecrets | nindent 8 }} containers: - name: redis image: "{{ if ne (.Values.euler_copilot.redis.image.registry | toString) "" }}{{ .Values.euler_copilot.redis.image.registry }}{{ else }}{{ .Values.globals.imageRegistry }}{{ end }}/{{ .Values.euler_copilot.redis.image.repository }}:{{ .Values.euler_copilot.redis.image.tag | toString }}" @@ -60,4 +58,4 @@ spec: - name: redis-tmp emptyDir: medium: Memory -{{- end }} \ No newline at end of file +{{- end }} diff --git a/euler-copilot-helm/chart/templates/vectorize/vectorize-deployment.yaml b/euler-copilot-helm/chart/templates/vectorize/vectorize-deployment.yaml index 203e7e560..b02bd1427 100644 --- a/euler-copilot-helm/chart/templates/vectorize/vectorize-deployment.yaml +++ b/euler-copilot-helm/chart/templates/vectorize/vectorize-deployment.yaml @@ -21,8 +21,6 @@ spec: automountServiceAccountToken: false securityContext: fsGroup: 1001 - imagePullSecrets: - {{- toYaml .Values.globals.imagePullSecrets | nindent 8 }} containers: - name: vectorize image: "{{ if ne ( .Values.euler_copilot.vectorize.image.registry | toString) "" }}{{ .Values.euler_copilot.vectorize.image.registry }}{{ else }}{{ .Values.globals.imageRegistry }}{{ end }}/{{ .Values.euler_copilot.vectorize.image.repository }}:{{ .Values.euler_copilot.vectorize.image.tag | toString }}" @@ -97,4 +95,4 @@ spec: - name: vectorize-tmp-volume emptyDir: medium: Memory -{{- end }} \ No newline at end of file +{{- end }} diff --git a/euler-copilot-helm/chart/templates/web/web-deployment.yaml b/euler-copilot-helm/chart/templates/web/web-deployment.yaml index 75b0b3cd2..6d0f28f16 100644 --- a/euler-copilot-helm/chart/templates/web/web-deployment.yaml +++ b/euler-copilot-helm/chart/templates/web/web-deployment.yaml @@ -21,8 +21,6 @@ spec: automountServiceAccountToken: false securityContext: fsGroup: 1001 - imagePullSecrets: - {{- toYaml .Values.globals.imagePullSecrets | nindent 8 }} containers: - name: web image: "{{ if ne ( .Values.euler_copilot.web.image.registry | toString ) ""}}{{ .Values.euler_copilot.web.image.registry }}{{ else }}{{ .Values.globals.imageRegistry }}{{ end }}/{{ .Values.euler_copilot.web.image.repository }}:{{ .Values.euler_copilot.web.image.tag | toString }}" @@ -71,4 +69,4 @@ spec: - name: web-tmp emptyDir: medium: Memory -{{- end }} \ No newline at end of file +{{- end }} diff --git a/euler-copilot-helm/chart/values.yaml b/euler-copilot-helm/chart/values.yaml index 8f156c2b4..d1817d399 100644 --- a/euler-copilot-helm/chart/values.yaml +++ b/euler-copilot-helm/chart/values.yaml @@ -4,9 +4,6 @@ globals: replicaCount: 1 # 镜像仓库 imageRegistry: "hub.oepkgs.net/neocopilot" - # 镜像仓库鉴权 - imagePullSecrets: - - name: euler-copilot-registry # 镜像拉取策略 imagePullPolicy: IfNotPresent # 部署域名 diff --git a/euler-copilot-helm/scripts/download_file.sh b/euler-copilot-helm/scripts/download_file.sh index 77cef8f10..071cb7d7a 100644 --- a/euler-copilot-helm/scripts/download_file.sh +++ b/euler-copilot-helm/scripts/download_file.sh @@ -39,7 +39,7 @@ function download_small_model { export HF_ENDPOINT=https://hf-mirror.com; # 下载reranker - huggingface-cli download --resume-download "$RERANKER" --local-dir $(echo $RERANKER | cut -d "/" -f 2); + huggingface-cli download --resume-download $RERANKER --local-dir $(echo $RERANKER | cut -d "/" -f 2); if [[ $? -ne 0 ]]; then echo -e "[Error]下载模型权重失败：$RERANKER \033[0m"; return 1; -- Gitee