diff --git a/Makefile b/Makefile index b48fde9b9..54772758e 100644 --- a/Makefile +++ b/Makefile @@ -1,94 +1,29 @@ -.PHONY: debug fe server sync_db dump_db middleware web down clean python help - -KB_NAMESPACE := coze-loop -KB_RELEASE_NAME := coze-loop -KB_DEPLOY_NAME := coze-loop -KB_CHART_PATH :=./release/deployment/helm-chart/charts -KB_UMBRELLA_PATH :=./release/deployment/helm-chart/umbrella - DOCKER_COMPOSE_DIR := ./release/deployment/docker-compose -#demo-mini: -# kubectl -n ingress-nginx patch svc ingress-nginx-controller -p '{"spec":{"type":"LoadBalancer"}}' service/ingress-nginx-controller patched \ -# kubectl -n ingress-nginx get svc ingress-nginx-controller -w # 夯住 -# sudo minikube tunnel # 新终端夯住 -# # 第一个命令的EXTERNAL-IP配hosts -# curl -v http://127.0.0.1:18080 -H 'Host: cozeloop.mini.local' # 验证 - - - -chart-tpl-alone-%: - helm template $(KB_RELEASE_NAME) $(KB_UMBRELLA_PATH) \ - --namespace $(KB_NAMESPACE) \ - -f $(KB_UMBRELLA_PATH)/examples/alone.values.yaml \ - | yq eval '. | select(.kind == "Deployment" and .metadata.name == "coze-loop-$*")' - - -chart-tpl-default-%: - helm template $(KB_RELEASE_NAME) $(KB_UMBRELLA_PATH) \ - --namespace $(KB_NAMESPACE) \ - -f $(KB_UMBRELLA_PATH)/examples/default.values.yaml \ - | yq eval '. | select(.kind == "Deployment" and .metadata.name == "coze-loop-$*")' - - -chart-up-%: - helm upgrade \ - --install --force $(KB_RELEASE_NAME)-$* $(KB_UMBRELLA_PATH) \ - --namespace $(KB_NAMESPACE) --create-namespace \ - -f $(KB_UMBRELLA_PATH)/values.yaml \ - -f $(KB_UMBRELLA_PATH)/examples/$*.values.yaml - -chart: - @echo "🔧 Building Helm dependencies for umbrella chart..." - helm dependency build $(KB_UMBRELLA_PATH) - -mini-ingress-on: - minikube addons enable ingress -svc: - kubectl get svc -n $(KB_DEPLOY_NAME) -o wide +HELM_CHART_DIR := ./release/deployment/helm-chart/umbrella +HELM_NAMESPACE := coze-loop +HELM_RELEASE := coze-loop -ingress: - kubectl get ingress -n coze-loop +.PHONY: image mini-start mini-tunnel -kb-ctx: - kubectl config get-contexts -kb-use-ctx-%: -ifeq ($*,mini) - kubectl config use-context minikube -else - kubectl config use-context $$(kubectl config get-contexts -o name | grep -v '^minikube$$') -endif - kubectl config current-context +.PHONY: FORCE +FORCE: -kb-ns: - kubectl get namespaces - -kb-pod: - kubectl get pods -n $(KB_NAMESPACE) - -kb-del-%: - helm uninstall $(KB_DEPLOY_NAME)-$* -n $(KB_NAMESPACE) - -kb-log-%: - @echo "Getting logs for the latest pod of $(KB_DEPLOY_NAME)-$* ..." - @POD=$$(kubectl get pod -n $(KB_NAMESPACE) -l app=$(KB_DEPLOY_NAME)-$* -o jsonpath='{.items[0].metadata.name}'); \ - for c in $$(kubectl get pod $$POD -n $(KB_NAMESPACE) -o jsonpath='{.spec.initContainers[*].name} {.spec.containers[*].name}'); do \ - echo "========== logs from container: $$c =========="; \ - kubectl logs -n $(KB_NAMESPACE) -f $$POD -c $$c --tail=100; \ - done +image: + docker buildx build \ + --platform linux/amd64,linux/arm64 \ + --progress=plain \ + --push \ + -f ./release/image/Dockerfile \ + -t compose-cn-beijing.cr.volces.com/coze/coze-loop:latest \ + . -kb-up-%: - helm upgrade \ - --install --force $(KB_RELEASE_NAME)-$* $(KB_CHART_PATH)/$* \ - --namespace $(KB_NAMESPACE) --create-namespace \ - -f $(KB_CHART_PATH)/$*/values.yaml && \ - kubectl rollout status deployment/$(KB_DEPLOY_NAME)-$* -n $(KB_NAMESPACE) && \ - POD=$$(kubectl get pod -n $(KB_NAMESPACE) -l app=$(KB_DEPLOY_NAME)-$* -o jsonpath='{.items[0].metadata.name}') && \ - for c in $$(kubectl get pod $$POD -n $(KB_NAMESPACE) -o jsonpath='{.spec.initContainers[*].name} {.spec.containers[*].name}'); do \ - echo "========== logs from container: $$c =========="; \ - kubectl logs -n $(KB_NAMESPACE) -f $$POD -c $$c; \ - done + docker pull compose-cn-beijing.cr.volces.com/coze/coze-loop:latest -kb-clean: - helm list -n $(KB_NAMESPACE) -q | xargs -r -n1 helm uninstall -n $(KB_NAMESPACE) + docker run --rm coze-loop:latest du -sh /coze-loop/bin + docker run --rm coze-loop:latest du -sh /coze-loop/resources + docker run --rm coze-loop:latest du -sh /coze-loop/conf + docker run --rm coze-loop:latest du -sh /coze-loop compose%: @case "$*" in \ @@ -170,106 +105,77 @@ compose%: exit 1 ;; \ esac -debug: - docker compose \ - -f ./release/deployment/docker-compose/docker-compose.yml \ - -f ./release/deployment/docker-compose/debug/docker-compose.yml \ - --env-file ./release/deployment/docker-compose/.env \ - --profile "*" \ - up --build - -debug-app: - docker compose \ - -f ./release/deployment/docker-compose/docker-compose.yml \ - -f ./release/deployment/docker-compose/debug/remote/docker-compose.yml \ - --env-file ./release/deployment/docker-compose/.env \ - --profile "app" \ - up - -debug-compose: - docker compose \ - -f ./release/deployment/docker-compose/docker-compose.yml \ - -f ./release/deployment/docker-compose/debug/remote/docker-compose.yml \ - --profile "*" \ - config - -debug-down-v: - docker compose \ - -f ./release/deployment/docker-compose/docker-compose.yml \ - -f ./release/deployment/docker-compose/debug/docker-compose.yml \ - --profile "*" \ - down -v - -up: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --env-file ./release/deployment/docker-compose/.env --profile "*" up - -up-redis: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --env-file ./release/deployment/docker-compose/.env --profile "redis" up - -up-mysql: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --env-file ./release/deployment/docker-compose/.env --profile "mysql" up - -up-clickhouse: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --env-file ./release/deployment/docker-compose/.env --profile "clickhouse" up - -up-minio: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --env-file ./release/deployment/docker-compose/.env --profile "minio" up - -up-rmq: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --env-file ./release/deployment/docker-compose/.env --profile "rmq" up - -up-nginx: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --env-file ./release/deployment/docker-compose/.env --profile "nginx" up - -down: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml ---profile '*' down - -down-v: - docker compose -f ./release/deployment/docker-compose/docker-compose.yml --profile '*' down -v - -image: - @echo "Building and pushing multi-arch coze-loop images (amd64 + arm64)..." - - docker buildx build \ - --platform linux/amd64,linux/arm64 \ - --progress=plain \ - --push \ - -f ./release/image/Dockerfile \ - -t compose-cn-beijing.cr.volces.com/coze/coze-loop:latest \ - . - - @echo "Validating image size from coze-loop:latest (amd64 only)..." - - docker pull compose-cn-beijing.cr.volces.com/coze/coze-loop:latest - - docker run --rm coze-loop:latest du -sh /coze-loop/bin - docker run --rm coze-loop:latest du -sh /coze-loop/resources - docker run --rm coze-loop:latest du -sh /coze-loop/conf - docker run --rm coze-loop:latest du -sh /coze-loop - -clean-image: - docker rmi -f coze-loop-app:latest - docker builder prune --force - -into-image: - docker run -it --rm open-coze-loop-app:latest /bin/bash - -clean-all: - @echo "Stopping containers..." - @docker ps -aq | xargs -r docker stop - - @echo "Removing containers..." - @docker ps -aq | xargs -r docker rm -f - - @echo "Removing images..." - @docker images -aq | xargs -r docker rmi -f - - @echo "Removing volumes..." - @docker volume ls -q | xargs -r docker volume rm +helm%: + @case "$*" in \ + -chart) \ + helm dependency build $(HELM_CHART_DIR) ;; \ + -chart-clean) \ + rm -rf $(HELM_CHART_DIR)/charts $(HELM_CHART_DIR)/Chart.lock ;; \ + -ctx) \ + kubectl config get-contexts ;; \ + -ctx-*) \ + ctx="$*"; \ + ctx="$${ctx#-ctx-}"; \ + echo "switch to context: $$ctx"; \ + kubectl config use-context "$$ctx" ;; \ + -ns) \ + kubectl get namespaces ;; \ + -pod) \ + kubectl get pods -n $(HELM_NAMESPACE) ;; \ + -svc) \ + kubectl get svc -n $(HELM_NAMESPACE) -o wide ;; \ + -ingress) \ + kubectl get ingress -n $(HELM_NAMESPACE) ;; \ + -up) \ + helm upgrade \ + --install --force $(HELM_RELEASE) $(HELM_CHART_DIR) \ + --namespace $(HELM_NAMESPACE) --create-namespace \ + -f $(HELM_CHART_DIR)/values.yaml ;; \ + -down) \ + helm list -n $(HELM_NAMESPACE) -q \ + | \ + xargs -r -n1 helm uninstall -n $(HELM_NAMESPACE) ;; \ + -logf-*) \ + app="$*"; \ + app="$${app#-logf-}"; \ + kubectl -n $(HELM_NAMESPACE) logs \ + -l app=$(HELM_RELEASE)-$$app \ + --all-containers=true \ + --tail=100 \ + --prefix=true \ + --max-log-requests=10 \ + -f ;; \ + -tpl-*) \ + app="$*"; \ + app="$${app#-tpl-}"; \ + helm template $(HELM_RELEASE) $(HELM_CHART_DIR) \ + --namespace $(HELM_NAMESPACE) \ + -f $(HELM_CHART_DIR)/values.yaml | \ + APP="$$app" yq eval '. | select(.kind == "Deployment" and .metadata.name == ("coze-loop-" + strenv(APP)))' - ;; \ + --help|*) \ + echo "Usage:"; \ + echo " make helm-chart # build chart dependencies (helm dependency build)"; \ + echo " make helm-chart-clean # remove chart dependencies"; \ + echo " make helm-ctx # list all kubectl contexts"; \ + echo " make helm-ctx- # switch to a specific kubectl context"; \ + echo " make helm-ns # list all namespaces"; \ + echo " make helm-pod # list all pods in namespace $(HELM_NAMESPACE)"; \ + echo " make helm-svc # list all services in namespace $(HELM_NAMESPACE)"; \ + echo " make helm-ingress # list all ingress resources in namespace $(HELM_NAMESPACE)"; \ + echo " make helm-up # upgrade/install release $(HELM_RELEASE) from chart"; \ + echo " make helm-down # uninstall all releases in namespace $(HELM_NAMESPACE)"; \ + echo " make helm-logf- # follow logs of all containers in pods with app=$(HELM_RELEASE)-"; \ + echo " make helm-tpl- # render Deployment manifest of coze-loop- locally"; \ + echo; \ + echo "Notes:"; \ + echo " - Ensure $(HELM_NAMESPACE) and $(HELM_RELEASE) are set before running commands."; \ + echo " - Commands with '-' suffix accept a dynamic argument (e.g., helm-ctx-xxx, helm-logf-app)."; \ + echo " - '-tpl-*' renders manifests without applying them to the cluster."; \ + exit 1 ;; \ + esac - @echo "Removing custom networks..." - @docker network ls | awk '/bridge|host|none/ {next} NR>1 {print $$1}' | xargs -r docker network rm +mini-start: + minikube start --addons=ingress - @echo "Pruning builder and system..." - @docker builder prune -a -f - @docker system prune -a --volumes -f +mini-tunnel: + minikube tunnel \ No newline at end of file diff --git a/release/deployment/helm-chart/charts/app/templates/configmap.yaml b/release/deployment/helm-chart/charts/app/templates/configmap.yaml index 23dd84cbf..c131eb546 100644 --- a/release/deployment/helm-chart/charts/app/templates/configmap.yaml +++ b/release/deployment/helm-chart/charts/app/templates/configmap.yaml @@ -6,6 +6,4 @@ data: entrypoint.sh: |- {{ .Files.Get "bootstrap/entrypoint.sh" | nindent 4 }} healthcheck.sh: |- -{{ .Files.Get "bootstrap/healthcheck.sh" | nindent 4 }} - model_config.yaml: |- -{{ .Files.Get "bootstrap/model_config.yaml" | nindent 4 }} \ No newline at end of file +{{ .Files.Get "bootstrap/healthcheck.sh" | nindent 4 }} \ No newline at end of file diff --git a/release/deployment/helm-chart/charts/app/templates/deployment.yaml b/release/deployment/helm-chart/charts/app/templates/deployment.yaml index e89a148f0..38e54b4f6 100644 --- a/release/deployment/helm-chart/charts/app/templates/deployment.yaml +++ b/release/deployment/helm-chart/charts/app/templates/deployment.yaml @@ -53,11 +53,10 @@ spec: - name: bootstrap configMap: name: {{ include "configmap.name" . }} + - name: model-config + configMap: + name: "coze-loop-model-configmap" items: - - key: entrypoint.sh - path: entrypoint.sh - - key: healthcheck.sh - path: healthcheck.sh - key: model_config.yaml path: model_config.yaml initContainers: @@ -175,7 +174,7 @@ spec: - name: bootstrap mountPath: "/coze-loop/bootstrap" readOnly: true - - name: bootstrap + - name: model-config mountPath: "/coze-loop/conf/model_config.yaml" subPath: "model_config.yaml" readOnly: true diff --git a/release/deployment/helm-chart/charts/nginx/values.yaml b/release/deployment/helm-chart/charts/nginx/values.yaml index f586089c9..9e308a58a 100644 --- a/release/deployment/helm-chart/charts/nginx/values.yaml +++ b/release/deployment/helm-chart/charts/nginx/values.yaml @@ -1,5 +1,5 @@ service: - type: NodePort + type: LoadBalancer port: 8082 targetPort: 80 @@ -30,11 +30,6 @@ liveness: timeoutSeconds: 5 shutdownFailureTimes: 8 -ingress: - enabled: true - host: cozeloop.gcx.local - className: cozeloop-alb - proxy: oss: protocol: "http" diff --git a/release/deployment/helm-chart/umbrella/Chart.lock b/release/deployment/helm-chart/umbrella/Chart.lock deleted file mode 100644 index 26ed5d76a..000000000 --- a/release/deployment/helm-chart/umbrella/Chart.lock +++ /dev/null @@ -1,27 +0,0 @@ -dependencies: -- name: coze-loop-app - repository: file://../charts/app - version: 1.0.0 -- name: coze-loop-nginx - repository: file://../charts/nginx - version: 1.0.0 -- name: coze-loop-redis - repository: file://../charts/redis - version: 1.0.0 -- name: coze-loop-mysql - repository: file://../charts/mysql - version: 1.0.0 -- name: coze-loop-clickhouse - repository: file://../charts/clickhouse - version: 1.0.0 -- name: coze-loop-minio - repository: file://../charts/minio - version: 1.0.0 -- name: coze-loop-rmq-namesrv - repository: file://../charts/rmq-namesrv - version: 1.0.0 -- name: coze-loop-rmq-broker - repository: file://../charts/rmq-broker - version: 1.0.0 -digest: sha256:131b165d94e69d9029d1b0991bb8bd19917a8b4641e59922f80f9792e87ac1c6 -generated: "2025-08-08T00:34:39.373081+08:00" diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-app-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-app-1.0.0.tgz deleted file mode 100644 index d9063e72b..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-app-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-clickhouse-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-clickhouse-1.0.0.tgz deleted file mode 100644 index b09f6a6f4..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-clickhouse-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-minio-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-minio-1.0.0.tgz deleted file mode 100644 index 7e433bd70..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-minio-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-mysql-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-mysql-1.0.0.tgz deleted file mode 100644 index 531499317..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-mysql-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-nginx-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-nginx-1.0.0.tgz deleted file mode 100644 index 72bd0b6eb..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-nginx-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-redis-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-redis-1.0.0.tgz deleted file mode 100644 index 511b0c70c..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-redis-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-rmq-broker-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-rmq-broker-1.0.0.tgz deleted file mode 100644 index 6628df356..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-rmq-broker-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/charts/coze-loop-rmq-namesrv-1.0.0.tgz b/release/deployment/helm-chart/umbrella/charts/coze-loop-rmq-namesrv-1.0.0.tgz deleted file mode 100644 index 9fd071e21..000000000 Binary files a/release/deployment/helm-chart/umbrella/charts/coze-loop-rmq-namesrv-1.0.0.tgz and /dev/null differ diff --git a/release/deployment/helm-chart/umbrella/examples/mini.values.yaml b/release/deployment/helm-chart/umbrella/examples/mini.values.yaml deleted file mode 100644 index 3e77b4b9f..000000000 --- a/release/deployment/helm-chart/umbrella/examples/mini.values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -custom: &custom - image: - registry: "compose-cn-beijing.cr.volces.com" - pullSecrets: "coze-loop-image-secret" - redis: - disabled: true - mysql: - disabled: true - clickhouse: - disabled: true - oss: - disabled: true - rmq: - disabled: true - -coze-loop-app: - custom: *custom -coze-loop-nginx: - custom: *custom - service: - type: ClusterIP # minikube ClusterIP就行 - ingress: - enabled: true - host: cozeloop.mini.local - className: nginx -coze-loop-redis: - custom: *custom -coze-loop-mysql: - custom: *custom -coze-loop-clickhouse: - custom: *custom -coze-loop-minio: - custom: *custom -coze-loop-rmq-namesrv: - custom: *custom -coze-loop-rmq-broker: - custom: *custom \ No newline at end of file diff --git a/release/deployment/helm-chart/umbrella/examples/minikube/alone.values.yaml b/release/deployment/helm-chart/umbrella/examples/minikube/alone.values.yaml new file mode 100644 index 000000000..739902707 --- /dev/null +++ b/release/deployment/helm-chart/umbrella/examples/minikube/alone.values.yaml @@ -0,0 +1,60 @@ +ingress: + host: open.coze-loop.minikube + type: nginx + className: nginx + +custom: &custom + image: + registry: "docker.io" + redis: + disabled: false + domain: "***" + port: "***" + password: "***" + mysql: + disabled: false + domain: "***" + port: "***" + user: "***" + password: "***" + database: "***" + clickhouse: + disabled: false + domain: "***" + port: "***" + user: "***" + password: "***" + database: "***" + oss: + disabled: false + protocol: "***" + domain: "***" + port: "***" + region: "***" + user: "***" + password: "***" + bucket: "***" + rmq: + disabled: false + namesrv: + domain: "***" + port: "***" + user: "***" + password: "***" + +coze-loop-app: + custom: *custom +coze-loop-nginx: + custom: *custom +coze-loop-redis: + custom: *custom +coze-loop-mysql: + custom: *custom +coze-loop-clickhouse: + custom: *custom +coze-loop-minio: + custom: *custom +coze-loop-rmq-namesrv: + custom: *custom +coze-loop-rmq-broker: + custom: *custom \ No newline at end of file diff --git a/release/deployment/helm-chart/umbrella/examples/default.values.yaml b/release/deployment/helm-chart/umbrella/examples/minikube/bundle.values.yaml similarity index 87% rename from release/deployment/helm-chart/umbrella/examples/default.values.yaml rename to release/deployment/helm-chart/umbrella/examples/minikube/bundle.values.yaml index 42f5ad8ef..b1d11ff79 100644 --- a/release/deployment/helm-chart/umbrella/examples/default.values.yaml +++ b/release/deployment/helm-chart/umbrella/examples/minikube/bundle.values.yaml @@ -1,3 +1,8 @@ +ingress: + host: open.coze-loop.minikube + type: nginx + className: nginx + custom: &custom image: registry: "compose-cn-beijing.cr.volces.com" @@ -17,10 +22,6 @@ coze-loop-app: custom: *custom coze-loop-nginx: custom: *custom - ingress: - enabled: true - host: cozeloop.mini.local - className: nginx coze-loop-redis: custom: *custom coze-loop-mysql: diff --git a/release/deployment/helm-chart/umbrella/examples/minikube/mixed.values.yaml b/release/deployment/helm-chart/umbrella/examples/minikube/mixed.values.yaml new file mode 100644 index 000000000..779e49fc9 --- /dev/null +++ b/release/deployment/helm-chart/umbrella/examples/minikube/mixed.values.yaml @@ -0,0 +1,40 @@ +ingress: + host: open.coze-loop.minikube + type: vke + className: cozeloop-alb + instanceName: cozeloop-alb + +custom: &custom + image: + registry: "docker.io" + mysql: + disabled: false + domain: "***" + port: "***" + user: "***" + password: "***" + database: "***" + clickhouse: + disabled: false + domain: "***" + port: "***" + user: "***" + password: "***" + database: "***" + +coze-loop-app: + custom: *custom +coze-loop-nginx: + custom: *custom +coze-loop-redis: + custom: *custom +coze-loop-mysql: + custom: *custom +coze-loop-clickhouse: + custom: *custom +coze-loop-minio: + custom: *custom +coze-loop-rmq-namesrv: + custom: *custom +coze-loop-rmq-broker: + custom: *custom \ No newline at end of file diff --git a/release/deployment/helm-chart/charts/app/bootstrap/model_config.yaml b/release/deployment/helm-chart/umbrella/model_config.yaml similarity index 100% rename from release/deployment/helm-chart/charts/app/bootstrap/model_config.yaml rename to release/deployment/helm-chart/umbrella/model_config.yaml diff --git a/release/deployment/helm-chart/charts/nginx/templates/ingress.yaml b/release/deployment/helm-chart/umbrella/templates/ingress.yaml similarity index 67% rename from release/deployment/helm-chart/charts/nginx/templates/ingress.yaml rename to release/deployment/helm-chart/umbrella/templates/ingress.yaml index 41a9d08d9..1a450ad0a 100644 --- a/release/deployment/helm-chart/charts/nginx/templates/ingress.yaml +++ b/release/deployment/helm-chart/umbrella/templates/ingress.yaml @@ -1,4 +1,3 @@ -{{- if .Values.ingress.enabled }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -9,9 +8,6 @@ metadata: nginx.ingress.kubernetes.io/proxy-body-size: "1024m" nginx.ingress.kubernetes.io/ssl-redirect: "false" kubernetes.io/ingress.class: {{ .Values.ingress.className }} - {{- if ne .Values.ingress.className "nginx" }} - ingress.vke.volcengine.com/alb-instance-name: {{ .Values.ingress.className }} - {{- end }} spec: ingressClassName: {{ .Values.ingress.className }} rules: @@ -22,7 +18,6 @@ spec: pathType: Prefix backend: service: - name: {{ include "application.name" . }} + name: {{ printf "%s-nginx" (include "application.name" .) }} port: - number: {{ .Values.service.port }} -{{- end }} \ No newline at end of file + number: 8082 \ No newline at end of file diff --git a/release/deployment/helm-chart/umbrella/templates/model-configmap.yaml b/release/deployment/helm-chart/umbrella/templates/model-configmap.yaml new file mode 100644 index 000000000..2b5ed69e8 --- /dev/null +++ b/release/deployment/helm-chart/umbrella/templates/model-configmap.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-model-configmap" (include "application.name" .) }} +data: + model_config.yaml: |- +{{ .Files.Get "model_config.yaml" | nindent 4 }} \ No newline at end of file diff --git a/release/deployment/helm-chart/umbrella/values.yaml b/release/deployment/helm-chart/umbrella/values.yaml index 97825915c..b1d11ff79 100644 --- a/release/deployment/helm-chart/umbrella/values.yaml +++ b/release/deployment/helm-chart/umbrella/values.yaml @@ -1,3 +1,8 @@ +ingress: + host: open.coze-loop.minikube + type: nginx + className: nginx + custom: &custom image: registry: "compose-cn-beijing.cr.volces.com"