Skip to content

Commit 490dbb2

Browse files
elastic-vault-github-plugin-prod[bot]elasticmachinepkoutsovasilisebeahan
authored
[Release] Update version to 9.1.1 (#8695)
* [Release] update version * fix: facilitate pinning of elastic-agent version in CI * ci: pin agent CI version to 9.1.0 * chore: bump versions * fix: render helm chart examples --------- Co-authored-by: elasticmachine <infra-root+elasticmachine@elastic.co> Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co> Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
1 parent 07d47e9 commit 490dbb2

File tree

42 files changed

+348
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+348
-338
lines changed

.buildkite/bk.integration-fips.pipeline.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ env:
77
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1753491662"
88
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1753491662"
99
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1753491662"
10+
# Remove AGENT_VERSION pinning once 9.1.1 DRA and stack are released
11+
AGENT_VERSION: "9.1.0-SNAPSHOT"
1012

1113
# This section is used to define the plugins that will be used in the pipeline.
1214
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -56,7 +58,7 @@ steps:
5658
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
5759
useCustomGlobalHooks: true
5860
plugins:
59-
- *vault_ec_key_prod
61+
- *vault_ec_key_prod
6062

6163
- group: "fips:Stateful:Ubuntu"
6264
key: integration-tests-ubuntu-fips
@@ -84,7 +86,7 @@ steps:
8486
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
8587
instanceType: "m5.2xlarge"
8688
plugins:
87-
- *vault_ec_key_prod
89+
- *vault_ec_key_prod
8890
matrix:
8991
setup:
9092
sudo:
@@ -114,7 +116,7 @@ steps:
114116
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
115117
instanceType: "m6g.2xlarge"
116118
plugins:
117-
- *vault_ec_key_prod
119+
- *vault_ec_key_prod
118120
matrix:
119121
setup:
120122
sudo:
@@ -155,7 +157,7 @@ steps:
155157
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
156158
useCustomGlobalHooks: true
157159
plugins:
158-
- *vault_ec_key_prod
160+
- *vault_ec_key_prod
159161

160162
- label: Aggregate test reports
161163
depends_on:

.buildkite/bk.integration.pipeline.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ env:
1212
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1753491662"
1313
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1753491662"
1414
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1753491662"
15+
# Remove AGENT_VERSION pinning once 9.1.1 DRA and stack are released
16+
AGENT_VERSION: "9.1.0-SNAPSHOT"
1517

1618
# This section is used to define the plugins that will be used in the pipeline.
1719
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -41,7 +43,7 @@ common:
4143
elastic/vault-secrets#v0.1.0:
4244
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
4345
field: "apiKey"
44-
env_var: "EC_API_KEY"
46+
env_var: "EC_API_KEY"
4547

4648
steps:
4749
- label: Start ESS stack for integration tests
@@ -113,7 +115,7 @@ steps:
113115
image: "${IMAGE_WIN_2025}"
114116
plugins:
115117
- *vault_ec_key_prod
116-
118+
117119
- label: "Ubuntu:2404:amd64:sudo"
118120
depends_on: packaging-ubuntu-x86-64
119121
env:
@@ -298,7 +300,7 @@ steps:
298300
machineType: "n2-standard-8"
299301
image: "${IMAGE_UBUNTU_2404_X86_64}"
300302
plugins:
301-
- *vault_ec_key_prod
303+
- *vault_ec_key_prod
302304
matrix:
303305
- default
304306
- upgrade

.buildkite/integration.pipeline.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ env:
88
# Please do not change them manually.
99
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1752886846"
1010
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1752886846"
11+
# Remove AGENT_PACKAGE_VERSION and BEAT_VERSION pinning once 9.1.1 DRA and stack are released
12+
AGENT_PACKAGE_VERSION: "9.1.0"
13+
BEAT_VERSION: "9.1.0"
1114

1215
steps:
1316
- group: "Integration tests: packaging"

.buildkite/scripts/buildkite-integration-tests.ps1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ go install gotest.tools/gotestsum
2525
gotestsum --version
2626

2727
$env:TEST_BINARY_NAME = "elastic-agent"
28-
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
29-
$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
30-
$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
28+
if (-not $env:AGENT_VERSION) {
29+
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
30+
$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
31+
$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
32+
}
3133

3234
Write-Output "~~~ Agent version: $env:AGENT_VERSION"
3335
$env:SNAPSHOT = $true

.buildkite/scripts/buildkite-integration-tests.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ echo "~~~ Running integration tests as $USER"
3737

3838
make install-gotestsum
3939

40-
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
41-
AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
42-
AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
40+
if [[ -z "${AGENT_VERSION:-}" ]]; then
41+
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
42+
AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
43+
AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
44+
fi
4345

4446
export AGENT_VERSION
4547
echo "~~~ Agent version: ${AGENT_VERSION}"

.buildkite/scripts/common.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ fi
99
if [[ -z "${SETUP_GVM_VERSION-""}" ]]; then
1010
SETUP_GVM_VERSION="v0.5.2" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
1111
fi
12-
BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
13-
export BEAT_VERSION
12+
13+
if [[ -z "${BEAT_VERSION-""}" ]]; then
14+
BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
15+
export BEAT_VERSION
16+
fi
1417

1518
getOSOptions() {
1619
case $(uname | tr '[:upper:]' '[:lower:]') in

deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ crds:
1717
defaultCRConfig:
1818
image:
1919
repository: "docker.elastic.co/elastic-agent/elastic-agent"
20-
tag: "9.1.0"
20+
tag: "9.1.1"
2121
targetAllocator:
2222
enabled: false # Enable/disable the Operator's Target allocator.
2323
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator

deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ crds:
1717
defaultCRConfig:
1818
image:
1919
repository: "docker.elastic.co/elastic-agent/elastic-agent"
20-
tag: "9.1.0"
20+
tag: "9.1.1"
2121
targetAllocator:
2222
enabled: false # Enable/disable the Operator's Target allocator.
2323
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator

deploy/helm/edot-collector/kube-stack/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ crds:
1717
defaultCRConfig:
1818
image:
1919
repository: "docker.elastic.co/elastic-agent/elastic-agent"
20-
tag: "9.1.0"
20+
tag: "9.1.1"
2121
targetAllocator:
2222
enabled: false # Enable/disable the Operator's Target allocator.
2323
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator

deploy/helm/elastic-agent/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: elastic-agent
33
description: Elastic-Agent Helm Chart
44
kubeVersion: ">= 1.27.0-0"
55
type: application
6-
appVersion: 9.1.0
7-
version: 9.1.0-beta
6+
appVersion: 9.1.1
7+
version: 9.1.1-beta
88
dependencies:
99
- name: kube-state-metrics
1010
version: "5.30.1"

0 commit comments

Comments
 (0)