Skip to content

Commit

Permalink
Remove support for Cassandra 3.x and add Cassandra 5.x (#5962)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
-  Part of #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 <mahadzaryab1@gmail.com>
  • Loading branch information
mahadzaryab1 authored Sep 10, 2024
1 parent d46a232 commit bdeb8e6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ updates:
update-types: [ "version-update:semver-major" ]
- package-ecosystem: docker
directories:
- /docker-compose/cassandra/v3
- /docker-compose/cassandra/v4
- /docker-compose/cassandra/v5
schedule:
interval: daily
ignore:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-e2e-cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
matrix:
jaeger-version: [v1, v2]
version:
- distribution: cassandra
major: 3.x
schema: v003
- distribution: cassandra
major: 4.x
schema: v004
- distribution: cassandra
major: 5.x
schema: v004
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.jaeger-version }}
steps:
- name: Harden Runner
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
cassandra:
image: cassandra:3.11
image: cassandra:5.0
ports:
- "9042:9042"
- "9160:9160"
Expand Down
3 changes: 3 additions & 0 deletions plugin/storage/cassandra/schema/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ if [[ "$template" == "" ]]; then
4)
template=$(dirname $0)/v004.cql.tmpl
;;
5)
template=$(dirname $0)/v004.cql.tmpl
;;
*)
template=$(ls $(dirname $0)/*cql.tmpl | sort | tail -1)
;;
Expand Down
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"packageRules": [
{
"matchFileNames": [
"docker-compose/cassandra/v3/docker-compose.yaml",
"docker-compose/cassandra/v4/docker-compose.yaml",
"docker-compose/cassandra/v5/docker-compose.yaml",
"docker-compose/elasticsearch/v6/docker-compose.yml",
"docker-compose/elasticsearch/v7/docker-compose.yml",
"docker-compose/elasticsearch/v8/docker-compose.yml",
Expand Down

0 comments on commit bdeb8e6

Please sign in to comment.