Merge branch 'main' into am/update_ubuntu

grafana · Jul 25, 2024 · ed630cf · ed630cf
2 parents fa843d2 + 6ef2bd7
commit ed630cf
Show file tree

Hide file tree

Showing 37 changed files with 48 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
-v0.42.0-rc.0 (2024-07-18)
+v0.42.0 (2024-07-24)
 -------------------------
 
 ### Security fixes

diff --git a/docs/developer/release/3-update-version-in-code.md b/docs/developer/release/3-update-version-in-code.md
@@ -37,8 +37,8 @@ The project must be updated to reference the upcoming release tag whenever a new
 3. Create a PR to merge to main (must be merged before continuing).
 
     - Release Candidate example PR [here](https://github.com/grafana/agent/pull/3065)
-    - Stable Release example PR [here](https://github.com/grafana/agent/pull/3119)
-    - Patch Release example PR [here](https://github.com/grafana/agent/pull/3191)
+    - Stable Release example PR [here](https://github.com/grafana/agent/pull/6993)
+    - Patch Release example PR [here](https://github.com/grafana/agent/pull/6944)
 
 4. If it doesn't exist yet, create a branch from `release-VERSION_PREFIX` for [grafana/agent](https://github.com/grafana/agent).
 
@@ -53,6 +53,6 @@ The project must be updated to reference the upcoming release tag whenever a new
 6. Create a PR to merge to `release-VERSION_PREFIX` (must be merged before continuing).
 
     - Release Candidate example PR [here](https://github.com/grafana/agent/pull/3066)
-    - Stable Release example PR [here](https://github.com/grafana/agent/pull/3123)
-    - Patch Release example PR [here](https://github.com/grafana/agent/pull/3193)
-        - The `CHANGELOG.md` was updated in cherry-pick commits prior for this example. Make sure it is all set on this PR.
+    - Stable Release example PR [here](https://github.com/grafana/agent/pull/6994)
+    - Patch Release example PR [here](https://github.com/grafana/agent/pull/6945)
+        - This PR takes a shortcut by both changing the version and cherry-picking other required changes on the release branch.
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
@@ -9,7 +9,7 @@ title: Grafana Agent
 description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector
 weight: 350
 cascade:
-  AGENT_RELEASE: v0.42.0-rc.0
+  AGENT_RELEASE: v0.42.0
   OTEL_VERSION: v0.96.0
 refs:
   variants:

diff --git a/operations/helm/charts/grafana-agent/CHANGELOG.md b/operations/helm/charts/grafana-agent/CHANGELOG.md
@@ -7,6 +7,13 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+0.42.0 (2024-07-24)
+----------
+
+### Enhancements
+
+- Update Grafana Agent version to v0.42.0. (@ptodev)
+
 0.41.0 (2024-06-07)
 ----------
 

diff --git a/operations/helm/charts/grafana-agent/Chart.yaml b/operations/helm/charts/grafana-agent/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: grafana-agent
 description: 'Grafana Agent'
 type: application
-version: 0.41.0
-appVersion: 'v0.41.1'
+version: 0.42.0
+appVersion: 'v0.42.0'
 
 dependencies:
   - name: crds

diff --git a/operations/helm/charts/grafana-agent/README.md b/operations/helm/charts/grafana-agent/README.md
@@ -1,6 +1,6 @@
 # Grafana Agent Helm chart
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.41.0](https://img.shields.io/badge/Version-0.41.0-informational?style=flat-square) ![AppVersion: v0.41.1](https://img.shields.io/badge/AppVersion-v0.41.1-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.42.0](https://img.shields.io/badge/Version-0.42.0-informational?style=flat-square) ![AppVersion: v0.42.0](https://img.shields.io/badge/AppVersion-v0.42.0-informational?style=flat-square)
 
 Helm chart for deploying [Grafana Agent][] to Kubernetes.
 

diff --git a/.../tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml b/.../tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ns/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml b/...ns/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...elm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml b/...elm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...m/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml b/...m/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml b/...tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml b/...ations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...s/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/controllers/daemonset.yaml b/...s/helm/tests/enable-servicemonitor-tls/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...tions/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml b/...tions/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ns/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/...ns/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         - name: global-cred
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...tions/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/...tions/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: quay.io/grafana/agent:v0.41.1
+          image: quay.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml
@@ -45,7 +45,7 @@ spec:
             name: geoip
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ons/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/...ons/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
         - name: local-cred
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/...ations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: quay.io/grafana/agent:v0.41.1
+          image: quay.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...lm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml b/...lm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/nonroot/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/nonroot/grafana-agent/templates/controllers/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/pod_annotations/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/pod_annotations/grafana-agent/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - -config.file=/etc/agent/config.yaml

diff --git a/.../helm/tests/topologyspreadconstraints/grafana-agent/templates/controllers/deployment.yaml b/.../helm/tests/topologyspreadconstraints/grafana-agent/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: grafana-agent
       containers:
         - name: grafana-agent
-          image: docker.io/grafana/agent:v0.41.1
+          image: docker.io/grafana/agent:v0.42.0
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/static/operator/defaults.go b/static/operator/defaults.go
@@ -2,7 +2,7 @@ package operator
 
 // Supported versions of the Grafana Agent.
 var (
-	DefaultAgentVersion   = "v0.42.0-rc.0"
+	DefaultAgentVersion   = "v0.42.0"
 	DefaultAgentBaseImage = "grafana/agent"
 	DefaultAgentImage     = DefaultAgentBaseImage + ":" + DefaultAgentVersion
 )

diff --git a/tools/gen-versioned-files/agent-version.txt b/tools/gen-versioned-files/agent-version.txt
@@ -1 +1 @@
-v0.42.0-rc.0
+v0.42.0