Merge branch 'release-1.5' into cherry-pick-5186-to-release-1.5

pingcap · Jul 28, 2023 · 9832290 · 9832290
2 parents 2ad6e31 + d775285
commit 9832290
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/examples/advanced/tidb-monitor.yaml b/examples/advanced/tidb-monitor.yaml
@@ -274,7 +274,7 @@ spec:
     ## ImagePullPolicy of grafana.
     # imagePullPolicy: IfNotPresent
     ## Grafana version.
-    version: v7.5.11
+    version: 7.5.11
     ## Describes the compute resource requirements and limits of grafana.
     ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
     # requests:

diff --git a/manifests/monitor/tidb-monitor.yaml b/manifests/monitor/tidb-monitor.yaml
@@ -22,7 +22,7 @@ spec:
       portName: http-prometheus
   grafana:
     baseImage: grafana/grafana
-    version: 7.5.7
+    version: 7.5.11
     imagePullPolicy: IfNotPresent
     logLevel: info
     #limits: