From 59c638aff0a25d42fbb05697e6f03187735bb229 Mon Sep 17 00:00:00 2001 From: mattdurham Date: Mon, 17 Jul 2023 15:51:37 -0400 Subject: [PATCH] Update RC numbers (#4485) * Update RC numbers * Remove newline so the diff doesnt look wierd. (cherry picked from commit 8f87ef6dbbf7d43b72b2745f82f3fa30a9582009) --- CHANGELOG.md | 3 +++ docs/sources/operator/deploy-agent-operator-resources.md | 2 +- docs/sources/operator/getting-started.md | 2 +- .../static/configuration/integrations/node-exporter-config.md | 4 ++-- .../configuration/integrations/process-exporter-config.md | 4 ++-- docs/sources/static/set-up/install/install-agent-docker.md | 4 ++-- pkg/operator/defaults.go | 2 +- production/kubernetes/agent-bare.yaml | 2 +- production/kubernetes/agent-loki.yaml | 2 +- production/kubernetes/agent-traces.yaml | 2 +- production/kubernetes/build/lib/version.libsonnet | 2 +- production/kubernetes/build/templates/operator/main.jsonnet | 4 ++-- production/kubernetes/install-bare.sh | 2 +- production/operator/templates/agent-operator.yaml | 4 ++-- production/tanka/grafana-agent/v1/main.libsonnet | 4 ++-- production/tanka/grafana-agent/v2/internal/base.libsonnet | 4 ++-- production/tanka/grafana-agent/v2/internal/syncer.libsonnet | 2 +- 17 files changed, 26 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ae4e6e9a250..fa7f12e3d16d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ internal API changes are not present. v0.35.0-rc.1 (2023-07-17) ------------------------- +v0.35.0-rc.1 (2023-07-17) +------------------------- + ### Features - Add support for converting Prometheus `file_sd_config` to `discovery.file`. (@erikbaranowski) diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md index 826971d710ee..90c3b1420422 100644 --- a/docs/sources/operator/deploy-agent-operator-resources.md +++ b/docs/sources/operator/deploy-agent-operator-resources.md @@ -57,7 +57,7 @@ To deploy the `GrafanaAgent` resource: labels: app: grafana-agent spec: - image: grafana/agent:v0.35.0-rc.0 + image: grafana/agent:v0.35.0-rc.1 integrations: selector: matchLabels: diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md index 24231531b98f..ea5b3a602d30 100644 --- a/docs/sources/operator/getting-started.md +++ b/docs/sources/operator/getting-started.md @@ -73,7 +73,7 @@ To install Agent Operator: serviceAccountName: grafana-agent-operator containers: - name: operator - image: grafana/agent-operator:v0.35.0-rc.0 + image: grafana/agent-operator:v0.35.0-rc.1 args: - --kubelet-service=default/kubelet --- diff --git a/docs/sources/static/configuration/integrations/node-exporter-config.md b/docs/sources/static/configuration/integrations/node-exporter-config.md index 06f6d6a12a7d..76d746f8d53b 100644 --- a/docs/sources/static/configuration/integrations/node-exporter-config.md +++ b/docs/sources/static/configuration/integrations/node-exporter-config.md @@ -28,7 +28,7 @@ docker run \ -v "/proc:/host/proc:ro,rslave" \ -v /tmp/agent:/etc/agent \ -v /path/to/config.yaml:/etc/agent-config/agent.yaml \ - grafana/agent:v0.35.0-rc.0 \ + grafana/agent:v0.35.0-rc.1 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -67,7 +67,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.35.0-rc.0 + - image: grafana/agent:v0.35.0-rc.1 name: agent args: - --config.file=/etc/agent-config/agent.yaml diff --git a/docs/sources/static/configuration/integrations/process-exporter-config.md b/docs/sources/static/configuration/integrations/process-exporter-config.md index 1d1fd9533643..c755d3a89f8f 100644 --- a/docs/sources/static/configuration/integrations/process-exporter-config.md +++ b/docs/sources/static/configuration/integrations/process-exporter-config.md @@ -20,7 +20,7 @@ docker run \ -v "/proc:/proc:ro" \ -v /tmp/agent:/etc/agent \ -v /path/to/config.yaml:/etc/agent-config/agent.yaml \ - grafana/agent:v0.35.0-rc.0 \ + grafana/agent:v0.35.0-rc.1 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -37,7 +37,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.35.0-rc.0 + - image: grafana/agent:v0.35.0-rc.1 name: agent args: - --config.file=/etc/agent-config/agent.yaml diff --git a/docs/sources/static/set-up/install/install-agent-docker.md b/docs/sources/static/set-up/install/install-agent-docker.md index 2705214065cf..665cab08ca2c 100644 --- a/docs/sources/static/set-up/install/install-agent-docker.md +++ b/docs/sources/static/set-up/install/install-agent-docker.md @@ -32,7 +32,7 @@ To run a Grafana Agent Docker container on Linux, run the following command in a docker run \ -v WAL_DATA_DIRECTORY:/etc/agent/data \ -v CONFIG_FILE_PATH:/etc/agent/agent.yaml \ - grafana/agent:v0.35.0-rc.0 + grafana/agent:v0.35.0-rc.1 ``` Replace `CONFIG_FILE_PATH` with the configuration file path on your Linux host system. @@ -49,7 +49,7 @@ To run a Grafana Agent Docker container on Windows, run the following command in docker run ^ -v WAL_DATA_DIRECTORY:C:\etc\grafana-agent\data ^ -v CONFIG_FILE_PATH:C:\etc\grafana-agent ^ - grafana/agent:v0.35.0-rc.0-windows + grafana/agent:v0.35.0-rc.1-windows ``` Replace the following: diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index 5ed02cb97b88..b2fdd4604880 100644 --- a/pkg/operator/defaults.go +++ b/pkg/operator/defaults.go @@ -2,7 +2,7 @@ package operator // Supported versions of the Grafana Agent. var ( - DefaultAgentVersion = "v0.35.0-rc.0" + DefaultAgentVersion = "v0.35.0-rc.1" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index 6f90a5c217ee..cf2dc2c1b05d 100644 --- a/production/kubernetes/agent-bare.yaml +++ b/production/kubernetes/agent-bare.yaml @@ -83,7 +83,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.35.0-rc.0 + image: grafana/agent:v0.35.0-rc.1 imagePullPolicy: IfNotPresent name: grafana-agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index 8ec4f45ee564..1352b347eeac 100644 --- a/production/kubernetes/agent-loki.yaml +++ b/production/kubernetes/agent-loki.yaml @@ -65,7 +65,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.35.0-rc.0 + image: grafana/agent:v0.35.0-rc.1 imagePullPolicy: IfNotPresent name: grafana-agent-logs ports: diff --git a/production/kubernetes/agent-traces.yaml b/production/kubernetes/agent-traces.yaml index 9097c0ad0e82..9e5c7261e0ea 100644 --- a/production/kubernetes/agent-traces.yaml +++ b/production/kubernetes/agent-traces.yaml @@ -114,7 +114,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.35.0-rc.0 + image: grafana/agent:v0.35.0-rc.1 imagePullPolicy: IfNotPresent name: grafana-agent-traces ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index 7963d1f63595..82bf91000e6e 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.35.0-rc.0' +'grafana/agent:v0.35.0-rc.1' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index 05de0540248f..a71c157428ce 100644 --- a/production/kubernetes/build/templates/operator/main.jsonnet +++ b/production/kubernetes/build/templates/operator/main.jsonnet @@ -23,8 +23,8 @@ local ksm = import 'kube-state-metrics/kube-state-metrics.libsonnet'; local this = self, _images:: { - agent: 'grafana/agent:v0.35.0-rc.0', - agent_operator: 'grafana/agent-operator:v0.35.0-rc.0', + agent: 'grafana/agent:v0.35.0-rc.1', + agent_operator: 'grafana/agent-operator:v0.35.0-rc.1', ksm: 'registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0', }, diff --git a/production/kubernetes/install-bare.sh b/production/kubernetes/install-bare.sh index d07c56834e28..8e3a45b3cd34 100644 --- a/production/kubernetes/install-bare.sh +++ b/production/kubernetes/install-bare.sh @@ -25,7 +25,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.35.0-rc.0 +MANIFEST_BRANCH=v0.35.0-rc.1 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-bare.yaml} NAMESPACE=${NAMESPACE:-default} diff --git a/production/operator/templates/agent-operator.yaml b/production/operator/templates/agent-operator.yaml index a0c3128b7aaf..5658f959b457 100644 --- a/production/operator/templates/agent-operator.yaml +++ b/production/operator/templates/agent-operator.yaml @@ -372,7 +372,7 @@ spec: containers: - args: - --kubelet-service=default/kubelet - image: grafana/agent-operator:v0.35.0-rc.0 + image: grafana/agent-operator:v0.35.0-rc.1 imagePullPolicy: IfNotPresent name: grafana-agent-operator serviceAccount: grafana-agent-operator @@ -436,7 +436,7 @@ metadata: name: grafana-agent namespace: ${NAMESPACE} spec: - image: grafana/agent:v0.35.0-rc.0 + image: grafana/agent:v0.35.0-rc.1 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index 54b77bcbf7e2..2afd8d9d086a 100644 --- a/production/tanka/grafana-agent/v1/main.libsonnet +++ b/production/tanka/grafana-agent/v1/main.libsonnet @@ -15,8 +15,8 @@ local service = k.core.v1.service; (import './lib/traces.libsonnet') + { _images:: { - agent: 'grafana/agent:v0.35.0-rc.0', - agentctl: 'grafana/agentctl:v0.35.0-rc.0', + agent: 'grafana/agent:v0.35.0-rc.1', + agentctl: 'grafana/agentctl:v0.35.0-rc.1', }, // new creates a new DaemonSet deployment of the grafana-agent. By default, diff --git a/production/tanka/grafana-agent/v2/internal/base.libsonnet b/production/tanka/grafana-agent/v2/internal/base.libsonnet index 84edeadb6213..a89f80cee9d5 100644 --- a/production/tanka/grafana-agent/v2/internal/base.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/base.libsonnet @@ -11,8 +11,8 @@ function(name='grafana-agent', namespace='') { local this = self, _images:: { - agent: 'grafana/agent:v0.35.0-rc.0', - agentctl: 'grafana/agentctl:v0.35.0-rc.0', + agent: 'grafana/agent:v0.35.0-rc.1', + agentctl: 'grafana/agentctl:v0.35.0-rc.1', }, _config:: { name: name, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 8ddf22c02bd2..f23e5ac11d22 100644 --- a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet @@ -14,7 +14,7 @@ function( ) { local _config = { api: error 'api must be set', - image: 'grafana/agentctl:v0.35.0-rc.0', + image: 'grafana/agentctl:v0.35.0-rc.1', schedule: '*/5 * * * *', configs: [], } + config,