allow server side script list

orientechnologies · Sep 3, 2020 · 4a2a9cb · 4a2a9cb
1 parent bf04566
commit 4a2a9cb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -3,4 +3,12 @@ Helm chart for OrientDB
 
 To install, make sure the Kubernetes namespace mentioned in `values.yaml` exists and then issue:
 
-`helm install helmReleaseName pathToOrientdbHelmChart --set image.repository=pxsalehi/orientdb --set image.tag=3.1.2 --set servers=numberOfServers`
+```
+helm install helmReleaseName path/to/Orientdb/chart --set image.repository=pxsalehi/orientdb --set image.tag=3.1.2 --set servers=numberOfServers
+```
+
+You can scale up/down the OrientDB cluster using `upgeade`:
+```
+helm upgrade helmReleaseName path/to/Orientdb/chart --set image.repository=pxsalehi/orientdb --set image.tag=3.1.2 --set servers=differentNumberOfServers
+```
+
diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -41,8 +41,8 @@ data:
     		<port auto-increment="false">{{ .Values.hazelcast.network.port }}</port>
     		<join>
     			<kubernetes enabled="true">
-                   <pod-label-name>{{ .Values.hazelcast.discoverypodLabel.name }}</pod-label-name>
-                   <pod-label-value>{{ .Values.hazelcast.discoverypodLabel.value }}</pod-label-value>
+                   <pod-label-name>{{ .Values.hazelcast.discovery.podLabel.name }}</pod-label-name>
+                   <pod-label-value>{{ .Values.hazelcast.discovery.podLabel.value }}</pod-label-value>
                    <service-port>{{ .Values.hazelcast.network.port }}</service-port>
                    <namespace>{{ .Values.namespace }}</namespace>
                 </kubernetes>
@@ -107,8 +107,8 @@ data:
             <handler
                     class="com.orientechnologies.orient.server.handler.OServerSideScriptInterpreter">
                 <parameters>
-                    <parameter name="enabled" value="true"/>
-                    <parameter name="allowedLanguages" value="SQL"/>
+                    <parameter name="enabled" value="{{ .Values.serverSideScript.enabled }}"/>
+                    <parameter name="allowedLanguages" value="{{ join "," .Values.serverSideScript.allowedLanguages }}"/>
                     <!--  Comma separated packages  allowed in JS scripts eg. java.math.*, java.util.ArrayList -->
                     <parameter name="allowedPackages" value=""/>
                 </parameters>

diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml
@@ -35,7 +35,7 @@ spec:
     metadata:
       labels:
         app: {{ .Values.labelValue }}
-        {{ .Values.hazelcast.discoverypodLabel.name }}: {{ .Values.hazelcast.discoverypodLabel.value | quote }}
+        {{ .Values.hazelcast.discovery.podLabel.name }}: {{ .Values.hazelcast.discovery.podLabel.value | quote }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount.name }}
       terminationGracePeriodSeconds: 30

diff --git a/values.yaml b/values.yaml
@@ -27,7 +27,7 @@ log:
 
 image:
   repository: orientdb
-  tag: 3.1.1
+  tag: 3.1.3
   pullPolicy: IfNotPresent
 
 customSqlFunctions:
@@ -36,6 +36,11 @@ customSqlFunctions:
 automaticBackup:
   enabled: false
 
+serverSideScript:
+  enabled: true
+  allowedLanguages:
+    - SQL
+
 hazelcast:
   network:
     port: 2434