diff --git a/euler-copilot-helm/chart/templates/framework/framework-deployment.yaml b/euler-copilot-helm/chart/templates/framework/framework-deployment.yaml index c1409cc40ceb23a644673e0c8d580d6f1f2e641e..0b1fa690dda17904201276dfd58143a407ef485e 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 36e5fbc0bb65e22fe1655eae5b9021c98ada8fa1..0bb8e8465770ddbe0391242ca2168226260c625d 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 7af91f4d7b5301564cf0e052a8274ed17b4d5930..06141a718817cbcae4e524e3a3adb61d021d287d 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 1a57abd31843c7c43a6a82743f688e8a671fbf07..743f4c97f15c3711e3d47a378f3b6f9ab1c100f8 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 7113dd0773db8a2ae45beb2a7222f84971f6481d..fb092e894607659860fa4f4c27ba34838e7a71eb 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 203e7e560c4dcce9aac80efba653ddba10b4ea22..b02bd1427b9b5808d782b26c26102c71e7c81427 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 75b0b3cd223eadaf27cdab93496639e505574677..6d0f28f16e348dc39324878574810bd67cb13331 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 8f156c2b4a4da2a6677d6f6c19e309d1ba0863a8..d1817d3991b5a3d52f946d26c5dfb47e48851e0e 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 77cef8f10259bbd75b900bcef34c5d9b70244946..071cb7d7ad828d5962b04851a3f9d1c45736585f 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;