regenerates k8s manifests

Signed-off-by: Weifeng Wang <[email protected]> regenerates k8s manifests Signed-off-by: Weifeng Wang <[email protected]> regenerates k8s manifests Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Aug 2, 2024 · be15528 · be15528
1 parent dffebd3
commit be15528
Show file tree

Hide file tree

Showing 23 changed files with 382 additions and 336 deletions.
diff --git a/compose.override.yaml b/compose.override.yaml
@@ -31,7 +31,7 @@ services:
       metrics.grafana.com/scrape: true
       profiles.grafana.com/service_name: grafana
       profiles.grafana.com/port: 6060
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
     volumes:
       - ./monitoring-mixins/loki-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/loki-mixin
       - ./monitoring-mixins/tempo-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/tempo-mixin

diff --git a/docker-compose/common/compose-include/grafana.yaml b/docker-compose/common/compose-include/grafana.yaml
@@ -20,7 +20,7 @@ services:
   grafana:
     labels:
       metrics.grafana.com/scrape: false
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,6 +1,6 @@
 ALLOY_IMAGE=grafana/alloy:v1.2.1
 LOKI_IMAGE=grafana/loki:3.1.0
-GRAFANA_IMAGE=grafana/grafana:11.1.0
+GRAFANA_IMAGE=grafana/grafana:11.1.3
 TEMPO_IMAGE=grafana/tempo:2.5.0
 MIMIR_IMAGE=grafana/mimir-alpine:2.13.0
 MIMIRTOOL_IMAGE=grafana/mimirtool:2.13.0

diff --git a/examples/grafana-explore-logs/README.md b/examples/grafana-explore-logs/README.md
@@ -26,7 +26,7 @@ include:
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

diff --git a/examples/grafana-explore-logs/compose.override.yaml b/examples/grafana-explore-logs/compose.override.yaml
@@ -2,7 +2,7 @@
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

diff --git a/examples/grafana-explore-profiles/README.md b/examples/grafana-explore-profiles/README.md
@@ -18,7 +18,7 @@ include:
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
     volumes:
       - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
     environment:

diff --git a/examples/grafana-explore-profiles/compose.override.yaml b/examples/grafana-explore-profiles/compose.override.yaml
@@ -8,7 +8,7 @@ services:
       profiles.grafana.com/goroutine.scrape: true
       profiles.grafana.com/service_name: grafana
       profiles.grafana.com/port: 6060
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
     volumes:
       - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
     environment:

diff --git a/kubernetes/common/grafana/kustomization.yaml b/kubernetes/common/grafana/kustomization.yaml
@@ -12,7 +12,7 @@ helmCharts:
   valuesFile: values-k3d-k3s.yaml
 images:
 - name: docker.io/grafana/grafana
-  newTag: 11.1.0
+  newTag: 11.1.3
 - name: quay.io/kiwigrid/k8s-sidecar
   newTag: 1.26.1
 resources:

diff --git a/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml b/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana
   namespace: monitoring-system
 ---
@@ -24,7 +24,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana
   namespace: monitoring-system
 rules: []
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana-clusterrole
 rules:
 - apiGroups:
@@ -58,7 +58,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana
   namespace: monitoring-system
 roleRef:
@@ -78,7 +78,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -157,7 +157,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana-config-dashboards
   namespace: monitoring-system
 ---
@@ -4226,7 +4226,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4248,7 +4248,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4383,7 +4383,7 @@ spec:
         - secretRef:
             name: grafana-env
             optional: true
-        image: docker.io/grafana/grafana:11.1.0
+        image: docker.io/grafana/grafana:11.1.3
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
@@ -4456,7 +4456,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4484,7 +4484,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 11.1.0
-    helm.sh/chart: grafana-8.3.6
+    helm.sh/chart: grafana-8.4.0
   name: grafana
   namespace: monitoring-system
 spec: