Parameterize ramFraction

onyx-platform · Nov 11, 2017 · 0f78c9f · 0f78c9f
1 parent 67fd92b
commit 0f78c9f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/charts/zookeeper/Chart.yaml b/charts/zookeeper/Chart.yaml
@@ -9,4 +9,4 @@ name: zookeeper
 sources:
 - https://github.com/apache/zookeeper
 - https://github.com/kubernetes/contrib/tree/master/statefulset/zookeeper
-version: 0.2.5
+version: 0.2.6
diff --git a/charts/zookeeper/templates/ss.yaml b/charts/zookeeper/templates/ss.yaml
@@ -112,7 +112,7 @@ spec:
         - name: ZK_ELECTION_PORT
           value: "{{.Values.LeaderElectionPort}}"
         - name: SERVER_JVMFLAGS
-          value: "-server -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XshowSettings:vm -XX:MaxRAMFraction=1"
+          value: "-server -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XshowSettings:vm -XX:MaxRAMFraction={{ .Values.ramFraction }}"
         command:
         - sh
         - -c

diff --git a/charts/zookeeper/values.yaml b/charts/zookeeper/values.yaml
@@ -3,7 +3,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 Image: onyxplatform/k8szk
-Tag: 20
+Tag: 21
 Servers: 3
 Cpu: "100m"
 Memory: "512Mi"
@@ -14,6 +14,7 @@ resources:
   limits:
     memory: 512Mi
     cpu: 100m
+ramFraction: 2
 Storage: "50Gi"
 StorageClass : default
 ServerPort: 2888

diff --git a/images/zookeeper/zkGenConfig.sh b/images/zookeeper/zkGenConfig.sh
@@ -144,7 +144,7 @@ function create_java_env() {
     rm -f $JAVA_ENV_FILE
     echo "Creating JVM configuration file"
     echo "ZOO_LOG_DIR=$ZK_LOG_DIR" >> $JAVA_ENV_FILE
-    echo "JVMFLAGS=\"-XshowSettings:vm -XX:MaxRAMFraction=1 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap\"" >> $JAVA_ENV_FILE
+    echo "JVMFLAGS=\"-XshowSettings:vm -XX:MaxRAMFraction=2 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap\"" >> $JAVA_ENV_FILE
     echo "Wrote JVM configuration to $JAVA_ENV_FILE"
 }