regenerates k8s manifests

qclaogui · Nov 28, 2024 · e126e4f · e126e4f
1 parent 3c6d420
commit e126e4f
Show file tree

Hide file tree

Showing 42 changed files with 2,445 additions and 1,397 deletions.
diff --git a/docker-compose/common/compose-include/loki.yaml b/docker-compose/common/compose-include/loki.yaml
@@ -9,7 +9,7 @@ services:
     labels:
       metrics.grafana.com/scrape: false
     depends_on: { minio: { condition: service_healthy } }
-    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
+    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.3.0}
     configs:
       - source: loki_config_file
         target: /etc/loki/config.yaml

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,5 +1,5 @@
 ALLOY_IMAGE=grafana/alloy:v1.4.2
-LOKI_IMAGE=grafana/loki:3.1.1
+LOKI_IMAGE=grafana/loki:3.3.0
 GRAFANA_IMAGE=grafana/grafana:11.2.2
 TEMPO_IMAGE=grafana/tempo:2.6.0
 MIMIR_IMAGE=grafana/mimir-alpine:2.14.0

diff --git a/docker-compose/common/config/loki/microservices-mode-logs.yaml b/docker-compose/common/config/loki/microservices-mode-logs.yaml
@@ -44,12 +44,6 @@ bloom_gateway:
         memcached_client:
           addresses: "dns+memcached:11211"
 
-bloom_compactor:
-  enabled: true
-  ring:
-    kvstore:
-      store: memberlist
-
 compactor:
   working_directory: /loki/compactor
   compactor_ring:

diff --git a/docker-compose/common/config/loki/monolithic-mode-logs.yaml b/docker-compose/common/config/loki/monolithic-mode-logs.yaml
@@ -12,6 +12,9 @@ server:
   log_format: json
 
 common:
+  ring:
+    kvstore:
+      store: memberlist
   compactor_address: http://loki:3100
   path_prefix: /loki
   replication_factor: 1
@@ -36,11 +39,6 @@ bloom_gateway:
         memcached_client:
           addresses: "dns+memcached:11211"
 
-bloom_compactor:
-  enabled: true
-  ring:
-    kvstore:
-      store: memberlist
 
 index_gateway:
   mode: simple

diff --git a/docker-compose/common/config/loki/read-write-mode-logs.yaml b/docker-compose/common/config/loki/read-write-mode-logs.yaml
@@ -36,11 +36,6 @@ bloom_gateway:
         memcached_client:
           addresses: "dns+memcached:11211"
 
-bloom_compactor:
-  enabled: true
-  ring:
-    kvstore:
-      store: memberlist
 
 frontend:
   scheduler_address: loki-backend:9095

diff --git a/docker-compose/microservices-mode/logs/compose.yaml b/docker-compose/microservices-mode/logs/compose.yaml
@@ -62,7 +62,7 @@ services:
   distributor:
     labels: *loki-labels
     depends_on: { ingester: { condition: service_healthy } }
-    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
+    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.3.0}
     configs:
       - source: loki_config_file
         target: /etc/loki/config.yaml

diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml
@@ -46,7 +46,7 @@ services:
   gateway:
     labels:
       metrics.grafana.com/scrape: false
-    depends_on: { loki: { condition: service_healthy }, tempo: { condition: service_healthy }, mimir: { condition: service_healthy }, pyroscope: { condition: service_healthy } }
+    depends_on: { tempo: { condition: service_healthy }, mimir: { condition: service_healthy }, pyroscope: { condition: service_healthy } }
     image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.27-alpine}
     restart: always
     volumes:
@@ -68,7 +68,7 @@ services:
       metrics.grafana.com/scrape: false
       profiles.grafana.com/service_name: loki
     depends_on: { minio: { condition: service_healthy } }
-    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
+    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.3.0}
     configs:
       - source: loki_config_file
         target: /etc/loki/config.yaml

diff --git a/docker-compose/monolithic-mode/logs/compose.yaml b/docker-compose/monolithic-mode/logs/compose.yaml
@@ -26,7 +26,7 @@ services:
   gateway:
     labels:
       metrics.grafana.com/scrape: false
-    depends_on: { loki: { condition: service_healthy } }
+    # depends_on: { loki: { condition: service_healthy } }
     image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.27-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh

diff --git a/docker-compose/read-write-mode/logs/compose.yaml b/docker-compose/read-write-mode/logs/compose.yaml
@@ -56,7 +56,7 @@ services:
 
   loki-read:
     depends_on: { minio: { condition: service_healthy } }
-    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
+    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.3.0}
     configs:
       - source: loki_config_file
         target: /etc/loki/config.yaml

diff --git a/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml b/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml
@@ -7,8 +7,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy
   namespace: monitoring-system
 ---
@@ -21,8 +21,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy
 rules:
 - apiGroups:
@@ -125,8 +125,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -4435,8 +4435,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4476,8 +4476,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy-cluster
   namespace: monitoring-system
 spec:
@@ -4517,8 +4517,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4571,7 +4571,7 @@ spec:
         - secretRef:
             name: alloy-env
             optional: true
-        image: docker.io/grafana/alloy:v1.4.2
+        image: docker.io/grafana/alloy:v1.5.0
         imagePullPolicy: IfNotPresent
         name: alloy
         ports:
@@ -4773,8 +4773,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4796,8 +4796,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.4.2
-    helm.sh/chart: alloy-0.9.1
+    app.kubernetes.io/version: v1.5.0
+    helm.sh/chart: alloy-0.10.0
   name: alloy
   namespace: monitoring-system
 spec:

diff --git a/kubernetes/common/alloy/values.yaml b/kubernetes/common/alloy/values.yaml
@@ -89,6 +89,12 @@ alloy:
   #   protocol: "TCP"
   #   appProtocol: "h2c"
 
+  # -- Host aliases to add to the Alloy container.
+  hostAliases: []
+  # - ip: "20.21.22.23"
+  #   hostnames:
+  #     - "company.grafana.net"
+
   mounts:
     # -- Mount /var/log from the host into the container for log collection.
     varlog: false

diff --git a/kubernetes/common/grafana/kustomization.yaml b/kubernetes/common/grafana/kustomization.yaml
@@ -4,7 +4,7 @@ namespace: monitoring-system
 helmCharts:
 - name: grafana
   repo: https://grafana.github.io/helm-charts
-  version: 8.6.1
+  version: 8.6.3
   releaseName: grafana
   namespace: monitoring-system
   includeCRDs: false

diff --git a/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml b/kubernetes/common/grafana/manifests/k8s-all-in-one.yaml
@@ -9,10 +9,9 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana
   namespace: monitoring-system
 ---
@@ -21,10 +20,9 @@ kind: Role
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana
   namespace: monitoring-system
 rules: []
@@ -34,10 +32,9 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana-clusterrole
 rules:
 - apiGroups:
@@ -55,10 +52,9 @@ kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana
   namespace: monitoring-system
 roleRef:
@@ -75,10 +71,9 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -154,10 +149,9 @@ kind: ConfigMap
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana-config-dashboards
   namespace: monitoring-system
 ---
@@ -4223,10 +4217,9 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4245,10 +4238,9 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4271,6 +4263,8 @@ spec:
       labels:
         app.kubernetes.io/instance: grafana
         app.kubernetes.io/name: grafana
+        app.kubernetes.io/version: 11.3.1
+        helm.sh/chart: grafana-8.6.3
     spec:
       automountServiceAccountToken: true
       containers:
@@ -4303,7 +4297,7 @@ spec:
           value: http://localhost:3000/api/admin/provisioning/dashboards/reload
         - name: REQ_METHOD
           value: POST
-        image: quay.io/kiwigrid/k8s-sidecar:1.27.4
+        image: quay.io/kiwigrid/k8s-sidecar:1.28.0
         imagePullPolicy: IfNotPresent
         name: grafana-sc-dashboard
         securityContext:
@@ -4343,7 +4337,7 @@ spec:
           value: http://localhost:3000/api/admin/provisioning/datasources/reload
         - name: REQ_METHOD
           value: POST
-        image: quay.io/kiwigrid/k8s-sidecar:1.27.4
+        image: quay.io/kiwigrid/k8s-sidecar:1.28.0
         imagePullPolicy: IfNotPresent
         name: grafana-sc-datasources
         securityContext:
@@ -4383,7 +4377,7 @@ spec:
         - secretRef:
             name: grafana-env
             optional: true
-        image: docker.io/grafana/grafana:11.2.1
+        image: docker.io/grafana/grafana:11.3.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
@@ -4460,10 +4454,9 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana
   namespace: monitoring-system
 spec:
@@ -4488,10 +4481,9 @@ kind: Ingress
 metadata:
   labels:
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
-    app.kubernetes.io/version: 11.2.1
-    helm.sh/chart: grafana-8.5.2
+    app.kubernetes.io/version: 11.3.1
+    helm.sh/chart: grafana-8.6.3
   name: grafana
   namespace: monitoring-system
 spec: