diff --git a/helm/charts/opencoze/templates/NOTES.txt b/helm/charts/opencoze/templates/NOTES.txt index b6c6e278..72b345e5 100644 --- a/helm/charts/opencoze/templates/NOTES.txt +++ b/helm/charts/opencoze/templates/NOTES.txt @@ -5,18 +5,22 @@ http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} {{- end }} {{- end }} -{{- else if contains "NodePort" .Values.service.type }} +{{- else if contains "NodePort" .Values.cozeServer.service.type }} export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "opencoze.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} +{{- else if contains "LoadBalancer" .Values.cozeServer.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "opencoze.fullname" . }}' export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "opencoze.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} + {{- range .Values.cozeServer.service.ports }}} + {{- if eq .name "http" }} + echo http://$SERVICE_IP:{{ .port }} + {{- end}} + {{- end}} +{{- else if contains "ClusterIP" .Values.cozeServer.service.type }} export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "opencoze.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" + echo "Visit http://127.0.0.1:{{ .Values.service.port}} to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT {{- end }} diff --git a/helm/charts/opencoze/templates/elasticsearch-statefulset.yaml b/helm/charts/opencoze/templates/elasticsearch-statefulset.yaml index 8e1bbab6..7a103c0a 100644 --- a/helm/charts/opencoze/templates/elasticsearch-statefulset.yaml +++ b/helm/charts/opencoze/templates/elasticsearch-statefulset.yaml @@ -81,7 +81,9 @@ spec: name: es-data spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.elasticsearch.persistence.storageClassName }} storageClassName: {{ .Values.elasticsearch.persistence.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.elasticsearch.persistence.size | quote }} diff --git a/helm/charts/opencoze/templates/etcd-statefulset.yaml b/helm/charts/opencoze/templates/etcd-statefulset.yaml index fdb1dc2c..e3a3e2ff 100644 --- a/helm/charts/opencoze/templates/etcd-statefulset.yaml +++ b/helm/charts/opencoze/templates/etcd-statefulset.yaml @@ -53,7 +53,9 @@ spec: name: etcd-data spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.etcd.persistence.storageClassName }} storageClassName: {{ .Values.etcd.persistence.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.etcd.persistence.size | quote }} diff --git a/helm/charts/opencoze/templates/milvus-statefulset.yaml b/helm/charts/opencoze/templates/milvus-statefulset.yaml index b13f3f15..91b95756 100644 --- a/helm/charts/opencoze/templates/milvus-statefulset.yaml +++ b/helm/charts/opencoze/templates/milvus-statefulset.yaml @@ -25,7 +25,14 @@ spec: securityContext: runAsUser: 0 image: "{{ .Values.milvus.image.repository }}:{{ .Values.milvus.image.tag }}" - command: ["milvus", "run", "standalone"] + command: + - bash + - -c + - | + # Set proper permissions for data directories + chown -R root:root /var/lib/milvus + chmod g+s /var/lib/milvus + exec milvus run standalone env: - name: ETCD_ENDPOINTS value: "{{ include "opencoze.fullname" . }}-etcd:2379" @@ -70,7 +77,9 @@ spec: name: milvus-data spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.milvus.persistence.storageClassName }} storageClassName: {{ .Values.milvus.persistence.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.milvus.persistence.size | quote }} diff --git a/helm/charts/opencoze/templates/minio-statefulset.yaml b/helm/charts/opencoze/templates/minio-statefulset.yaml index 96995a59..bc9951f8 100644 --- a/helm/charts/opencoze/templates/minio-statefulset.yaml +++ b/helm/charts/opencoze/templates/minio-statefulset.yaml @@ -58,7 +58,9 @@ spec: name: minio-data spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.minio.persistence.storageClassName }} storageClassName: {{ .Values.minio.persistence.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.minio.persistence.size | quote }} diff --git a/helm/charts/opencoze/templates/mysql-statefulset.yaml b/helm/charts/opencoze/templates/mysql-statefulset.yaml index 2f001288..ca7d02ea 100644 --- a/helm/charts/opencoze/templates/mysql-statefulset.yaml +++ b/helm/charts/opencoze/templates/mysql-statefulset.yaml @@ -55,7 +55,9 @@ spec: name: mysql-data spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.mysql.persistence.storageClassName }} storageClassName: {{ .Values.mysql.persistence.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.mysql.persistence.size | quote }} \ No newline at end of file diff --git a/helm/charts/opencoze/templates/redis-statefulset.yaml b/helm/charts/opencoze/templates/redis-statefulset.yaml index 90c472f2..70354ef6 100644 --- a/helm/charts/opencoze/templates/redis-statefulset.yaml +++ b/helm/charts/opencoze/templates/redis-statefulset.yaml @@ -42,7 +42,9 @@ spec: name: redis-data spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.redis.persistence.storageClassName }} storageClassName: {{ .Values.redis.persistence.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.redis.persistence.size | quote }} diff --git a/helm/charts/opencoze/templates/rocketmq-broker-configmap.yaml b/helm/charts/opencoze/templates/rocketmq-broker-configmap.yaml index 9bdfc63a..0cda07ec 100644 --- a/helm/charts/opencoze/templates/rocketmq-broker-configmap.yaml +++ b/helm/charts/opencoze/templates/rocketmq-broker-configmap.yaml @@ -1,3 +1,4 @@ +{{- if and (eq (lower (default "rmq" .Values.cozeServer.env.COZE_MQ_TYPE)) "rmq") }} apiVersion: v1 kind: ConfigMap metadata: @@ -13,4 +14,5 @@ data: fileReservedTime = 48 brokerRole = ASYNC_MASTER flushDiskType = ASYNC_FLUSH - brokerIP1 = __POD_IP__ \ No newline at end of file + brokerIP1 = __POD_IP__ +{{- end}} \ No newline at end of file diff --git a/helm/charts/opencoze/templates/rocketmq-broker-service.yaml b/helm/charts/opencoze/templates/rocketmq-broker-service.yaml index 336f7bd9..e938a9fa 100644 --- a/helm/charts/opencoze/templates/rocketmq-broker-service.yaml +++ b/helm/charts/opencoze/templates/rocketmq-broker-service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.rocketmq.enabled }} +{{- if and (eq (lower (default "rmq" .Values.cozeServer.env.COZE_MQ_TYPE)) "rmq") .Values.rocketmq.enabled }} apiVersion: v1 kind: Service metadata: diff --git a/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml b/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml index 6da19667..72e0254d 100644 --- a/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml +++ b/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml @@ -1,4 +1,4 @@ -{{- if .Values.rocketmq.enabled }} +{{- if and (eq (lower (default "rmq" .Values.cozeServer.env.COZE_MQ_TYPE)) "rmq") .Values.rocketmq.enabled }} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -111,7 +111,9 @@ spec: name: broker-store spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.rocketmq.broker.persistence.store.storageClassName }} storageClassName: {{ .Values.rocketmq.broker.persistence.store.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.rocketmq.broker.persistence.store.size | quote }} @@ -119,7 +121,9 @@ spec: name: broker-logs spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.rocketmq.broker.persistence.logs.storageClassName }} storageClassName: {{ .Values.rocketmq.broker.persistence.logs.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.rocketmq.broker.persistence.logs.size | quote }} diff --git a/helm/charts/opencoze/templates/rocketmq-namesrv-service.yaml b/helm/charts/opencoze/templates/rocketmq-namesrv-service.yaml index cd6907d3..41d244f2 100644 --- a/helm/charts/opencoze/templates/rocketmq-namesrv-service.yaml +++ b/helm/charts/opencoze/templates/rocketmq-namesrv-service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.rocketmq.enabled }} +{{- if and (eq (lower (default "rmq" .Values.cozeServer.env.COZE_MQ_TYPE)) "rmq") .Values.rocketmq.enabled }} apiVersion: v1 kind: Service metadata: diff --git a/helm/charts/opencoze/templates/rocketmq-namesrv-statefulset.yaml b/helm/charts/opencoze/templates/rocketmq-namesrv-statefulset.yaml index 9749b44f..f1cf3010 100644 --- a/helm/charts/opencoze/templates/rocketmq-namesrv-statefulset.yaml +++ b/helm/charts/opencoze/templates/rocketmq-namesrv-statefulset.yaml @@ -1,4 +1,4 @@ -{{- if .Values.rocketmq.enabled }} +{{- if and (eq (lower (default "rmq" .Values.cozeServer.env.COZE_MQ_TYPE)) "rmq") .Values.rocketmq.enabled }} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -56,7 +56,9 @@ spec: name: namesrv-store spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.rocketmq.namesrv.persistence.store.storageClassName }} storageClassName: {{ .Values.rocketmq.namesrv.persistence.store.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.rocketmq.namesrv.persistence.store.size | quote }} @@ -64,7 +66,9 @@ spec: name: namesrv-logs spec: accessModes: [ "ReadWriteOnce" ] + {{- if .Values.rocketmq.namesrv.persistence.logs.storageClassName }} storageClassName: {{ .Values.rocketmq.namesrv.persistence.logs.storageClassName | quote }} + {{- end }} resources: requests: storage: {{ .Values.rocketmq.namesrv.persistence.logs.size | quote }} diff --git a/helm/charts/opencoze/values-local.yaml b/helm/charts/opencoze/values-local.yaml deleted file mode 100644 index 3610e524..00000000 --- a/helm/charts/opencoze/values-local.yaml +++ /dev/null @@ -1,45 +0,0 @@ -mysql: - persistence: - storageClassName: "hostpath" - -redis: - persistence: - storageClassName: "hostpath" - -# -- coze-server configuration -cozeServer: - env: - MINIO_ENDPOINT: "localhost:9000" - - -rocketmq: - namesrv: - persistence: - store: - storageClassName: "hostpath" - logs: - storageClassName: "hostpath" - broker: - persistence: - store: - storageClassName: "hostpath" - logs: - storageClassName: "hostpath" - -elasticsearch: - persistence: - storageClassName: "hostpath" - - -minio: - persistence: - storageClassName: "hostpath" - -etcd: - persistence: - storageClassName: "hostpath" - -milvus: - persistence: - storageClassName: "hostpath" - diff --git a/helm/charts/opencoze/values.yaml b/helm/charts/opencoze/values.yaml index 5b6cba87..f2fc4c50 100644 --- a/helm/charts/opencoze/values.yaml +++ b/helm/charts/opencoze/values.yaml @@ -14,7 +14,7 @@ mysql: user: coze password: coze123 persistence: - storageClassName: "opencoze-data" + storageClassName: "" size: "50Gi" initScripts: - files/mysql/init.sql @@ -31,7 +31,7 @@ redis: allowEmptyPassword: "yes" password: "" persistence: - storageClassName: "opencoze-data" + storageClassName: "" size: "50Gi" # -- coze-server configuration @@ -41,8 +41,9 @@ cozeServer: replicaCount: 1 image: - repository: opencoze-cn-beijing.cr.volces.com/iac/opencoze - pullPolicy: IfNotPresent + repository: opencoze/opencoze + # -- Keep the mirror up to date + pullPolicy: Always tag: 'latest' service: @@ -106,10 +107,10 @@ rocketmq: tag: 5.3.2 persistence: store: - storageClassName: "opencoze-data" + storageClassName: "" size: "20Gi" logs: - storageClassName: "opencoze-data" + storageClassName: "" size: "20Gi" resources: limits: @@ -146,10 +147,10 @@ rocketmq: flushDiskType = ASYNC_FLUSH persistence: store: - storageClassName: "opencoze-data" + storageClassName: "" size: "20Gi" logs: - storageClassName: "opencoze-data" + storageClassName: "" size: "20Gi" resources: limits: @@ -170,7 +171,7 @@ elasticsearch: password: "" persistence: enabled: true - storageClassName: "opencoze-data" + storageClassName: "" accessModes: - ReadWriteOnce size: 50Gi @@ -192,7 +193,7 @@ minio: port: 9000 consolePort: 9001 persistence: - storageClassName: "opencoze-data" + storageClassName: "" size: "50Gi" resources: limits: @@ -208,7 +209,7 @@ etcd: repository: bitnami/etcd tag: 3.5 persistence: - storageClassName: "opencoze-data" + storageClassName: "" size: "20Gi" milvus: @@ -218,7 +219,7 @@ milvus: tag: v2.5.10 bucketName: milvus persistence: - storageClassName: "opencoze-data" + storageClassName: "" size: "20Gi" kibana: