feat: add prometheus cluster into addons (#3869)

Co-authored-by: runsun <wuxia.sr@apecloud.com>
Co-authored-by: huangzhangshu <huangzhangshu@apecloud.com>

.github/workflows/cicd-pull-request.yml

@@ -131,6 +131,6 @@ jobs:
       VERSION: "v0.4.0-check"
       CHART_NAME: "kubeblocks"
       CHART_DIR: "deploy/helm"
-      DEP_REPO: "delphic"
+      DEP_REPO: "delphic|prometheus-cluster"
       APECD_REF: "v0.1.4"
     secrets: inherit

.github/workflows/cicd-push.yml

@@ -222,7 +222,7 @@ jobs:
       VERSION: "v0.4.0-check"
       CHART_NAME: "kubeblocks"
       CHART_DIR: "deploy/helm"
-      DEP_REPO: "delphic"
+      DEP_REPO: "delphic|prometheus-cluster"
       APECD_REF: "v0.1.4"
     secrets: inherit
 

.github/workflows/release-helm-chart.yml

@@ -33,15 +33,15 @@ jobs:
 
   release-chart:
     needs: chart-version
-    uses: apecloud/apecloud-cd/.github/workflows/release-charts.yml@v0.1.0
+    uses: apecloud/apecloud-cd/.github/workflows/release-charts.yml@v0.1.4
     with:
       MAKE_OPS: "bump-chart-ver"
       VERSION: "${{ needs.chart-version.outputs.chart-version }}"
       CHART_NAME: "kubeblocks"
       CHART_DIR: "deploy/helm"
       DEP_CHART_DIR: "deploy/helm/depend-charts"
-      DEP_REPO: "helm dep update deploy/delphic"
-      APECD_REF: "v0.1.0"
+      DEP_REPO: "delphic|prometheus-cluster"
+      APECD_REF: "v0.1.4"
     secrets: inherit
 
   send-message:

.gitignore

@@ -63,4 +63,5 @@ tmp/
 
 
 # helm dependency charts
+deploy/**/Chart.lock
 deploy/**/charts

deploy/helm/templates/addons/prometheus-addon.yaml

@@ -15,16 +15,17 @@ spec:
 
   helm:
     {{- if hasPrefix "oci://" .Values.addonChartLocationBase }}
-    chartLocationURL: {{ .Values.addonChartLocationBase }}/prometheus
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/prometheus-cluster
     {{- else }}
-    chartLocationURL: {{ .Values.addonChartLocationBase }}/prometheus-15.16.1.tgz
+    chartLocationURL: {{ .Values.addonChartLocationBase }}/prometheus-cluster-{{ default .Chart.Version .Values.versionOverride }}.tgz
     {{- end }}
 
     installOptions:
       {{- if hasPrefix "oci://" .Values.addonChartLocationBase }}
-      version: 15.16.1
+      version: {{ default .Chart.Version .Values.versionOverride }}
       {{- end }}
 
+
     installValues:
       configMapRefs:
         - name: {{ include "addon.prometheus.name" . }}-chart-kubeblocks-values
@@ -33,14 +34,14 @@ spec:
     valuesMapping:
       valueMap:
         replicaCount: server.replicaCount
-        storageClass: server.persistentVolume.storageClass
-        persistentVolumeEnabled: server.persistentVolume.enabled
+        storageClass: server.persistence.storageClass
+        persistentVolumeEnabled: server.persistence.enabled
 
       jsonMap:
-        tolerations: server.tolerations
+        tolerations: tolerations
 
       resources:
-        storage: server.persistentVolume.size
+        storage: server.persistence.size
         cpu:
           requests: server.resources.requests.cpu
           limits: server.resources.limits.cpu
@@ -51,14 +52,14 @@ spec:
         - name: alertmanager
           valueMap:
             replicaCount: alertmanager.replicaCount
-            storageClass: alertmanager.persistentVolume.storageClass
-            persistentVolumeEnabled: alertmanager.persistentVolume.enabled
+            storageClass: alertmanager.persistence.storageClass
+            persistentVolumeEnabled: alertmanager.persistence.enabled
 
           jsonMap:
-            tolerations: alertmanager.tolerations
+            tolerations: tolerations
 
           resources:
-            storage: alertmanager.persistentVolume.size
+            storage: alertmanager.persistence.size
             cpu:
               requests: alertmanager.resources.requests.cpu
               limits: alertmanager.resources.limits.cpu
@@ -143,4 +144,4 @@ spec:
           {{- end }}
 
   installable:
-    autoInstall: {{ .Values.prometheus.enabled }}
+    autoInstall: {{ .Values.prometheus.enabled }}

deploy/helm/templates/grafana/configmaps-datasources.yaml

@@ -16,15 +16,15 @@ data:
   datasource.yaml: |-
     apiVersion: 1
     datasources:
-{{- $scrapeInterval := default .Values.prometheus.server.global.scrape_interval | default "30s" }}
+{{- $scrapeInterval := default .Values.prometheus.prometheus.server.global.scrape_interval | default "30s" }}
 {{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }}
     - name: Prometheus
       type: prometheus
       uid: {{ .Values.grafana.sidecar.datasources.uid }}
       {{- if .Values.grafana.sidecar.datasources.url }}
       url: {{ .Values.grafana.sidecar.datasources.url }}
       {{- else }}
-      url: http://kb-addon-{{ include "addon.prometheus.name" . }}-server.{{ template "kubeblocks.namespace" . }}:80/
+      url: http://kb-addon-{{ include "addon.prometheus.name" . }}-{{ .Values.prometheus.nameOverride }}-server.{{ template "kubeblocks.namespace" . }}:80/
       {{- end }}
       access: proxy
       isDefault: true
@@ -36,7 +36,7 @@ data:
       {{- if .Values.grafana.sidecar.datasources.url }}
       url: {{ .Values.grafana.sidecar.datasources.url }}
       {{- else }}
-      url: http://kb-addon-{{ include "addon.prometheus.name" . }}-server.{{ template "kubeblocks.namespace" . }}:80/
+      url: http://kb-addon-{{ include "addon.prometheus.name" . }}-{{ .Values.prometheus.nameOverride }}-server.{{ template "kubeblocks.namespace" . }}:80/
       {{- end }}
       access: proxy
       isDefault: false

deploy/helm/templates/prometheus/alertmanager.yaml

@@ -1,10 +1,10 @@
-{{- if not (empty .Values.prometheus.alertmanager.configMapOverrideName) }}
+{{- if not (empty .Values.prometheus.prometheus.alertmanager.configMapOverrideName) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
     {{- include "kubeblocks.labels" . | nindent 4 }}
-  name: kb-addon-{{ include "addon.prometheus.name" . }}-{{ .Values.prometheus.alertmanager.configMapOverrideName }}
+  name: kb-addon-{{ include "addon.prometheus.name" . }}-{{ .Values.prometheus.prometheus.alertmanager.configMapOverrideName }}
 data:
   alertmanager.yml: |
     global: { }