Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove support for Cassandra 3.x and add Cassandra 5.x #5962

Merged
merged 6 commits into from
Sep 10, 2024
Merged

Remove support for Cassandra 3.x and add Cassandra 5.x #5962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9e15e4
Deprecate Cassandra 3.x And Enable Test For 5.x
mahadzaryab1 Sep 9, 2024
3dc668a
Merge branch 'main' into deprecate-cassandra-3.x
mahadzaryab1 Sep 9, 2024
9366ac0
Add v5 To Dependabot And Renovate
mahadzaryab1 Sep 9, 2024
87626f5
Add docker-compose File For V5
mahadzaryab1 Sep 9, 2024
cc4120e
Remove Redundant Template File
mahadzaryab1 Sep 10, 2024
422d091
Fix Argument In Github Actions File
mahadzaryab1 Sep 10, 2024
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
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...-compose/cassandra/v3/docker-compose.yaml → ...-compose/cassandra/v5/docker-compose.yaml
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

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

I can see where the confusion about versions came about - but it's just a coincidence.

;;
*)
template=$(ls $(dirname $0)/*cql.tmpl | sort | tail -1)
;;
Expand Down
2 changes: 1 addition & 1 deletion renovate.json
View file
Open in desktop
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
Loading