minor helm chaart improvements

Signed-off-by: Pranav Bansal <[email protected]>
zapier · Sep 21, 2024 · 6b2dd23 · 6b2dd23
1 parent 1d246ea
commit 6b2dd23
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1 deletion.
diff --git a/charts/prom-aggregation-gateway/Chart.yaml b/charts/prom-aggregation-gateway/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: prom-aggregation-gateway
-version: 0.6.1
+version: 0.6.2
 home: https://github.com/zapier/prom-aggregation-gateway
 maintainers:
   - name: djeebus

diff --git a/charts/prom-aggregation-gateway/templates/_helpers.tpl b/charts/prom-aggregation-gateway/templates/_helpers.tpl
@@ -2,6 +2,10 @@
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{- define "prom-aggregation-gateway.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride }}
+{{- end }}
+
 {{- define "prom-aggregation-gateway.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end -}}

diff --git a/charts/prom-aggregation-gateway/templates/controller.yaml b/charts/prom-aggregation-gateway/templates/controller.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: {{ .Values.controller.type }}
 metadata:
   name: {{ .Release.Name }}
+  namespace: {{ template "prometheus-pushgateway.namespace" . }}
   labels:
     {{- include "prom-aggregation-gateway.labels" . | nindent 4 }}
     {{- if .Values.controller.labels }}

diff --git a/charts/prom-aggregation-gateway/templates/podmonitor.yaml b/charts/prom-aggregation-gateway/templates/podmonitor.yaml
@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ .Release.Name }}-metrics
+  namespace: {{ template "prometheus-pushgateway.namespace" . }}
 {{- with .Values.podMonitor.additionalLabels }}
   labels:
 {{- toYaml . | nindent 4 }}

diff --git a/charts/prom-aggregation-gateway/templates/service.yaml b/charts/prom-aggregation-gateway/templates/service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}
+  namespace: {{ template "prometheus-pushgateway.namespace" . }}
   labels:
     {{- include "prom-aggregation-gateway.selectorLabels" . | nindent 4 }}
   {{- with .Values.service.annotations }}

diff --git a/charts/prom-aggregation-gateway/templates/servicemonitor.yaml b/charts/prom-aggregation-gateway/templates/servicemonitor.yaml
@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Release.Name }}
+  namespace: {{ template "prometheus-pushgateway.namespace" . }}
 {{- with .Values.serviceMonitor.additionalLabels }}
   labels:
 {{- toYaml . | nindent 4 }}

diff --git a/charts/prom-aggregation-gateway/values.schema.json b/charts/prom-aggregation-gateway/values.schema.json
@@ -64,6 +64,9 @@
     "nameOverride": {
       "type": "string"
     },
+    "namespaceOverride": {
+      "type": "string"
+    },
     "service": {
       "type": "object",
       "additionalProperties": false,