Skip to content

[Post 3.1] Update stack versions in recipes/samples and e2e matrix #8776

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 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 3 additions & 3 deletions .buildkite/e2e/nightly-main-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
- E2E_STACK_VERSION: "8.18.0"
# current stack version 9.0.0 is tested in all other tests no need to test it again
- E2E_STACK_VERSION: "8.19.0-SNAPSHOT"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- E2E_STACK_VERSION: "8.19.0-SNAPSHOT"
- E2E_STACK_VERSION: "8.19.0"

8.19.0 should have been released in tandem with 9.1.0 I believe.

Copy link
Collaborator

@pebrc pebrc Jul 30, 2025

Choose a reason for hiding this comment

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

I guess the other question is whether we would like to replace 8.18. with 8.19 on L6. And keep 8.19.0-SNAPSHOT for future patch releases of the 8.19 branch here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess the other question is whether we would like to replace 8.18. with 8.19 on L6. And keep 8.19.0-SNAPSHOT for future patch releases of the 8.19 branch here.

This was my original plan, I forgot to update 8.18.0 on L6

- E2E_STACK_VERSION: "9.1.0-SNAPSHOT"
- E2E_STACK_VERSION: "9.2.0-SNAPSHOT"

- label: ocp
fixed:
E2E_PROVIDER: ocp
mixed:
## Test the current stack version.
- E2E_STACK_VERSION: "9.0.0"
- E2E_STACK_VERSION: "9.1.0"
## Also test the next stack version to detect any change in the images that might not be compatible with the CRI-O runtime.
- E2E_STACK_VERSION: "9.1.0-SNAPSHOT"
- E2E_STACK_VERSION: "9.2.0-SNAPSHOT"

- label: kind
fixed:
Expand Down
10 changes: 6 additions & 4 deletions .buildkite/e2e/release-branch-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
- E2E_STACK_VERSION: "8.14.3"
- E2E_STACK_VERSION: "8.15.4"
- E2E_STACK_VERSION: "8.16.6"
- E2E_STACK_VERSION: "8.17.5"
- E2E_STACK_VERSION: "8.18.0"
# current stack version 9.0.0 is tested in all other tests no need to test it again
- E2E_STACK_VERSION: "8.17.9"
- E2E_STACK_VERSION: "8.18.4"
- E2E_STACK_VERSION: "8.19.0"
- E2E_STACK_VERSION: "9.0.4"
# current stack version 9.1.0 is tested in all other tests no need to test it again
- E2E_STACK_VERSION: "8.19.0-SNAPSHOT"
- E2E_STACK_VERSION: "9.1.0-SNAPSHOT"
- E2E_STACK_VERSION: "9.2.0-SNAPSHOT"

- label: kind
fixed:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ drivah-build-e2e:

# -- run

E2E_STACK_VERSION ?= 9.0.0
E2E_STACK_VERSION ?= 9.1.0
# regexp to filter tests to run
export TESTS_MATCH ?= "^Test"
export E2E_JSON ?= false
Expand Down
2 changes: 1 addition & 1 deletion config/e2e/helm-monitoring-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ managedNamespaces: [{{ .E2ENamespace }}]

image:
repository: docker.elastic.co/eck/eck-operator
tag: 3.0.0
tag: 3.1.0

podAnnotations:
co.elastic.metrics/metricsets: collector
Expand Down
4 changes: 2 additions & 2 deletions config/e2e/monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: e2e-agent
namespace: {{ .E2ENamespace }}
spec:
version: 9.0.0
version: 9.1.0
elasticsearchRefs:
- secretName: eck-{{ .TestRun }}
daemonSet:
Expand Down Expand Up @@ -227,7 +227,7 @@ spec:
meta:
package:
name: system
version: 9.0.0
version: 9.1.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have to check this one, IIUC Agent packages have a different lifecycle.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Last version of package system seems to be 2.5.1, not sure why we have the stack version here. I'm wondering it is not a bug in update-stack-version.sh.

image

data_stream:
namespace: default
processors:
Expand Down
2 changes: 1 addition & 1 deletion config/recipes/apm-server-jaeger/apm-server-jaeger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: apm-server-quickstart
namespace: default
spec:
version: 9.0.0
version: 9.1.0
count: 1
config:
name: elastic-apm
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/associations-rbac/apm_es_kibana_rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ metadata:
name: elasticsearch-sample
namespace: elasticsearch-ns
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 1
Expand All @@ -97,7 +97,7 @@ metadata:
name: kibana-sample
namespace: kibana-ns
spec:
version: 9.0.0
version: 9.1.0
count: 1
config:
xpack.fleet.packages:
Expand All @@ -115,7 +115,7 @@ metadata:
name: apm-apm-sample
namespace: apmserver-ns
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: "elasticsearch-sample"
Expand Down
2 changes: 1 addition & 1 deletion config/recipes/autopilot/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 1
Expand Down
8 changes: 4 additions & 4 deletions config/recipes/autopilot/fleet-kubernetes-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 1
Expand Down Expand Up @@ -74,7 +74,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down Expand Up @@ -138,7 +138,7 @@ kind: Agent
metadata:
name: fleet-server
spec:
version: 9.0.0
version: 9.1.0
kibanaRef:
name: kibana
elasticsearchRefs:
Expand Down Expand Up @@ -179,7 +179,7 @@ kind: Agent
metadata:
name: elastic-agent
spec:
version: 9.0.0
version: 9.1.0
kibanaRef:
name: kibana
fleetServerRef:
Expand Down
4 changes: 2 additions & 2 deletions config/recipes/autopilot/kubernetes-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand All @@ -27,7 +27,7 @@ kind: Agent
metadata:
name: elastic-agent
spec:
version: 9.0.0
version: 9.1.0
elasticsearchRefs:
- name: elasticsearch
daemonSet:
Expand Down
4 changes: 2 additions & 2 deletions config/recipes/autopilot/metricbeat_hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand All @@ -28,7 +28,7 @@ metadata:
name: metricbeat
spec:
type: metricbeat
version: 9.0.0
version: 9.1.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down
2 changes: 1 addition & 1 deletion config/recipes/autoscaling/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch-sample
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: master
count: 3
Expand Down
8 changes: 4 additions & 4 deletions config/recipes/beats/auditbeat_hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: auditbeat
spec:
type: auditbeat
version: 9.0.0
version: 9.1.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
# path: /run
#initContainers:
#- name: cos-init
# image: docker.elastic.co/beats/auditbeat:9.0.0
# image: docker.elastic.co/beats/auditbeat:9.1.0
# volumeMounts:
# - name: run
# mountPath: /run
Expand Down Expand Up @@ -118,7 +118,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 3
Expand All @@ -130,7 +130,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/filebeat_autodiscover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 9.0.0
version: 9.1.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -122,7 +122,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 3
Expand All @@ -134,7 +134,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/filebeat_autodiscover_by_metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 9.0.0
version: 9.1.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -118,7 +118,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 3
Expand All @@ -130,7 +130,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/filebeat_no_autodiscover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 9.0.0
version: 9.1.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -60,7 +60,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 3
Expand All @@ -72,7 +72,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/heartbeat_es_kb_health.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: heartbeat
spec:
type: heartbeat
version: 9.0.0
version: 9.1.0
elasticsearchRef:
name: elasticsearch
config:
Expand All @@ -27,7 +27,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 3
Expand All @@ -39,7 +39,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/metricbeat_hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: metricbeat
spec:
type: metricbeat
version: 9.0.0
version: 9.1.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -174,7 +174,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 9.0.0
version: 9.1.0
nodeSets:
- name: default
count: 3
Expand All @@ -186,7 +186,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 9.0.0
version: 9.1.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
Loading