DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases 1 Wiki Activity

feat(prometheus): remove operator due to move to included manifest (#4378)

Browse Source 
* feat(prometheus): remove operator due to move to included manifest

* whoops

* remove configreloader for now

* Revert "remove configreloader for now"

This reverts commit 7e2f4e405765f97ab509a85d05b117360a3e63cc.

* readd some values.yaml content

* bump major
This commit is contained in:
Kjeld Schouten-Lebbing
2022-11-11 18:32:36 +01:00
committed by GitHub
parent 9559a83515
commit 3f73e7184b
7 changed files with 6 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/stable/prometheus/templates/_helpers.tpl
+1 -1
View File
@@ -128,7 +128,7 @@ Return the proper Prometheus Operator Reloader image name
Return the proper Prometheus Image name
*/}}
{{- define "kube-prometheus.prometheus.image" -}}
{{ printf "%s:%s" .Values.prometheusImage.repository (default .Chart.AppVersion .Values.prometheusImage.tag) | quote }}
{{ printf "%s:%s" .Values.image.repository (default .Chart.AppVersion .Values.image.tag) | quote }}
{{- end -}}
{{/*
charts/stable/prometheus/templates/common.yaml
-5
View File
@@ -1,11 +1,6 @@
{{/* Make sure all variables are set properly */}}
{{- include "tc.common.loader.init" . }}
{{- $newArgs := (include "prometheus.operator.args" . | fromYaml) }}
{{- $_ := set .Values "newArgs" $newArgs -}}
{{- $mergedargs := concat .Values.args .Values.newArgs.args }}
{{- $_ := set .Values "args" $mergedargs -}}
{{- include "prometheus.prometheus.prometheus" . }}
{{- include "prometheus.prometheus.additionalprometheusrules" . }}
{{- include "prometheus.prometheus.additionalscrapejobs" . }}
charts/stable/prometheus/templates/operator/_args.tpl
-31
View File
@@ -1,31 +0,0 @@
{{/* Define the args */}}
{{- define "prometheus.operator.args" -}}
args:
{{- if .Values.operator.kubeletService.enabled }}
- --kubelet-service={{ .Values.operator.kubeletService.namespace }}/{{ template "kube-prometheus.fullname" . }}-kubelet
{{- end }}
{{- if .Values.operator.logFormat }}
- --log-format={{ .Values.operator.logFormat }}
{{- end }}
{{- if .Values.operator.logLevel }}
- --log-level={{ .Values.operator.logLevel }}
{{- end }}
- --localhost=127.0.0.1
- --prometheus-config-reloader=$(PROMETHEUS_CONFIG_RELOADER)
{{- if .Values.operator.configReloaderResources.requests }}
{{- if .Values.operator.configReloaderResources.requests.cpu }}
- --config-reloader-cpu-request={{ .Values.operator.configReloaderResources.requests.cpu }}
{{- end }}
{{- if .Values.operator.configReloaderResources.requests.memory }}
- --config-reloader-memory-request={{ .Values.operator.configReloaderResources.requests.memory }}
{{- end }}
{{- end }}
{{- if .Values.operator.configReloaderResources.limits }}
{{- if .Values.operator.configReloaderResources.limits.cpu }}
- --config-reloader-cpu-limit={{ .Values.operator.configReloaderResources.limits.cpu }}
{{- end }}
{{- if .Values.operator.configReloaderResources.limits.memory }}
- --config-reloader-memory-limit={{ .Values.operator.configReloaderResources.limits.memory }}
{{- end }}
{{- end }}
{{- end -}}
charts/stable/prometheus/templates/operator/configmap.yaml
-9
View File
@@ -1,9 +0,0 @@
{{- if .Values.operator.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: prometheus-operator-config
labels: {{- include "kube-prometheus.operator.labels" . | nindent 4 }}
data:
prometheus-config-reloader: {{ template "kube-prometheus.prometheusConfigReloader.image" . }}
{{- end }}
charts/stable/prometheus/templates/operator/servicemonitor.yaml
-25
View File
@@ -1,25 +0,0 @@
{{- if and .Values.operator.enabled .Values.operator.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "kube-prometheus.operator.fullname" . }}
labels: {{- include "kube-prometheus.operator.labels" . | nindent 4 }}
spec:
endpoints:
- port: http
honorLabels: true
{{- if .Values.operator.serviceMonitor.interval }}
interval: {{ .Values.operator.serviceMonitor.interval }}
{{- end }}
{{- if .Values.operator.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.operator.serviceMonitor.metricRelabelings "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.operator.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.operator.serviceMonitor.relabelings | nindent 8 }}
{{- end }}
selector:
matchLabels: {{- include "kube-prometheus.operator.matchLabels" . | nindent 6 }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
{{- end }}