Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/helm-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,10 @@ jobs:
run: |
helm template ${{ matrix.chart }} deploy/helm/${{ matrix.chart }} --set image.tag=test \
| kubeconform -strict -summary -kubernetes-version "$KUBERNETES_VERSION"

- name: Validate the ServiceMonitor renders (operator CRD skipped)
run: |
rendered=$(helm template ${{ matrix.chart }} deploy/helm/${{ matrix.chart }} \
--set image.tag=test --set serviceMonitor.enabled=true)
echo "$rendered" | grep -q 'kind: ServiceMonitor'
echo "$rendered" | kubeconform -strict -summary -skip ServiceMonitor -kubernetes-version "$KUBERNETES_VERSION"
16 changes: 16 additions & 0 deletions deploy/helm/ledger/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "ledger.fullname" . }}
labels:
{{- include "ledger.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
{{- include "ledger.selectorLabels" . | nindent 6 }}
endpoints:
- port: http
path: {{ .Values.serviceMonitor.path }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
6 changes: 6 additions & 0 deletions deploy/helm/ledger/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ service:
type: ClusterIP
port: 8080

# Prometheus Operator ServiceMonitor. Off by default; enable on a cluster running the operator.
serviceMonitor:
enabled: false
interval: 30s
path: /actuator/prometheus

resources:
requests:
cpu: 250m
Expand Down
16 changes: 16 additions & 0 deletions deploy/helm/payments/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{- if .Values.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "payments.fullname" . }}
labels:
{{- include "payments.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
{{- include "payments.selectorLabels" . | nindent 6 }}
endpoints:
- port: http
path: {{ .Values.serviceMonitor.path }}
interval: {{ .Values.serviceMonitor.interval }}
{{- end }}
6 changes: 6 additions & 0 deletions deploy/helm/payments/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ service:
type: ClusterIP
port: 8080

# Prometheus Operator ServiceMonitor. Off by default; enable on a cluster running the operator.
serviceMonitor:
enabled: false
interval: 30s
path: /actuator/prometheus

resources:
requests:
cpu: 250m
Expand Down
Loading