Merge pull request #115 from mobasherul/tmcservicemonitor

Support for openshift

Author: mathieucarbou

terracottabigmemorymax/helm/templates/server-configmap.yaml

@@ -41,7 +41,7 @@ data:
         <mirror-group>
     {{- range $j := until (int $.Values.terracotta.nodeCountPerStripe) }}
           <server host="terracotta-{{ add (mul $i $.Values.terracotta.nodeCountPerStripe) $j }}.terracotta-service.{{ $.Release.Namespace }}.svc.cluster.local"
-                  name="terracotta-{{ add (mul $i $.Values.terracotta.nodeCountPerStripe) $j }}.terracotta-service.{{ $.Release.Namespace }}.svc.cluster.local">
+                  name="terracotta-{{ add (mul $i $.Values.terracotta.nodeCountPerStripe) $j }}">
             <tsa-port>{{ $.Values.terracotta.tsaPort }} </tsa-port>
             <tsa-group-port>{{ $.Values.terracotta.tsaGroupPort }}</tsa-group-port>
             <management-port>{{ $.Values.terracotta.tsaManagementPort }}</management-port>

terracottabigmemorymax/helm/templates/tc-server-statefulset.yaml

@@ -44,6 +44,9 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
+      {{- if .Values.terracotta.serviceAccountName }}
+      serviceAccount: {{ .Values.terracotta.serviceAccountName }}
+     {{- end }}
       containers:
         - name: server
           image: "{{ $.Values.registry }}/{{ $.Values.serverImage }}:{{ $.Values.tag | default .Chart.AppVersion }}"

terracottabigmemorymax/helm/templates/tmc-statefulset.yaml

@@ -46,6 +46,9 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
+      {{- if .Values.terracotta.serviceAccountName }}
+      serviceAccount: {{ .Values.terracotta.serviceAccountName }}
+      {{- end }}
       containers:
         - name: tmc-server
           image: "{{ $.Values.registry }}/{{ $.Values.tmcImage }}:{{ $.Values.tag | default .Chart.AppVersion }}"

terracottabigmemorymax/helm/values.yaml

@@ -76,6 +76,8 @@ terracotta:
   tmcOpts: ""
   # -- The license content for the Terracotta cluster. Optional.
   license: ""
+  # -- ServiceAccountName for the terracotta related pods
+  serviceAccountName: ""
 
 # -- TSA container-specific configurations for probes
 tsaServer: