From 900343f8527d307878c252397342dca2b07ffd2d Mon Sep 17 00:00:00 2001
From: "Dejaeger, Darren (dd118r)" <dd118r@us.att.com>
Date: Wed, 1 Aug 2018 00:50:11 -0400
Subject: [PATCH] Artifactory performance tuning adjustments

This PS adds Artifactory JVM memory tuning & pod resource limit
adjustments.

Change-Id: I47f535029dadc7b7dfe18c1598630bf5e1219e9f
---
 artifactory/templates/service.yaml     |  2 +-
 artifactory/templates/statefulset.yaml |  2 ++
 artifactory/values.yaml                | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/artifactory/templates/service.yaml b/artifactory/templates/service.yaml
index 47340b01..ada50c89 100644
--- a/artifactory/templates/service.yaml
+++ b/artifactory/templates/service.yaml
@@ -53,4 +53,4 @@ spec:
   type: ClusterIP
 {{ end }}
 
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/artifactory/templates/statefulset.yaml b/artifactory/templates/statefulset.yaml
index 9b213810..f66a0443 100644
--- a/artifactory/templates/statefulset.yaml
+++ b/artifactory/templates/statefulset.yaml
@@ -54,6 +54,8 @@ spec:
                 key: DB_PASSWORD
           - name: DB_HOST
             value: {{ .Values.endpoints.oslo_db.hosts.default }}
+          - name: EXTRA_JAVA_OPTIONS
+            value: {{ .Values.conf.artifactory.env.java_opts }}
 {{ if .Values.bootstrap.master_key }}
           - name: ARTIFACTORY_MASTER_KEY
             value: {{ .Values.bootstrap.master_key }}
diff --git a/artifactory/values.yaml b/artifactory/values.yaml
index 210bd46e..c24c54dc 100644
--- a/artifactory/values.yaml
+++ b/artifactory/values.yaml
@@ -90,6 +90,13 @@ chown_on_start: true
 pod:
   resources:
     enabled: false
+    artifactory:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "2048Mi"
+        cpu: "2000m"
     jobs:
       db_init:
         requests:
@@ -153,6 +160,11 @@ endpoints:
     hosts:
       default: artifactory
 
+conf:
+  artifactory:
+    env:
+      java_opts: "-Xms512m -Xmx2g"
+
 manifests:
   configmap_bin: true
   configmap_etc: true