feat(ci): 1. remove docker proxy. 2. split debug and docker environment (#304)

helm/charts/opencoze/templates/deployment.yaml

@@ -86,10 +86,14 @@ spec:
               value: {{ .Values.elasticsearch.username | quote }}
             - name: ES_PASSWORD
               value: {{ .Values.elasticsearch.password | quote }}
-            - name: RMQ_NAME_SERVER
+            - name: MQ_NAME_SERVER
               value: "http://{{ include "opencoze.fullname" . }}-rocketmq-namesrv:9876"
             - name: MILVUS_ADDR
               value: "{{ include "opencoze.fullname" . }}-milvus:19530"
+            - name: MINIO_ENDPOINT
+              value: "{{ include "opencoze.fullname" . }}-minio:9000"
+            - name: MINIO_API_HOST
+              value: "http://{{ include "opencoze.fullname" . }}-minio:9000"
             - name: MYSQL_DSN
               value: "{{ .Values.mysql.user }}:{{ .Values.mysql.password }}@tcp({{ include "opencoze.fullname" . }}-mysql:3306)/{{ .Values.mysql.database }}?charset=utf8mb4&parseTime=True&loc=Local"
             {{- range $key, $val := .Values.cozeServer.env }}

helm/charts/opencoze/templates/kibana-deployment.yaml

@@ -1,101 +0,0 @@
-{{- if .Values.kibana.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "opencoze.fullname" . }}-kibana
-  labels:
-    {{- include "opencoze.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: kibana
-      app.kubernetes.io/name: {{ include "opencoze.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: kibana
-        app.kubernetes.io/name: {{ include "opencoze.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-    spec:
-      securityContext:
-        runAsUser: 0
-        fsGroup: 1001
-      initContainers:
-      - name: wait-for-elasticsearch
-        image: {{ .Values.images.curl }}
-        env:
-        - name: ES_HOST
-          value: '{{ include "opencoze.fullname" . }}-elasticsearch'
-        - name: ES_PORT
-          value: "9200"
-        - name: ES_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-es-secret
-              key: username
-        - name: ES_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}-es-secret
-              key: password
-        command: ['sh', '-c', 'until curl -s -u "$ES_USERNAME:$ES_PASSWORD" "http://$ES_HOST:$ES_PORT/_cluster/health?wait_for_status=yellow&timeout=1s"; do echo "waiting for elasticsearch"; sleep 2; done;']
-      containers:
-        - name: kibana
-          image: "{{ .Values.kibana.image.repository }}:{{ .Values.kibana.image.tag }}"
-          env:
-          - name: KIBANA_ELASTICSEARCH_URL
-            value: "{{ include "opencoze.fullname" . }}-elasticsearch"
-          command:
-            - /bin/bash
-            - -c
-            - |
-              /opt/bitnami/scripts/kibana/setup.sh
-              chown -R kibana:kibana /bitnami/kibana
-              chmod g+s /bitnami/kibana
-              exec /opt/bitnami/scripts/kibana/entrypoint.sh /opt/bitnami/scripts/kibana/run.sh
-              /opt/bitnami/scripts/kibana/setup.sh
-              chown -R 1001:1001 /bitnami/kibana
-              chmod -R g+s /bitnami/kibana
-              exec /opt/bitnami/scripts/kibana/entrypoint.sh /opt/bitnami/scripts/kibana/run.sh
-          env:
-            - name: KIBANA_ELASTICSEARCH_URL
-              value: '{{ include "opencoze.fullname" . }}-elasticsearch'
-            - name: ELASTICSEARCH_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-es-secret
-                  key: username
-            - name: ELASTICSEARCH_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Release.Name }}-es-secret
-                  key: password
-          ports:
-            - name: http
-              containerPort: {{ .Values.kibana.service.port }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /api/status
-              port: http
-            initialDelaySeconds: 120
-            periodSeconds: 10
-            timeoutSeconds: 5
-            failureThreshold: 6
-          readinessProbe:
-            httpGet:
-              path: /api/status
-              port: http
-            initialDelaySeconds: 30
-            periodSeconds: 10
-            timeoutSeconds: 5
-            failureThreshold: 6
-          volumeMounts:
-            - name: kibana-data
-              mountPath: /bitnami/kibana
-      volumes:
-        - name: kibana-data
-          emptyDir: {}
-{{- end }}

helm/charts/opencoze/templates/kibana-service.yaml

@@ -1,19 +0,0 @@
-{{- if .Values.kibana.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "opencoze.fullname" . }}-kibana
-  labels:
-    {{- include "opencoze.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.kibana.service.type }}
-  ports:
-    - port: {{ .Values.kibana.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/component: kibana
-    app.kubernetes.io/name: {{ include "opencoze.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}

helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml

@@ -22,7 +22,7 @@ spec:
     spec:
       initContainers:
         - name: wait-for-namesrv
-          image: opencoze-cn-beijing.cr.volces.com/iac/busybox:latest
+          image: busybox:latest
           command: ['sh', '-c', 'until nc -z {{ .Release.Name }}-rocketmq-namesrv 9876; do echo waiting for namesrv; sleep 2; done']
       volumes:
         - name: broker-config

helm/charts/opencoze/values.yaml

@@ -62,11 +62,8 @@ cozeServer:
     LOG_LEVEL: "debug"
     MAX_REQUEST_BODY_SIZE: "1073741824"
     STORAGE_TYPE: "minio"
-    STORAGE_BUCKET: "opencoze"
     MINIO_PROXY_ENDPOINT: ":8889"
     COZE_MQ_TYPE: rmq
-    MQ_NAME_SERVER: "127.0.0.1:9876"
-    MINIO_ENDPOINT: "127.0.0.1:9000"
     ES_VERSION: "v8"
     VECTOR_STORE_TYPE: "milvus"
     EMBEDDING_TYPE: "ark"
@@ -96,7 +93,6 @@ cozeServer:
     VE_IMAGEX_DOMAIN: ""
     VE_IMAGEX_TEMPLATE: ""
     VE_IMAGEX_UPLOAD_HOST: "https://imagex.volcengineapi.com"
-    COZE_SERVER_PROXY_URL_LIST: "opencoze-mysql:3306,opencoze-redis:6379,opencoze-elasticsearch:9200,opencoze-milvus:19530,opencoze-minio:9000,opencoze-rocketmq-namesrv:9876"
 
 rocketmq:
   enabled: true
@@ -222,15 +218,6 @@ milvus:
     storageClassName: ""
     size: "20Gi"
 
-kibana:
-  enabled: true
-  image:
-    repository: bitnami/kibana
-    tag: 8.18.0
-  service:
-    type: ClusterIP
-    port: 5601
-
 
 images:
   busybox: busybox:latest