From 5940d7295fff3befbedaab2806174a3bc8092b1a Mon Sep 17 00:00:00 2001 From: yuyi Date: Thu, 26 Oct 2023 14:28:32 +0800 Subject: [PATCH] chore: Chart version and .Values.monitorEnabled --- charts/oceanbase-cluster/Chart.yaml | 2 +- charts/oceanbase-cluster/templates/obcluster.yaml | 2 ++ charts/oceanbase-cluster/values.yaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/oceanbase-cluster/Chart.yaml b/charts/oceanbase-cluster/Chart.yaml index 478ca9d06..fb732eb40 100644 --- a/charts/oceanbase-cluster/Chart.yaml +++ b/charts/oceanbase-cluster/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 4.2.0 +version: 4.2.0-sp.0-101000032023091319 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/oceanbase-cluster/templates/obcluster.yaml b/charts/oceanbase-cluster/templates/obcluster.yaml index fe95ee1d1..ed5695d1d 100644 --- a/charts/oceanbase-cluster/templates/obcluster.yaml +++ b/charts/oceanbase-cluster/templates/obcluster.yaml @@ -26,10 +26,12 @@ spec: size: {{ $size }} {{- end }} {{- end }} + {{- if .Values.monitorEnabled }} monitor: image: oceanbase/obagent:4.2.0-100000062023080210 resource: {{- toYaml .Values.monitorResource | nindent 6 }} + {{- end }} parameters: {{- range $param := .Values.parameters }} - name: {{ $param.name }} diff --git a/charts/oceanbase-cluster/values.yaml b/charts/oceanbase-cluster/values.yaml index 5378d0e94..968a967fa 100644 --- a/charts/oceanbase-cluster/values.yaml +++ b/charts/oceanbase-cluster/values.yaml @@ -12,6 +12,7 @@ observerConfig: redoLogStorage: 50Gi logStorage: 20Gi +monitorEnabled: true monitorResource: cpu: 1 memory: 2Gi