regenerates k8s manifests

Signed-off-by: Weifeng Wang <[email protected]> regenerates k8s manifests Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Sep 28, 2024 · a847eca · a847eca
1 parent ba89408
commit a847eca
Show file tree

Hide file tree

Showing 24 changed files with 628 additions and 539 deletions.
diff --git a/docker-compose/common/config/loki/microservices-mode-logs.yaml b/docker-compose/common/config/loki/microservices-mode-logs.yaml
@@ -29,6 +29,11 @@ common:
 index_gateway:
   mode: simple
 
+bloom_build:
+  enabled: true
+  builder:
+    planner_address: bloom-planner:9095
+
 bloom_gateway:
   enabled: true
   client:
@@ -121,7 +126,7 @@ storage_config:
     index_gateway_client:
       server_address: dns:///index-gateway:9095
   bloom_shipper:
-    working_directory: /loki/blooms
+    working_directory: /loki/bloomshipper
 
 chunk_store_config:
   chunk_cache_config:

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

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.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   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.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   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.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   name: alloy
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -4393,8 +4393,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4434,8 +4434,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   name: alloy-cluster
   namespace: monitoring-system
 spec:
@@ -4475,8 +4475,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4529,7 +4529,7 @@ spec:
         - secretRef:
             name: alloy-env
             optional: true
-        image: docker.io/grafana/alloy:v1.3.1
+        image: docker.io/grafana/alloy:v1.4.1
         imagePullPolicy: IfNotPresent
         name: alloy
         ports:
@@ -4691,8 +4691,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4714,8 +4714,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.3.1
-    helm.sh/chart: alloy-0.7.0
+    app.kubernetes.io/version: v1.4.1
+    helm.sh/chart: alloy-0.8.1
   name: alloy
   namespace: monitoring-system
 spec:

diff --git a/kubernetes/common/alloy/values.yaml b/kubernetes/common/alloy/values.yaml
@@ -41,6 +41,9 @@ alloy:
     # -- Deploy Alloy in a cluster to allow for load distribution.
     enabled: false
 
+    # -- Name for the Alloy cluster. Used for differentiating between clusters.
+    name: ""
+
     # -- Name for the port used for clustering, useful if running inside an Istio Mesh
     portName: http
 
@@ -84,6 +87,7 @@ alloy:
   #   port: 12347
   #   targetPort: 12347
   #   protocol: "TCP"
+  #   appProtocol: "h2c"
 
   mounts:
     # -- Mount /var/log from the host into the container for log collection.
@@ -200,6 +204,17 @@ controller:
   # -- Extra pod labels to add.
   podLabels: {}
 
+  # -- PodDisruptionBudget configuration.
+  podDisruptionBudget:
+    # -- Whether to create a PodDisruptionBudget for the controller.
+    enabled: false
+    # -- Minimum number of pods that must be available during a disruption.
+    # Note: Only one of minAvailable or maxUnavailable should be set.
+    minAvailable: null
+    # -- Maximum number of pods that can be unavailable during a disruption.
+    # Note: Only one of minAvailable or maxUnavailable should be set.
+    maxUnavailable: null
+
   # -- Whether to enable automatic deletion of stale PVCs due to a scale down operation, when controller.type is 'statefulset'.
   enableStatefulSetAutoDeletePVC: false
 

diff --git a/kubernetes/common/kube-prometheus-stack/kustomization.yaml b/kubernetes/common/kube-prometheus-stack/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 helmCharts:
 - name: kube-prometheus-stack
   repo: https://prometheus-community.github.io/helm-charts
-  version: 62.7.0
+  version: 63.1.0
   releaseName: kube-prometheus-stack
   namespace: monitoring-system
   includeCRDs: false