Skip to content

[Release] Update version to 9.0.5 #8978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: 9.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .buildkite/bk.integration.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ env:
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1752886846"
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1752886846"
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1752886846"
# Remove AGENT_VERSION pinning once 9.0.5 DRA and stack are released
AGENT_VERSION: "9.0.4-SNAPSHOT"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonder whether this could be done in another PR that targets 9.0.
By doing so, it can be reverted easily through the GH UI when needed, and remove the robots CI team from the review in this PR - as we were not needed in the past.

What do you think?

Copy link
Contributor

@pkoutsovasilis pkoutsovasilis Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@v1v this is required to do a bump of the elastic-agent version so we can eventually produce the necessary DRA but maintain the CI green. In the past these PRs were forced merged and resulted in a blocked CI. So what's the issue this env var causes?

Copy link
Member

@v1v v1v Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My idea is to implement changes in a different location. For instance, I created #9021. While it’s not perfect, it demonstrates that these defaults could be temporarily set within the Go project until DRA is enabled. This approach would eliminate the need for approving such changes in these PRs, achieving the same outcome with less overhead for the CI team, as we are not owners of the other files.

In the draft PR I tested, the changes were made quickly and without extensive analysis. However, I believe it illustrates the desired outcome. We can certainly discuss how to implement the details differently, but the revert will be straightforward and can be easily done in the GitHub UI by clicking on:

image

And it can be merged before this PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@v1v respectfully, but your proposal introduces some significant drawbacks. You’re hardcoding values directly into the codebase, which undermines flexibility and maintainability. The “straightforward revert” you mention doesn’t quite hold up when those values are embedded in Go code, as opposed to being centrally controlled through env vars.

In addition, at least for the moment, the version bump and the pinning are necessary to keep the CI green while we work towards the DRA release. Introducing the pinning in the Go code is actually more challenging, as it requires touching multiple places across the project. Centralising this logic in the pipeline via env vars is not only cleaner but also more maintainable and automation-friendly in the long term.

Avoiding this approach just to reduce CI team review overhead seems like the wrong trade-off.

cc @cmacknz @ebeahan @cachedout @pierrehilbert for visibility and thoughts.

Copy link
Member

@v1v v1v Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was indeed a quick 5-minute PR change to implement this functionality elsewhere; however, it is not intended to be a final solution. Instead, we could use some files containing those versions, which would be read by the project, rather than relying on environment variables in the BK pipelines. This approach would allow us, the robots-ci, to move away from the review process related to the FF as we are the CODEOWNERS, see https://github.com/elastic/elastic-agent/blob/main/.github/CODEOWNERS#L8-L10.

For context, we have not been involved in these steps in the past, so I want to emphasise that we do not want to be blockers.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that setting this environment variable once here is by far the simplest and least error prone option, and also that we want to minimize the number of approvals we need during our already convoluted release process. I don't love complicating the implementation to work around the code owner setup but I can emphasize with not wanting to be on the hook for approving these changes all the time.

The best compromise would be figuring out a way to load the environment variable here from a file and set the CODEOWNER separately from that.

I don't think this env section support this, but there is an environment hooks feature meant for secrets that possibly could let us do this https://buildkite.com/docs/pipelines/security/secrets/managing#without-a-secrets-storage-service-exporting-secrets-with-environment-hooks

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing @cmacknz. Until we figure out and agree on a long-term path forward — and you already know I’m “cooking” a hopefully more robust solution — what should we do in the meantime for the version bump releases?

I’m happy to revert the pinning commit from this PR if that’s the preferred approach, and we can go back to force-merging those PRs and risking blocked backports until all DRAs are ready. Just let me know in time so I can clean it up accordingly 🙂.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The best compromise would be figuring out a way to load the environment variable here from a file and set the CODEOWNER separately from that.

See #9038 and #9039


# This section is used to define the plugins that will be used in the pipeline.
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
Expand Down
3 changes: 3 additions & 0 deletions .buildkite/integration.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

env:
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
# Remove AGENT_PACKAGE_VERSION and BEAT_VERSION pinning once 9.0.5 DRA and stack are released
AGENT_PACKAGE_VERSION: "9.0.4"
BEAT_VERSION: "9.0.4"

steps:
- group: "Integration tests: packaging"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ crds:
defaultCRConfig:
image:
repository: "docker.elastic.co/elastic-agent/elastic-agent"
tag: "9.0.4"
tag: "9.0.5"
targetAllocator:
enabled: false # Enable/disable the Operator's Target allocator.
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ crds:
defaultCRConfig:
image:
repository: "docker.elastic.co/elastic-agent/elastic-agent"
tag: "9.0.4"
tag: "9.0.5"
targetAllocator:
enabled: false # Enable/disable the Operator's Target allocator.
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/edot-collector/kube-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ crds:
defaultCRConfig:
image:
repository: "docker.elastic.co/elastic-agent/elastic-agent"
tag: "9.0.4"
tag: "9.0.5"
targetAllocator:
enabled: false # Enable/disable the Operator's Target allocator.
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/elastic-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: elastic-agent
description: Elastic-Agent Helm Chart
kubeVersion: ">= 1.27.0-0"
type: application
appVersion: 9.0.4
version: 9.0.4-beta
appVersion: 9.0.5
version: 9.0.5-beta
dependencies:
- name: kube-state-metrics
version: "5.30.1"
Expand Down
48 changes: 24 additions & 24 deletions deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ metadata:
name: agent-clusterwide-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
---
Expand All @@ -36,10 +36,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
---
Expand All @@ -50,10 +50,10 @@ metadata:
name: agent-clusterwide-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
stringData:
Expand Down Expand Up @@ -288,10 +288,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
stringData:
Expand Down Expand Up @@ -620,10 +620,10 @@ kind: ClusterRole
metadata:
name: agent-clusterWide-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
rules:
Expand Down Expand Up @@ -702,10 +702,10 @@ kind: ClusterRole
metadata:
name: agent-perNode-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
rules:
Expand Down Expand Up @@ -806,10 +806,10 @@ kind: ClusterRoleBinding
metadata:
name: agent-clusterWide-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
subjects:
Expand All @@ -827,10 +827,10 @@ kind: ClusterRoleBinding
metadata:
name: agent-perNode-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
subjects:
Expand Down Expand Up @@ -962,14 +962,14 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
spec:
version: 9.0.4
version: 9.0.5
configRef:
secretName: agent-pernode-example
elasticsearchRefs:
Expand All @@ -993,7 +993,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.5-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down Expand Up @@ -1045,14 +1045,14 @@ metadata:
name: agent-clusterwide-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
annotations:
eck.k8s.elastic.co/license: basic
spec:
version: 9.0.4
version: 9.0.5
configRef:
secretName: agent-clusterwide-example
elasticsearchRefs:
Expand All @@ -1076,7 +1076,7 @@ spec:
value: /usr/share/elastic-agent/state
- name: ELASTIC_NETINFO
value: "false"
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.5-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand All @@ -34,10 +34,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
stringData:

agent.yml: |-
Expand Down Expand Up @@ -234,10 +234,10 @@ kind: ClusterRole
metadata:
name: agent-perNode-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
rules:
- apiGroups: [ "" ] # "" indicates the core API group
resources:
Expand Down Expand Up @@ -336,10 +336,10 @@ kind: ClusterRoleBinding
metadata:
name: agent-perNode-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
subjects:
- kind: ServiceAccount
name: agent-pernode-example
Expand Down Expand Up @@ -384,10 +384,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -432,7 +432,7 @@ spec:
value: fleetToken
- name: FLEET_ENROLL
value: "true"
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.5-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ spec:
value: fleetToken
- name: FLEET_ENROLL
value: "true"
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.5-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
---
# Source: elastic-agent/templates/agent/k8s/secret.yaml
apiVersion: v1
Expand All @@ -34,10 +34,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
stringData:

agent.yml: |-
Expand Down Expand Up @@ -212,10 +212,10 @@ kind: ClusterRole
metadata:
name: agent-perNode-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
rules:
- apiGroups: [ "" ] # "" indicates the core API group
resources:
Expand Down Expand Up @@ -314,10 +314,10 @@ kind: ClusterRoleBinding
metadata:
name: agent-perNode-example-default
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
subjects:
- kind: ServiceAccount
name: agent-pernode-example
Expand Down Expand Up @@ -362,10 +362,10 @@ metadata:
name: agent-pernode-example
namespace: "default"
labels:
helm.sh/chart: elastic-agent-9.0.4-beta
helm.sh/chart: elastic-agent-9.0.5-beta
app.kubernetes.io/name: elastic-agent
app.kubernetes.io/instance: example
app.kubernetes.io/version: 9.0.4
app.kubernetes.io/version: 9.0.5
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -402,7 +402,7 @@ spec:
value: fleetToken
- name: FLEET_ENROLL
value: "true"
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
image: docker.elastic.co/elastic-agent/elastic-agent:9.0.5-SNAPSHOT
imagePullPolicy: IfNotPresent
name: agent
resources:
Expand Down
Loading
Loading