Skip to content
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

prepare 9.0 and 8.x #13978

Merged
merged 6 commits into from
Sep 11, 2024
Merged
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
23 changes: 23 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,20 @@ pull_request_rules:
branches, such as:
* `backport-7.17` is the label to automatically backport to the 7.17 branch.
* `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit.
* `backport-8.x` is the label to automatically backport to the `8.x` branch.

**NOTE**: `backport-skip` has been added to this pull request.
label:
add:
- backport-skip
- name: add backport-8.x for the all the PRs targetting main
conditions:
- -label~=^backport-\d
- base=main
actions:
label:
add:
- backport-8.x
- name: remove backport-skip label
conditions:
- label~=^backport-\d
Expand Down Expand Up @@ -360,3 +369,17 @@ pull_request_rules:
labels:
- "backport"
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
- name: backport patches to 8.x branch
conditions:
- merged
- base=main
- label=backport-8.x
actions:
backport:
assignees:
- "{{ author }}"
branches:
- "8.x"
labels:
- "backport"
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
2 changes: 1 addition & 1 deletion cmd/intake-receiver/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
package main

// version matches the APM Server's version
const version = "8.16.0"
const version = "9.0.0"
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ x-logging: &default-logging
max-size: "1g"
services:
elasticsearch:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0-3a37a73c-SNAPSHOT
ports:
- 9200:9200
Expand Down Expand Up @@ -41,6 +42,7 @@ services:
logging: *default-logging

kibana:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
image: docker.elastic.co/kibana/kibana:8.16.0-3a37a73c-SNAPSHOT
ports:
- 5601:5601
Expand All @@ -60,6 +62,7 @@ services:
logging: *default-logging

metricbeat:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
image: docker.elastic.co/beats/metricbeat:8.16.0-3a37a73c-SNAPSHOT
environment:
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
package version

// Version holds the APM Server version.
const Version = "8.16.0"
const Version = "9.0.0"
1 change: 1 addition & 0 deletions testing/infra/k8s/base/stack/apm-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ApmServer
metadata:
name: apm-server
spec:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
version: 8.16.0-3a37a73c-SNAPSHOT
count: 1
http:
Expand Down
1 change: 1 addition & 0 deletions testing/infra/k8s/base/stack/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
version: 8.16.0-3a37a73c-SNAPSHOT
auth:
fileRealm:
Expand Down
1 change: 1 addition & 0 deletions testing/infra/k8s/base/stack/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Kibana
metadata:
name: kibana
spec:
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
version: 8.16.0-3a37a73c-SNAPSHOT
count: 1
elasticsearchRef:
Expand Down
Loading