Add customizable Grafana and Prometheus service object in Helm chart

traefik · Jun 18, 2020 · e59b861 · e59b861
1 parent 2922544
commit e59b861
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/helm/chart/maesh/charts/metrics/templates/grafana.yaml b/helm/chart/maesh/charts/metrics/templates/grafana.yaml
@@ -127,7 +127,7 @@ data:
     - name: prometheus
       type: prometheus
       orgId: 1
-      url: http://prometheus.{{ .Release.Namespace }}.svc.{{ default "cluster.local" .Values.clusterDomain }}:9090
+      url: http://prometheus.{{ .Release.Namespace }}.svc.{{ default "cluster.local" .Values.clusterDomain }}:{{ .Values.prometheus.service.port }}
       isDefault: true
       access: proxy
       jsonData:
@@ -161,9 +161,13 @@ metadata:
     heritage: {{ .Release.Service | quote }}
     component: grafana
 spec:
-  type: NodePort
+  type: {{ .Values.grafana.service.type }}
   ports:
-    - port: 3000
+    - port: {{ .Values.grafana.service.port }}
+      targetPort: web
+      {{- if .Values.grafana.service.nodePort }}
+      nodePort: {{ .Values.grafana.service.nodePort }}
+      {{- end }}
   selector:
     app: grafana
     component: core

diff --git a/helm/chart/maesh/charts/metrics/templates/prometheus.yaml b/helm/chart/maesh/charts/metrics/templates/prometheus.yaml
@@ -183,9 +183,13 @@ metadata:
   annotations:
     prometheus.io/scrape: 'true'
 spec:
-  type: NodePort
+  type: {{ .Values.prometheus.service.type }}
   ports:
-    - port: 9090
+    - port: {{ .Values.prometheus.service.port }}
+      targetPort: webui
+      {{- if .Values.prometheus.service.nodePort }}
+      nodePort: {{ .Values.prometheus.service.nodePort }}
+      {{- end }}
       protocol: TCP
       name: webui
   selector:

diff --git a/helm/chart/maesh/charts/metrics/values.yaml b/helm/chart/maesh/charts/metrics/values.yaml
@@ -4,6 +4,15 @@ image:
   configmapReload: jimmidyson/configmap-reload:v0.2.2
 
 grafana:
+  service:
+    type: ClusterIP
+    port: 3000
+
+    ## Specify the nodePort value for the NodePort service types.
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#nodeport
+    ##
+    # nodePort: 30030
+
   ## storageClassName: "" disables dynamic provisioning
   ## if undefined or null, no storageClassName spec is
   ##   set, choosing the default provisioner
@@ -18,6 +27,15 @@ grafana:
   #     cpu: "100m"
 
 prometheus:
+  service:
+    type: ClusterIP
+    port: 9090
+
+    ## Specify the nodePort value for the NodePort service types.
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#nodeport
+    ##
+    # nodePort: 30090
+
   ## storageClassName: "" disables dynamic provisioning
   ## if undefined or null, no storageClassName spec is
   ##   set, choosing the default provisioner