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

* 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

charts/stable/prometheus/Chart.yaml

@@ -29,7 +29,7 @@ sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 5.0.2
+version: 6.0.0
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/stable/prometheus/templates/_helpers.tpl

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 }}

charts/stable/prometheus/values.yaml

@@ -1,8 +1,4 @@
 image:
-  repository: tccr.io/truecharts/prometheus-operator
-  tag: 0.60.1@sha256:6e54f352e82c827ea14dd94dc2afa28433d3ba5275b6b90ffdc8a96ccd6c6b4f
-
-prometheusImage:
   repository: tccr.io/truecharts/prometheus
   tag: 2.40.1@sha256:157d18ec7bc21ca7cfff98fef241385c15ede781def81b4afcc376cda7df7539
 
@@ -17,6 +13,9 @@ alertmanagerImage:
 global:
   labels: {}
 
+controller:
+  enabled: false
+
 service:
   main:
     selector:
@@ -27,14 +26,6 @@ service:
         port: 10086
         targetPort: 9090
         protocol: HTTP
-  promop:
-    enabled: true
-    ports:
-      promop:
-        enabled: true
-        port: 10089
-        targetPort: 8080
-        protocol: HTTP
   alertmanager:
     enabled: true
     selector:
@@ -213,13 +204,12 @@ probes:
         scheme: HTTP
 
 operator:
-  enabled: true
   ## Create a servicemonitor for the operator
   ##
   serviceMonitor:
     ## @param operator.serviceMonitor.enabled Creates a ServiceMonitor to monitor Prometheus Operator
     ##
-    enabled: true
+    enabled: false
     ## @param operator.serviceMonitor.interval Scrape interval (use by default, falling back to Prometheus' default)
     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint
     ##
@@ -233,21 +223,6 @@ operator:
     ##
     relabelings: []
 
-  ## @param operator.logLevel Log level for Prometheus Operator
-  ##
-  logLevel: info
-  ## @param operator.logFormat Log format for Prometheus Operator
-  ##
-  logFormat: logfmt
-
-  configReloaderResources: {}
-  ## @param operator.kubeletService.enabled If true, the operator will create and maintain a service for scraping kubelets
-  ## @param operator.kubeletService.namespace Namespace to deploy the kubelet service
-  ##
-  kubeletService:
-    enabled: true
-    namespace: kube-system
-
   ## Prometheus Configmap-reload image to use for reloading configmaps
   ## defaults to Bitnami Prometheus Operator (ref: https://hub.docker.com/r/tccr.io/truecharts/prometheus-operator/tags/)
   ##