Merge pull request #494 from frezes/feat/updateCharts

update charts
WizTelemetry · Mar 12, 2024 · f983ab2 · f983ab2
2 parents 4308775 + b6dbe80
commit f983ab2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/charts/whizard/Chart.yaml b/charts/whizard/Chart.yaml
@@ -14,5 +14,5 @@ maintainers:
     email: [email protected]
   - name: junot
     email: [email protected]
-version: 0.10.13
+version: 0.10.14
 appVersion: "latest"
diff --git a/charts/whizard/templates/hook.yaml b/charts/whizard/templates/hook.yaml
@@ -83,4 +83,5 @@ spec:
                 kubectl delete rulers.monitoring.whizard.io -n {{ include "whizard.namespace" . }} --all
                 kubectl delete stores.monitoring.whizard.io -n {{ include "whizard.namespace" . }} --all
                 kubectl delete compactors.monitoring.whizard.io -n {{ include "whizard.namespace" . }} --all
+                kubectl delete storages.monitoring.whizard.io -n {{ include "whizard.namespace" . }} --all
 {{- end }}
diff --git a/charts/whizard/templates/serviceMonitor.yaml b/charts/whizard/templates/serviceMonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.monitoring.enabled -}}
+{{- if and (.Values.selfMonitor.enabled) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") -}}
 {{- $components := tuple "compactor" "query" "ingester" "store" "ruler" "router" }}
 {{- range $index, $component := $components }}
 ---

diff --git a/charts/whizard/values.yaml b/charts/whizard/values.yaml
@@ -32,14 +32,14 @@ hook:
     pullPolicy: IfNotPresent
   resources:
     limits:
-      cpu: 100m
-      memory: 128Mi
+      cpu: 500m
+      memory: 512Mi
     requests:
       cpu: 50m
       memory: 64Mi
   backoffLimit: 3
 
-monitoring:
+selfMonitor:
   enabled: false
 
 ## Manages Service, Query, QueryFrontend, Router, Ingester, Store, Compactor and Ruler instances and components