Update: Configure Grafana and ExaMon API services to use NodePort in local, staging, and production environments.

Author: fbeneventi

deploy/helm/examon/charts/examon-server-0.1.0.tgz

@@ -0,0 +1,41 @@
+{{- if .Values.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "examon-server.fullname" . }}
+  labels:
+    {{- include "examon-server.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType | default "Prefix" }}
+            backend:
+              service:
+                name: {{ include "examon-server.fullname" $ }}
+                port:
+                  number: {{ $.Values.service.port }}
+          {{- end }}
+    {{- end }}
+{{- end }}

deploy/helm/examon/charts/kairosdb-0.1.0.tgz

@@ -4,12 +4,19 @@ metadata:
   name: {{ include "examon-server.fullname" . }}
   labels:
     {{- include "examon-server.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
       name: http
+      {{- if and (eq .Values.service.type "NodePort") .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+      {{- end }}
   selector:
     {{- include "examon-server.selectorLabels" . | nindent 4 }}

deploy/helm/examon/charts/mosquitto-0.1.0.tgz

@@ -30,6 +30,13 @@ resources:
     memory: "1Gi"
     cpu: "2"
 
+ingress:
+  enabled: false
+  ingressClassName: ""
+  annotations: {}
+  hosts: []
+  tls: []
+
 nodeSelector: {}
 tolerations: []
 affinity: {}

deploy/helm/examon/charts/mqtt2kairosdb-0.1.0.tgz

@@ -4,6 +4,10 @@ metadata:
   name: {{ include "mosquitto.fullname" . }}
   labels:
     {{- include "mosquitto.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

deploy/helm/examon/charts/random-pub-0.1.0.tgz

@@ -29,6 +29,9 @@ cassandra:
 grafana:
   enabled: true
   adminPassword: "admin"  # dev-only default; override via --set for non-local envs
+  service:
+    type: NodePort
+    nodePort: 3000
   persistence:
     enabled: false
   resources:
@@ -112,6 +115,9 @@ examon-server:
   image:
     repository: examon-registry:5111/examon/examon-server
     tag: "latest"
+  service:
+    type: NodePort
+    nodePort: 5000
   config:
     authUrl: "http://examon-grafana/api/datasources/id/kairosdb"
     cassandraIp: "examon-cassandra-dc1-service"