Skip to content

Commit bdeb8e6

Browse files
authored
Remove support for Cassandra 3.x and add Cassandra 5.x (jaegertracing#5962)
## Which problem is this PR solving? - Part of jaegertracing#5160 ## Description of the changes - Deprecated Cassandra 3.x as it was marked EOL - Enabled CI testing and schema generation for 5.x which GA-ed on 09/05 (https://cassandra.apache.org/_/download.html) ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Mahad Zaryab <[email protected]>
1 parent d46a232 commit bdeb8e6

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ updates:
7272
update-types: [ "version-update:semver-major" ]
7373
- package-ecosystem: docker
7474
directories:
75-
- /docker-compose/cassandra/v3
7675
- /docker-compose/cassandra/v4
76+
- /docker-compose/cassandra/v5
7777
schedule:
7878
interval: daily
7979
ignore:

.github/workflows/ci-e2e-cassandra.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
matrix:
2323
jaeger-version: [v1, v2]
2424
version:
25-
- distribution: cassandra
26-
major: 3.x
27-
schema: v003
2825
- distribution: cassandra
2926
major: 4.x
3027
schema: v004
28+
- distribution: cassandra
29+
major: 5.x
30+
schema: v004
3131
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.jaeger-version }}
3232
steps:
3333
- name: Harden Runner

docker-compose/cassandra/v3/docker-compose.yaml docker-compose/cassandra/v5/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
cassandra:
3-
image: cassandra:3.11
3+
image: cassandra:5.0
44
ports:
55
- "9042:9042"
66
- "9160:9160"

plugin/storage/cassandra/schema/create.sh

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ if [[ "$template" == "" ]]; then
3535
4)
3636
template=$(dirname $0)/v004.cql.tmpl
3737
;;
38+
5)
39+
template=$(dirname $0)/v004.cql.tmpl
40+
;;
3841
*)
3942
template=$(ls $(dirname $0)/*cql.tmpl | sort | tail -1)
4043
;;

renovate.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"packageRules": [
1616
{
1717
"matchFileNames": [
18-
"docker-compose/cassandra/v3/docker-compose.yaml",
1918
"docker-compose/cassandra/v4/docker-compose.yaml",
19+
"docker-compose/cassandra/v5/docker-compose.yaml",
2020
"docker-compose/elasticsearch/v6/docker-compose.yml",
2121
"docker-compose/elasticsearch/v7/docker-compose.yml",
2222
"docker-compose/elasticsearch/v8/docker-compose.yml",

0 commit comments

Comments
 (0)