[AAI] Add options for remote debugging and profiling

[oom.git] / kubernetes / aai / components / aai-resources / templates / deployment.yaml

diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 724cb2d..54097fa 100644 (file)
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -27,9 +27,9 @@ metadata:
     app: {{ include "common.name" . }}
     app.kubernetes.io/name: {{ include "common.name" . }}
     {{- if .Chart.AppVersion }}
-    version: {{ .Chart.AppVersion | replace "+" "_" }}
+    version: "{{ .Chart.AppVersion | replace "+" "_" }}"
     {{- else }}
-    version: {{ .Chart.Version | replace "+" "_" }}
+    version: "{{ .Chart.Version | replace "+" "_" }}"
     {{- end }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" . }}
@@ -52,9 +52,9 @@ spec:
         release: {{ include "common.release" . }}
         app.kubernetes.io/name: {{ include "common.name" . }}
         {{- if .Chart.AppVersion }}
-        version: {{ .Chart.AppVersion | replace "+" "_" }}
+        version: "{{ .Chart.AppVersion | replace "+" "_" }}"
         {{- else }}
-        version: {{ .Chart.Version | replace "+" "_" }}
+        version: "{{ .Chart.Version | replace "+" "_" }}"
         {{- end }}
       name: {{ include "common.name" . }}
       annotations:
@@ -105,7 +105,7 @@ spec:
         - --job-name
         - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
           {{- else }}
-        - --container-name
+        - --app-name
             {{- if .Values.global.cassandra.localCluster }}
         - aai-cassandra
             {{- else }}
@@ -135,6 +135,20 @@ spec:
           echo "*** actual launch of AAI Resources"
           /bin/bash /opt/app/aai-resources/docker-entrypoint.sh
         env:
+        {{- if .Values.config.env }}
+        {{- range $key,$value := .Values.config.env }}
+        - name: {{ $key | upper | quote}}
+          value: {{ $value | quote}}
+        {{- end }}
+        {{- end }}
+        {{- if .Values.config.profiling.enabled }}
+        - name: PRE_JVM_ARGS
+          value: '{{ join " " .Values.config.profiling.args }}'
+        {{- end }}
+        {{- if .Values.config.debug.enabled }}
+        - name: POST_JVM_ARGS
+          value: {{ .Values.config.debug.args | quote }}
+        {{- end }}
         - name: LOCAL_USER_ID
           value: {{ .Values.global.config.userId | quote }}
         - name: LOCAL_GROUP_ID
@@ -178,10 +192,17 @@ spec:
         ports:
         - containerPort: {{ .Values.service.internalPort }}
           name: {{ .Values.service.portName }}
+        {{- if .Values.config.debug.enabled }}
         - containerPort: {{ .Values.service.internalPort2 }}
           name: {{ .Values.service.portName2 }}
+        {{- end }}
         - containerPort: {{ .Values.service.internalPort3 }}
           name: {{ .Values.service.portName3 }}
+        {{- if .Values.config.profiling.enabled }}
+        - containerPort: {{ .Values.service.internalPort4 }}
+          name: {{ .Values.service.portName4 }}
+        {{- end }}
+
         lifecycle:
           # wait for active requests (long-running tasks) to be finished
           # Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.