update values.yaml image parameter and docs

deployment/helm/README.md

@@ -46,21 +46,18 @@ $ helm uninstall my-studio
 
 | Parameter | Description | Default |
 |-----------|-------------|---------|
-| replicaCount  | Replica Count for StatefulSet  | 0  |
-| image.httpGateway.repository  |  The repository for http gateway's image  | vesoft/nebula-http-gateway  |
-| image.nebulaImporter.repository  |  The repository for nebula-importer gateway's image  | vesoft/nebula-importer  |
-| image.nebulaStudio.repository  |  The repository for nebula graph studio's image  | vesoft/nebula-graph-studio |
-| image.nginx.repository  |  The repository for nginx's image  | nginx  |
-| image.httpGateway.tag  |  The tag for http grateway's image  | v2  |
-| image.nebulaImporter.tag  |  The tag for nebula-importer ateway's image  | v2  |
-| image.nebulaStudio.tag  |  The tag for nebula graph studio's image  | v3  |
-| image.nginx.tag  |  The tag for nginx's image  | alpine  |
+| replicaCount  | Replicas for Deployment  | 0  |
+| image.httpGateway.name  |  The image name of nebula-http-gateway  | vesoft/nebula-http-gateway  |
+| image.nebulaStudio.name  |  The image name of nebula-graph-studio  | vesoft/nebula-graph-studio |
+| image.nginx.name  |  The image name of nginx  | nginx  |
+| image.httpGateway.version  |  The image version nebula-http-gateway  | v2.1.0  |
+| image.nebulaStudio.version  |  The image version nebula-graph-studio  | v3.1.0  |
+| image.nginx.version  |  The image version of nginx  | alpine  |
 | service.type  | The service type, should be one of ['NodePort', 'ClusterIP', 'LoadBalancer'] |  ClusterIP  |
 | service.port  | The expose port for nebula-graph-studio's web |  7001  |
-| resources.httpGateway  | The resource limits/requests for http gateway | {}  |
-| resources.nebulaImporter  | The resource limits/requests for nebular importer | {}  |
-| resources.nebulaStudio  | The resource limits/requests for nebula studio | {}  |
+| resources.httpGateway  | The resource limits/requests for nebula-http-gateway | {}  |
+| resources.nebulaStudio  | The resource limits/requests for nebula-studio | {}  |
 | resources.nginx  | The resource limits/requests for nginx | {}  |
 | persistent.storageClassName  | The storageClassName for PVC if not using default  | ""  |
-| persistent.size  | The size for upload-data persistent storage | 5Gi  |
+| persistent.size  | The persistent volume size | 5Gi  |
 

deployment/helm/templates/configmap.yaml

@@ -26,8 +26,4 @@ data:
       location ~ ^/api-nebula/([A-Za-z0-9\/]+) {
         proxy_pass http://127.0.0.1:8080/api/$1;
       }
-
-      location ~ ^/api-import/([A-Za-z0-9\/]+) {
-        proxy_pass http://127.0.0.1:5699/$1;
-      }
     }

deployment/helm/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
       {{- end }}
       containers:
         - name: http-gateway
-          image: "{{ .Values.image.httpGateway.repository }}:{{ .Values.image.httpGateway.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.httpGateway.name }}:{{ .Values.image.httpGateway.version }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: USER
@@ -42,31 +42,8 @@ spec:
               port: 8080
           resources:
             {{- toYaml .Values.resources.httpGateway | nindent 12 }}
-        - name: nebula-importer
-          image: "{{ .Values.image.nebulaImporter.repository }}:{{ .Values.image.nebulaImporter.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - containerPort: 5699
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /tasks
-              port: 5699
-          readinessProbe:
-            httpGet:
-              path: /tasks
-              port: 5699
-          resources:
-            {{- toYaml .Values.resources.nebulaImporter | nindent 12 }}
-          command:
-            - nebula-importer
-            - "--port=5699"
-            - "--callback=http://127.0.0.1:7000/api/import/finish"
-          volumeMounts:
-            - name: upload-data
-              mountPath: /uploads
         - name: nebula-studio
-          image: "{{ .Values.image.nebulaStudio.repository }}:{{ .Values.image.nebulaStudio.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.nebulaStudio.name }}:{{ .Values.image.nebulaStudio.version }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: UPLOAD_DIR
@@ -95,7 +72,7 @@ spec:
             - name: upload-data
               mountPath: /uploads
         - name: nginx
-          image: "{{ .Values.image.nginx.repository }}:{{ .Values.image.nginx.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.nginx.name }}:{{ .Values.image.nginx.version }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 7000

deployment/helm/values.yaml

@@ -1,20 +1,16 @@
-
 replicaCount: 1
 
 image:
   pullPolicy: IfNotPresent
   httpGateway:
-    repository: vesoft/nebula-http-gateway
-    tag: v2
-  nebulaImporter:
-    repository: vesoft/nebula-importer
-    tag: v2
+    name: vesoft/nebula-http-gateway
+    version: v2.1.0
   nebulaStudio:
-    repository: vesoft/nebula-graph-studio
-    tag: v3
+    name: vesoft/nebula-graph-studio
+    version: v3.1.0
   nginx:
-    repository: nginx
-    tag: alpine
+    name: nginx
+    version: alpine
 
 imagePullSecrets: []
 
@@ -27,14 +23,14 @@ service:
 
 resources:
   httpGateway:
-  nebulaImporter:
   nebulaStudio:
   nginx:
 
 persistent:
   storageClassName: ""
   size: 5Gi
 
+podAnnotations: {}
 
 nodeSelector: {}