Skip to content

Commit

Permalink
Bump Stack version to 8.7.0 / 8.8.0-SNAPSHOT (#6637)
Browse files Browse the repository at this point in the history
- Update Stack version to `8.7.0` in recipes and samples
- Prune EOL Stack versions `7.13.x`, `7.14.x`, `7.15.x`
- Test Stack versions `8.5.3`, `8.6.2`, `8.8.0-SNAPSHOT`
- Skip APM tests for stack version `8.5.3` (#6350)
  • Loading branch information
thbkrkr authored Apr 5, 2023
1 parent 001115e commit 0677242
Show file tree
Hide file tree
Showing 34 changed files with 92 additions and 92 deletions.
7 changes: 3 additions & 4 deletions .buildkite/e2e/nightly-main-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
E2E_PROVIDER: gke
mixed:
- E2E_STACK_VERSION: "6.8.23"
- E2E_STACK_VERSION: "7.13.4"
- E2E_STACK_VERSION: "7.14.2"
- E2E_STACK_VERSION: "7.15.2"
- E2E_STACK_VERSION: "7.16.3"
- E2E_STACK_VERSION: "7.17.8"
- E2E_STACK_VERSION: "8.0.1"
- E2E_STACK_VERSION: "8.1.3"
- E2E_STACK_VERSION: "8.2.3"
- E2E_STACK_VERSION: "8.3.3"
- E2E_STACK_VERSION: "8.4.3"
- E2E_STACK_VERSION: "8.7.0-SNAPSHOT"
- E2E_STACK_VERSION: "8.5.3"
- E2E_STACK_VERSION: "8.6.2"
- E2E_STACK_VERSION: "8.8.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 @@ -467,7 +467,7 @@ E2E_REGISTRY_NAMESPACE ?= eck-dev

E2E_IMG_TAG ?= $(IMG_VERSION)
E2E_IMG ?= $(REGISTRY)/$(E2E_REGISTRY_NAMESPACE)/eck-e2e-tests:$(E2E_IMG_TAG)
E2E_STACK_VERSION ?= 8.6.1
E2E_STACK_VERSION ?= 8.7.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/monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ spec:
meta:
package:
name: system
version: 8.6.1
version: 8.7.0
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: 8.6.1
version: 8.7.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: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 1
Expand All @@ -97,7 +97,7 @@ metadata:
name: kibana-sample
namespace: kibana-ns
spec:
version: 8.6.1
version: 8.7.0
count: 1
config:
xpack.fleet.packages:
Expand All @@ -115,7 +115,7 @@ metadata:
name: apm-apm-sample
namespace: apmserver-ns
spec:
version: 8.6.1
version: 8.7.0
count: 1
elasticsearchRef:
name: "elasticsearch-sample"
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: 8.6.1
version: 8.7.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: 8.6.1
version: 8.7.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:8.6.1
# image: docker.elastic.co/beats/auditbeat:8.7.0
# volumeMounts:
# - name: run
# mountPath: /run
Expand Down Expand Up @@ -118,7 +118,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -130,7 +130,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.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: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -100,7 +100,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -112,7 +112,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.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: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -102,7 +102,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -114,7 +114,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.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: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -53,7 +53,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -65,7 +65,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.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: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
config:
Expand All @@ -27,7 +27,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -39,7 +39,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.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: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -174,7 +174,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -186,7 +186,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
8 changes: 4 additions & 4 deletions config/recipes/beats/openshift_monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: metricbeat
spec:
type: metricbeat
version: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -221,7 +221,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -316,7 +316,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -328,7 +328,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
6 changes: 3 additions & 3 deletions config/recipes/beats/packetbeat_dns_http.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: packetbeat
spec:
type: packetbeat
version: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch
kibanaRef:
Expand Down Expand Up @@ -44,7 +44,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -56,7 +56,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down
12 changes: 6 additions & 6 deletions config/recipes/beats/stack_monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: metricbeat
spec:
type: metricbeat
version: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch-monitoring
config:
Expand Down Expand Up @@ -118,7 +118,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 8.6.1
version: 8.7.0
elasticsearchRef:
name: elasticsearch-monitoring
kibanaRef:
Expand Down Expand Up @@ -216,7 +216,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -232,7 +232,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.6.1
version: 8.7.0
count: 1
elasticsearchRef:
name: elasticsearch
Expand All @@ -249,7 +249,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch-monitoring
spec:
version: 8.6.1
version: 8.7.0
nodeSets:
- name: default
count: 3
Expand All @@ -261,7 +261,7 @@ kind: Kibana
metadata:
name: kibana-monitoring
spec:
version: 8.6.1
version: 8.7.0
count: 1
elasticsearchRef:
name: elasticsearch-monitoring
Expand Down
Loading

0 comments on commit 0677242

Please sign in to comment.