resolving conflicts

grafana · Feb 27, 2025 · 65257a0 · 65257a0
1 parent 690143b
commit 65257a0
Show file tree

Hide file tree

Showing 39 changed files with 49 additions and 42 deletions.
diff --git a/operations/helm/charts/alloy/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md
@@ -10,16 +10,23 @@ internal API changes are not present.
 Unreleased
 ----------
 
+### Bug Fixes
+
+- Set resource namespace correctly (@shinebayar-g)
+
+0.12.2 (2025-02-27)
+----------
+
 ### Enhancements
 
 - Add support for adding livenessProbe to agent container (@slimes28)
 
-0.12.1 (2025-02-25)
+0.12.1 (2025-02-26)
 ----------
 
-### Bug Fixes
+### Enhancements
 
-- Set resource namespace correctly (@shinebayar-g)
+- Update to Grafana Alloy v1.7.1. (@thampiotr)
 
 0.12.0 (2025-02-24)
 ----------

diff --git a/operations/helm/charts/alloy/Chart.yaml b/operations/helm/charts/alloy/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: alloy
 description: 'Grafana Alloy'
 type: application
-version: 0.12.1
-appVersion: 'v1.7.0'
+version: 0.12.2
+appVersion: 'v1.7.1'
 icon: https://raw.githubusercontent.com/grafana/alloy/main/docs/sources/assets/alloy_icon_orange.svg
 
 dependencies:

diff --git a/...ons/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml b/...ons/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml
@@ -31,7 +31,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...sts/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml b/...sts/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml b/...tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...s/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml b/...s/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml
@@ -31,7 +31,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...sts/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml b/...sts/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml
@@ -31,7 +31,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml b/...ations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ions/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml b/...ions/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ns/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml b/...ns/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml
@@ -31,7 +31,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/extra-manifests/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-manifests/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml
@@ -33,7 +33,7 @@ spec:
         - name: global-cred
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: quay.io/grafana/alloy:v1.7.0
+          image: quay.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/host-alias/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/host-alias/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml
@@ -46,7 +46,7 @@ spec:
             name: geoip
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/livinessprobe/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/livinessprobe/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml
@@ -30,7 +30,7 @@ spec:
         - name: local-cred
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: quay.io/grafana/alloy:v1.7.0
+          image: quay.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...tions/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml b/...tions/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.7.0
+          image: docker.io/grafana/alloy:v1.7.1
           imagePullPolicy: IfNotPresent
           args:
             - run