Merge branch 'helm-standards' into 'main'

fixed monitoring standards See merge request !14

Merge branch 'helm-standards' into 'main'
fixed monitoring standards See merge request !14
b5920ac1 · runyontr · 920f08be · 6f03389f · b5920ac1 · b5920ac1
Commit b5920ac1 authored Mar 19, 2021 by runyontr
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

chart/Chart.yaml chart/Chart.yaml +1 -1

chart/templates/servicemonitor.yaml chart/templates/servicemonitor.yaml +1 -1

chart/values.yaml chart/values.yaml +3 -4

No files found.
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
 apiVersion: v2
 name: twistlock
-version: 0.0.3-bb.0
+version: 0.0.3-bb.1
 appVersion: 20.12.531
--- a/chart/templates/servicemonitor.yaml
+++ b/chart/templates/servicemonitor.yaml
-{{- if .Values.prometheus.servicemonitor.enabled }}
+{{- if .Values.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

--- a/chart/values.yaml
+++ b/chart/values.yaml
 hostname: bigbang.dev
-prometheus:
-  servicemonitor:
-    enabled: false

-hostname: bigbang.dev
+monitoring:
+  enabled: false
+
 istio:
  # Toggle istio integration
  enabled: false