From 4ee51455782757ebf28cdc7b53d5a476acb150eb Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Thu, 22 Sep 2022 15:19:58 +0800
Subject: [PATCH 01/10] feat: support nng mount

---
 deploy/charts/neuron/Chart.yaml                |  2 +-
 deploy/charts/neuron/templates/deployment.yaml |  9 +++++++++
 deploy/charts/neuron/values.yaml               | 10 ++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/deploy/charts/neuron/Chart.yaml b/deploy/charts/neuron/Chart.yaml
index d0be2cbb..8855ff10 100644
--- a/deploy/charts/neuron/Chart.yaml
+++ b/deploy/charts/neuron/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.1
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 2.0.1
+appVersion: 2.2.2
diff --git a/deploy/charts/neuron/templates/deployment.yaml b/deploy/charts/neuron/templates/deployment.yaml
index 420f1ad4..377890d6 100644
--- a/deploy/charts/neuron/templates/deployment.yaml
+++ b/deploy/charts/neuron/templates/deployment.yaml
@@ -23,6 +23,13 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
+        - name: neuron-tmp
+          {{- if .Values.nngFromExistingPVC.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ printf "%s" (tpl (default "" .Values.nngFromExistingPVC.existingClaim) .) }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
         {{- if .Values.tls.enabled }}
         - name: certs
           secret:
@@ -58,6 +65,8 @@ spec:
           volumeMounts:
           - name: neuron-persistence
             mountPath: "/opt/neuron/persistence"
+          - name: neuron-tmp
+            mountPath: "/tmp"
           {{- if .Values.tls.enabled }}
           - name: certs
             mountPath: "/opt/neuron/config/neuron.pem"
diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index e5a47471..6efc1808 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -83,11 +83,17 @@ ingress:
 
 
 persistence:
-  enabled: false
+  enabled: true
   # -- Existing PersistentVolumeClaims
   # The value is evaluated as a template
   # So, for example, the name can depend on .Release or .Chart
-  existingClaim: ""
+  existingClaim: "pvc-neuron-data"
+
+nngFromExistingPVC:
+  enabled: true
+  ## PVC must be created manually before volume will be bound. The value is evaluated as a template
+  ##
+  existingClaim: "pvc-neuron-tmp"
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

From a39483331f7a1ccf924f8f82714f2706e6a840f7 Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Tue, 27 Sep 2022 19:12:34 +0800
Subject: [PATCH 02/10] chore: update image version

---
 deploy/charts/neuron/Chart.yaml  | 2 +-
 deploy/charts/neuron/values.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/charts/neuron/Chart.yaml b/deploy/charts/neuron/Chart.yaml
index 8855ff10..b742e400 100644
--- a/deploy/charts/neuron/Chart.yaml
+++ b/deploy/charts/neuron/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.1
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 2.2.2
+appVersion: 2.2.3
diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index 6efc1808..ba2a2c80 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -30,7 +30,7 @@ securityContext: {}
 
 service:
   enabled: true
-  type: ClusterIP
+  type: NodePort
 
   # -- Service ports
   ports:
@@ -90,7 +90,7 @@ persistence:
   existingClaim: "pvc-neuron-data"
 
 nngFromExistingPVC:
-  enabled: true
+  enabled: false
   ## PVC must be created manually before volume will be bound. The value is evaluated as a template
   ##
   existingClaim: "pvc-neuron-tmp"

From 04a13220ac9ee7ed8b0cefd9ab1761e3d4b79ac3 Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Wed, 28 Sep 2022 15:29:01 +0800
Subject: [PATCH 03/10] feat: mount logs directory

---
 deploy/charts/neuron/templates/deployment.yaml | 9 +++++++++
 deploy/charts/neuron/values.yaml               | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/deploy/charts/neuron/templates/deployment.yaml b/deploy/charts/neuron/templates/deployment.yaml
index 377890d6..17241287 100644
--- a/deploy/charts/neuron/templates/deployment.yaml
+++ b/deploy/charts/neuron/templates/deployment.yaml
@@ -30,6 +30,13 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
+        - name: neuron-logs
+          {{- if .Values.logsPVC.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ printf "%s" (tpl (default "" .Values.logsPVC.existingClaim) .) }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
         {{- if .Values.tls.enabled }}
         - name: certs
           secret:
@@ -67,6 +74,8 @@ spec:
             mountPath: "/opt/neuron/persistence"
           - name: neuron-tmp
             mountPath: "/tmp"
+          - name: neuron-logs
+            mountPath: "/opt/neuron/logs"
           {{- if .Values.tls.enabled }}
           - name: certs
             mountPath: "/opt/neuron/config/neuron.pem"
diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index ba2a2c80..48e3b438 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -95,6 +95,13 @@ nngFromExistingPVC:
   ##
   existingClaim: "pvc-neuron-tmp"
 
+logsPVC:
+  enable: true
+  ## PVC must be created manually before volume will be bound. The value is evaluated as a template
+  ##
+  existingClaim: "pvc-neuron-logs"
+
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

From 7c502755ebe0ff1e714ff7f020702e6ffe94a068 Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Wed, 28 Sep 2022 17:42:16 +0800
Subject: [PATCH 04/10] feat: support openelb

---
 deploy/charts/neuron/templates/svc.yaml | 6 ++++++
 deploy/charts/neuron/values.yaml        | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/deploy/charts/neuron/templates/svc.yaml b/deploy/charts/neuron/templates/svc.yaml
index 24f783e9..c9dc4ebb 100644
--- a/deploy/charts/neuron/templates/svc.yaml
+++ b/deploy/charts/neuron/templates/svc.yaml
@@ -6,6 +6,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "neuron.labels" . | nindent 4 }}
+  {{- if eq .Values.service.type "LoadBalancer" }}
+  {{- with .Values.service.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   {{- if eq .Values.service.type "LoadBalancer" }}
diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index 48e3b438..d4ce612d 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -63,7 +63,10 @@ service:
   #
   loadBalancerSourceRanges: []
   # -- Provide any additional annotations which may be required. Evaluated as a template
-  annotations: {}
+  annotations:
+    eip.openelb.kubesphere.io/v1alpha2: vip-eip
+    lb.kubesphere.io/v1alpha1: openelb
+    protocol.openelb.kubesphere.io/v1alpha1: vip
 
 ingress:
   enabled: false
@@ -96,7 +99,7 @@ nngFromExistingPVC:
   existingClaim: "pvc-neuron-tmp"
 
 logsPVC:
-  enable: true
+  enabled: true
   ## PVC must be created manually before volume will be bound. The value is evaluated as a template
   ##
   existingClaim: "pvc-neuron-logs"

From 92def070f9397a4d664176d4abbbc62b05f87585 Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Thu, 29 Sep 2022 10:12:49 +0800
Subject: [PATCH 05/10] chore: enable nng

---
 deploy/charts/neuron/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index d4ce612d..bfc2d153 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -93,7 +93,7 @@ persistence:
   existingClaim: "pvc-neuron-data"
 
 nngFromExistingPVC:
-  enabled: false
+  enabled: true
   ## PVC must be created manually before volume will be bound. The value is evaluated as a template
   ##
   existingClaim: "pvc-neuron-tmp"

From b962ba3a4a64a1e6f0061a348596a0996c072077 Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Tue, 25 Oct 2022 17:05:51 +0800
Subject: [PATCH 06/10] feat: add logconfig cm by mount zlog

---
 deploy/charts/neuron-1.0.2.tgz                | Bin 0 -> 6292 bytes
 deploy/charts/neuron/Chart.yaml               |   2 +-
 deploy/charts/neuron/README.md                |  19 ++++++++++--------
 deploy/charts/neuron/conf/zlog.conf           |  12 +++++++++++
 deploy/charts/neuron/templates/configmap.yaml |  12 +++++++++++
 .../charts/neuron/templates/deployment.yaml   |  13 ++++++++++--
 deploy/charts/neuron/values.yaml              |  13 +++---------
 7 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 deploy/charts/neuron-1.0.2.tgz
 create mode 100644 deploy/charts/neuron/conf/zlog.conf
 create mode 100644 deploy/charts/neuron/templates/configmap.yaml

diff --git a/deploy/charts/neuron-1.0.2.tgz b/deploy/charts/neuron-1.0.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..ec72c6fa792742fa52d2e539791373725e69726e
GIT binary patch
literal 6292
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
KB9-p|Yybe~5`sej

literal 0
HcmV?d00001

diff --git a/deploy/charts/neuron/Chart.yaml b/deploy/charts/neuron/Chart.yaml
index b742e400..185384eb 100644
--- a/deploy/charts/neuron/Chart.yaml
+++ b/deploy/charts/neuron/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.0.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/deploy/charts/neuron/README.md b/deploy/charts/neuron/README.md
index 7691360f..90f62301 100644
--- a/deploy/charts/neuron/README.md
+++ b/deploy/charts/neuron/README.md
@@ -1,6 +1,8 @@
 # neuron
 
-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.1](https://img.shields.io/badge/AppVersion-2.0.1-informational?style=flat-square)
+![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
+
+A Helm chart for Kubernetes
 
 A Helm chart for Kubernetes
 
@@ -28,9 +30,6 @@ helm uninstall my-neuron
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | clusterDomain | string | `"cluster.local"` | Kubernetes Cluster Domain |
-| containerPorts | object | `{"api":7001,"web":7000}` | Container Ports |
-| containerPorts.api | int | `7001` | containerPorts.api |
-| containerPorts.web | int | `7000` | containerPorts.web |
 | fullnameOverride | string | `""` |  |
 | hostPorts | object | `{"api":30371,"enabled":false,"web":30370}` | only for kubeedge deployment |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
@@ -44,16 +43,20 @@ helm uninstall my-neuron
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
+| logsPVC.enabled | bool | `true` |  |
+| logsPVC.existingClaim | string | `"pvc-neuron-logs"` |  |
 | nameOverride | string | `""` |  |
+| nngFromExistingPVC.enabled | bool | `true` |  |
+| nngFromExistingPVC.existingClaim | string | `"pvc-neuron-tmp"` |  |
 | nodeSelector | object | `{}` |  |
-| persistence.enabled | bool | `false` |  |
-| persistence.existingClaim | string | `""` | Existing PersistentVolumeClaims The value is evaluated as a template So, for example, the name can depend on .Release or .Chart |
+| persistence.enabled | bool | `true` |  |
+| persistence.existingClaim | string | `"pvc-neuron-data"` | Existing PersistentVolumeClaims The value is evaluated as a template So, for example, the name can depend on .Release or .Chart |
 | podAnnotations | object | `{}` |  |
 | readinessProbe.enabled | bool | `true` |  |
 | readinessProbe.initialDelaySeconds | int | `5` |  |
 | readinessProbe.periodSeconds | int | `5` |  |
 | resources | object | `{}` |  |
-| service.annotations | object | `{}` | Provide any additional annotations which may be required. Evaluated as a template |
+| service.annotations | object | `{"eip.openelb.kubesphere.io/v1alpha2":"eip-pool","lb.kubesphere.io/v1alpha1":"openelb","protocol.openelb.kubesphere.io/v1alpha1":"layer2"}` | Provide any additional annotations which may be required. Evaluated as a template |
 | service.enabled | bool | `true` |  |
 | service.loadBalancerSourceRanges | list | `[]` | loadBalancerSourceRanges: - 10.10.10.0/24  |
 | service.nodePorts | object | `{"api":null,"web":null}` | Specify the nodePort(s) value for the LoadBalancer and NodePort service types. ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport |
@@ -62,5 +65,5 @@ helm uninstall my-neuron
 | service.ports.api.port | int | `7001` | Neuron API port |
 | service.ports.web.name | string | `"web"` | Neuron Dashboard port name |
 | service.ports.web.port | int | `7000` | Neuron Dashboard port |
-| service.type | string | `"ClusterIP"` |  |
+| service.type | string | `"NodePort"` |  |
 | tolerations | list | `[]` |  |
\ No newline at end of file
diff --git a/deploy/charts/neuron/conf/zlog.conf b/deploy/charts/neuron/conf/zlog.conf
new file mode 100644
index 00000000..e6f2bb37
--- /dev/null
+++ b/deploy/charts/neuron/conf/zlog.conf
@@ -0,0 +1,12 @@
+[global]
+
+reload conf period = 60
+file perms = 666
+
+[formats]
+
+simple = "%d [%V] %f:%L %m%n"
+
+[rules]
+
+*.DEBUG     "./logs/%c.log", 10MB * 3 ~ "./logs/%c.#2s.log"; simple
\ No newline at end of file
diff --git a/deploy/charts/neuron/templates/configmap.yaml b/deploy/charts/neuron/templates/configmap.yaml
new file mode 100644
index 00000000..16e85b13
--- /dev/null
+++ b/deploy/charts/neuron/templates/configmap.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "neuron.fullname" . }}-cm-log-conf
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "neuron.labels" . | nindent 4 }}
+binaryData:
+  {{ range $path, $_ := .Files.Glob (printf "conf/zlog.conf")}}
+    {{ $name := base $path }}
+    {{- printf "%s" $name}}{{ print ": "}}{{ $.Files.Get $path | b64enc }}
+  {{ end }}
\ No newline at end of file
diff --git a/deploy/charts/neuron/templates/deployment.yaml b/deploy/charts/neuron/templates/deployment.yaml
index 17241287..a70d52f5 100644
--- a/deploy/charts/neuron/templates/deployment.yaml
+++ b/deploy/charts/neuron/templates/deployment.yaml
@@ -37,6 +37,12 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
+        - name: neuron-log-conf
+          configMap:
+            name: {{ include "neuron.fullname" . }}-cm-log-conf
+            items:
+            - key: zlog.conf
+              path: zlog.conf
         {{- if .Values.tls.enabled }}
         - name: certs
           secret:
@@ -60,12 +66,12 @@ spec:
           {{- end }}
           ports:
           - name: web
-            containerPort: {{ .Values.containerPorts.web | default 7000 }}
+            containerPort: {{ .Values.service.ports.api.web | default 7000 }}
             {{- if .Values.hostPorts.enabled }}
             hostPort: {{ .Values.hostPorts.web | default 7000 }}
             {{- end}}
           - name: api
-            containerPort: {{ .Values.containerPorts.api | default 7001 }}
+            containerPort: {{ .Values.service.ports.api.port | default 7001 }}
             {{- if .Values.hostPorts.enabled }}
             hostPort: {{ .Values.hostPorts.api | default 7001 }}
             {{- end}}
@@ -76,6 +82,9 @@ spec:
             mountPath: "/tmp"
           - name: neuron-logs
             mountPath: "/opt/neuron/logs"
+          - name: neuron-log-conf
+            mountPath: "/opt/neuron/config/zlog.conf"
+            subPath: "zlog.conf"
           {{- if .Values.tls.enabled }}
           - name: certs
             mountPath: "/opt/neuron/config/neuron.pem"
diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index bfc2d153..e9d7c131 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -30,7 +30,7 @@ securityContext: {}
 
 service:
   enabled: true
-  type: NodePort
+  type: LoadBalancer
 
   # -- Service ports
   ports:
@@ -64,9 +64,9 @@ service:
   loadBalancerSourceRanges: []
   # -- Provide any additional annotations which may be required. Evaluated as a template
   annotations:
-    eip.openelb.kubesphere.io/v1alpha2: vip-eip
     lb.kubesphere.io/v1alpha1: openelb
-    protocol.openelb.kubesphere.io/v1alpha1: vip
+    eip.openelb.kubesphere.io/v1alpha2: eip-pool
+    protocol.openelb.kubesphere.io/v1alpha1: layer2
 
 ingress:
   enabled: false
@@ -183,13 +183,6 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 5
 
-# -- Container Ports
-containerPorts:
-  # -- containerPorts.web
-  web: 7000
-  # -- containerPorts.api
-  api: 7001
-
 # -- only for kubeedge deployment
 hostPorts:
   enabled: false

From 10674bd2ffbd06858cd5610112fd52015cbc6a7d Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Tue, 25 Oct 2022 17:15:34 +0800
Subject: [PATCH 07/10] chore: remove neuron package

---
 deploy/charts/neuron-1.0.2.tgz | Bin 6292 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 deploy/charts/neuron-1.0.2.tgz

diff --git a/deploy/charts/neuron-1.0.2.tgz b/deploy/charts/neuron-1.0.2.tgz
deleted file mode 100644
index ec72c6fa792742fa52d2e539791373725e69726e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6292
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
KB9-p|Yybe~5`sej


From 1e2d266434034dcd03ab82ae550247c0fec92f0e Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Wed, 26 Oct 2022 18:48:47 +0800
Subject: [PATCH 08/10] refactor: remove unnecessary pvc

---
 deploy/charts/neuron/conf/zlog.conf            | 12 ------------
 deploy/charts/neuron/templates/configmap.yaml  | 12 ------------
 deploy/charts/neuron/templates/deployment.yaml | 18 ------------------
 deploy/charts/neuron/values.yaml               |  7 -------
 4 files changed, 49 deletions(-)
 delete mode 100644 deploy/charts/neuron/conf/zlog.conf
 delete mode 100644 deploy/charts/neuron/templates/configmap.yaml

diff --git a/deploy/charts/neuron/conf/zlog.conf b/deploy/charts/neuron/conf/zlog.conf
deleted file mode 100644
index e6f2bb37..00000000
--- a/deploy/charts/neuron/conf/zlog.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[global]
-
-reload conf period = 60
-file perms = 666
-
-[formats]
-
-simple = "%d [%V] %f:%L %m%n"
-
-[rules]
-
-*.DEBUG     "./logs/%c.log", 10MB * 3 ~ "./logs/%c.#2s.log"; simple
\ No newline at end of file
diff --git a/deploy/charts/neuron/templates/configmap.yaml b/deploy/charts/neuron/templates/configmap.yaml
deleted file mode 100644
index 16e85b13..00000000
--- a/deploy/charts/neuron/templates/configmap.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "neuron.fullname" . }}-cm-log-conf
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "neuron.labels" . | nindent 4 }}
-binaryData:
-  {{ range $path, $_ := .Files.Glob (printf "conf/zlog.conf")}}
-    {{ $name := base $path }}
-    {{- printf "%s" $name}}{{ print ": "}}{{ $.Files.Get $path | b64enc }}
-  {{ end }}
\ No newline at end of file
diff --git a/deploy/charts/neuron/templates/deployment.yaml b/deploy/charts/neuron/templates/deployment.yaml
index a70d52f5..ab3b211c 100644
--- a/deploy/charts/neuron/templates/deployment.yaml
+++ b/deploy/charts/neuron/templates/deployment.yaml
@@ -30,19 +30,6 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
-        - name: neuron-logs
-          {{- if .Values.logsPVC.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ printf "%s" (tpl (default "" .Values.logsPVC.existingClaim) .) }}
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
-        - name: neuron-log-conf
-          configMap:
-            name: {{ include "neuron.fullname" . }}-cm-log-conf
-            items:
-            - key: zlog.conf
-              path: zlog.conf
         {{- if .Values.tls.enabled }}
         - name: certs
           secret:
@@ -80,11 +67,6 @@ spec:
             mountPath: "/opt/neuron/persistence"
           - name: neuron-tmp
             mountPath: "/tmp"
-          - name: neuron-logs
-            mountPath: "/opt/neuron/logs"
-          - name: neuron-log-conf
-            mountPath: "/opt/neuron/config/zlog.conf"
-            subPath: "zlog.conf"
           {{- if .Values.tls.enabled }}
           - name: certs
             mountPath: "/opt/neuron/config/neuron.pem"
diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index e9d7c131..5459d098 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -98,13 +98,6 @@ nngFromExistingPVC:
   ##
   existingClaim: "pvc-neuron-tmp"
 
-logsPVC:
-  enabled: true
-  ## PVC must be created manually before volume will be bound. The value is evaluated as a template
-  ##
-  existingClaim: "pvc-neuron-logs"
-
-
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

From 4db35b3c32085dddd0656372a9998f47bf6b5563 Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Wed, 26 Oct 2022 19:15:26 +0800
Subject: [PATCH 09/10] chore: update values.yaml and README

---
 deploy/charts/neuron/README.md   | 9 +++------
 deploy/charts/neuron/values.yaml | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/deploy/charts/neuron/README.md b/deploy/charts/neuron/README.md
index 90f62301..47e57832 100644
--- a/deploy/charts/neuron/README.md
+++ b/deploy/charts/neuron/README.md
@@ -1,10 +1,9 @@
 # neuron
 
-![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
+![Version: 1.0.4](https://img.shields.io/badge/Version-1.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
-A Helm chart for Kubernetes
 
 ## Install the Chart
 
@@ -43,10 +42,8 @@ helm uninstall my-neuron
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
-| logsPVC.enabled | bool | `true` |  |
-| logsPVC.existingClaim | string | `"pvc-neuron-logs"` |  |
 | nameOverride | string | `""` |  |
-| nngFromExistingPVC.enabled | bool | `true` |  |
+| nngFromExistingPVC.enabled | bool | `false` |  |
 | nngFromExistingPVC.existingClaim | string | `"pvc-neuron-tmp"` |  |
 | nodeSelector | object | `{}` |  |
 | persistence.enabled | bool | `true` |  |
@@ -65,5 +62,5 @@ helm uninstall my-neuron
 | service.ports.api.port | int | `7001` | Neuron API port |
 | service.ports.web.name | string | `"web"` | Neuron Dashboard port name |
 | service.ports.web.port | int | `7000` | Neuron Dashboard port |
-| service.type | string | `"NodePort"` |  |
+| service.type | string | `"ClusterIP"` |  |
 | tolerations | list | `[]` |  |
\ No newline at end of file
diff --git a/deploy/charts/neuron/values.yaml b/deploy/charts/neuron/values.yaml
index 5459d098..2c0ffb4b 100644
--- a/deploy/charts/neuron/values.yaml
+++ b/deploy/charts/neuron/values.yaml
@@ -30,7 +30,7 @@ securityContext: {}
 
 service:
   enabled: true
-  type: LoadBalancer
+  type: ClusterIP
 
   # -- Service ports
   ports:
@@ -93,7 +93,7 @@ persistence:
   existingClaim: "pvc-neuron-data"
 
 nngFromExistingPVC:
-  enabled: true
+  enabled: false
   ## PVC must be created manually before volume will be bound. The value is evaluated as a template
   ##
   existingClaim: "pvc-neuron-tmp"

From ff7c77da534ca1f64887df6dd07a7170b791dadc Mon Sep 17 00:00:00 2001
From: bin <brian.xb.bian@gmail.com>
Date: Wed, 26 Oct 2022 19:18:20 +0800
Subject: [PATCH 10/10] chore: update version

---
 deploy/charts/neuron/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/charts/neuron/Chart.yaml b/deploy/charts/neuron/Chart.yaml
index 185384eb..f642a24f 100644
--- a/deploy/charts/neuron/Chart.yaml
+++ b/deploy/charts/neuron/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.4
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to