From 7ff76ca4a2258ed379d2fcb21d56c7f56f257c8b Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Wed, 9 Aug 2023 15:57:01 +0300 Subject: [PATCH] Update code references for v0.35.3 patch release (#4767) (#4768) Signed-off-by: Paschalis Tsilias (cherry picked from commit 0be02ada128e2ec41349253e477b6a623c60b2ef) --- 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/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 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md index ed2deb9c7f4a..f2e23077dade 100644 --- a/docs/sources/operator/deploy-agent-operator-resources.md +++ b/docs/sources/operator/deploy-agent-operator-resources.md @@ -58,7 +58,7 @@ To deploy the `GrafanaAgent` resource: labels: app: grafana-agent spec: - image: grafana/agent:v0.35.2 + image: grafana/agent:v0.35.3 integrations: selector: matchLabels: diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md index 53c03c5a1dbd..3f4414e29766 100644 --- a/docs/sources/operator/getting-started.md +++ b/docs/sources/operator/getting-started.md @@ -74,7 +74,7 @@ To install Agent Operator: serviceAccountName: grafana-agent-operator containers: - name: operator - image: grafana/agent-operator:v0.35.2 + image: grafana/agent-operator:v0.35.3 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 29dda106edfa..fd092efe806b 100644 --- a/docs/sources/static/configuration/integrations/node-exporter-config.md +++ b/docs/sources/static/configuration/integrations/node-exporter-config.md @@ -29,7 +29,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.2 \ + grafana/agent:v0.35.3 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -68,7 +68,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.35.2 + - image: grafana/agent:v0.35.3 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 5263e838f2b6..7472247c48df 100644 --- a/docs/sources/static/configuration/integrations/process-exporter-config.md +++ b/docs/sources/static/configuration/integrations/process-exporter-config.md @@ -21,7 +21,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.2 \ + grafana/agent:v0.35.3 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -38,7 +38,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.35.2 + - image: grafana/agent:v0.35.3 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 96962fe93c18..95996806c178 100644 --- a/docs/sources/static/set-up/install/install-agent-docker.md +++ b/docs/sources/static/set-up/install/install-agent-docker.md @@ -33,7 +33,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.2 + grafana/agent:v0.35.3 ``` Replace `CONFIG_FILE_PATH` with the configuration file path on your Linux host system. @@ -50,7 +50,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.2-windows + grafana/agent:v0.35.3-windows ``` Replace the following: diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index 793b8f77c2cc..aebdc0bea639 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.2" + DefaultAgentVersion = "v0.35.3" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index 3b24e1218f0b..b1ba4c8367f5 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.2 + image: grafana/agent:v0.35.3 imagePullPolicy: IfNotPresent name: grafana-agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index 97874b8c650f..2e2993f858bc 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.2 + image: grafana/agent:v0.35.3 imagePullPolicy: IfNotPresent name: grafana-agent-logs ports: diff --git a/production/kubernetes/agent-traces.yaml b/production/kubernetes/agent-traces.yaml index 657bd55d27b4..4430f57af62c 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.2 + image: grafana/agent:v0.35.3 imagePullPolicy: IfNotPresent name: grafana-agent-traces ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index 8a8980dde0c7..8b6c2cd8df80 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.35.2' +'grafana/agent:v0.35.3' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index a5ece80b1937..773316148d29 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.2', - agent_operator: 'grafana/agent-operator:v0.35.2', + agent: 'grafana/agent:v0.35.3', + agent_operator: 'grafana/agent-operator:v0.35.3', ksm: 'registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0', }, diff --git a/production/operator/templates/agent-operator.yaml b/production/operator/templates/agent-operator.yaml index 9df6cf2c0ee0..532615ff6db6 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.2 + image: grafana/agent-operator:v0.35.3 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.2 + image: grafana/agent:v0.35.3 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index 6fc5afff9037..3b46c4d37c56 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.2', - agentctl: 'grafana/agentctl:v0.35.2', + agent: 'grafana/agent:v0.35.3', + agentctl: 'grafana/agentctl:v0.35.3', }, // 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 b88b5c216238..a1c1ae27f708 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.2', - agentctl: 'grafana/agentctl:v0.35.2', + agent: 'grafana/agent:v0.35.3', + agentctl: 'grafana/agentctl:v0.35.3', }, _config:: { name: name, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 2e5b8b50d38d..90db08995b02 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.2', + image: 'grafana/agentctl:v0.35.3', schedule: '*/5 * * * *', configs: [], } + config,