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.

Sign up for GitHub

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

Add Cassandra 4.0.15, DSE versions 6.8.52 and 6.9.4 to build matrix #570

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Add Cassandra 4.0.15, DSE versions 6.8.52 and 6.9.4 to build matrix #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3b0a09
Add Cassandra 4.0.15, DSE versions 6.8.52 and 6.9.4 to build matrix
burmanm Nov 19, 2024
a4f3d6f
Update CHANGELOG.md
burmanm Nov 20, 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
20 changes: 10 additions & 10 deletions .github/workflows/docker-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47, 6.8.48, 6.8.49, 6.8.50, 6.8.51]
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47, 6.8.48, 6.8.49, 6.8.50, 6.8.51, 6.8.52]
image-base: [jdk8, jdk11]
include:
- dse-version: 6.8.51
- dse-version: 6.8.52
latest: true
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -108,10 +108,10 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47, 6.8.48, 6.8.49, 6.8.50, 6.8.51]
dse-version: [6.8.25, 6.8.26, 6.8.28, 6.8.29, 6.8.30, 6.8.31, 6.8.32, 6.8.33, 6.8.34, 6.8.35, 6.8.36, 6.8.37, 6.8.38, 6.8.39, 6.8.40, 6.8.41, 6.8.42, 6.8.43, 6.8.44, 6.8.46, 6.8.47, 6.8.48, 6.8.49, 6.8.50, 6.8.51, 6.8.52]
image-base: [ubi8]
include:
- dse-version: 6.8.51
- dse-version: 6.8.52
latest: true
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -259,9 +259,9 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
cassandra-version: [4.0.0, 4.0.1, 4.0.3, 4.0.4, 4.0.5, 4.0.6, 4.0.7, 4.0.8, 4.0.9, 4.0.10, 4.0.11, 4.0.12, 4.0.13, 4.0.14]
cassandra-version: [4.0.0, 4.0.1, 4.0.3, 4.0.4, 4.0.5, 4.0.6, 4.0.7, 4.0.8, 4.0.9, 4.0.10, 4.0.11, 4.0.12, 4.0.13, 4.0.14, 4.0.15]
include:
- cassandra-version: 4.0.14
- cassandra-version: 4.0.15
latest: true
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -464,10 +464,10 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
dse-version: [6.9.0, 6.9.1, 6.9.2, 6.9.3]
dse-version: [6.9.0, 6.9.1, 6.9.2, 6.9.3, 6.9.4]
image-base: [jdk11]
include:
- dse-version: 6.9.3
- dse-version: 6.9.4
Comment on lines +467 to +470
Copy link
Contributor

Choose a reason for hiding this comment

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

comment:
As of DSE 6.9.4, the k8ssandra management API is bundled in and the dse_server images produced should work with the K8ssandra stack. Going forward, we shouldn't have to update the DSE 6.9 images any more in this project. However, I still need to figure out a testing strategy as we'll now have a small chicken-and-egg problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are those dse-server updates pushed to datastax/dse-mgmtapi-6_8 also?

Copy link
Contributor

Choose a reason for hiding this comment

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

If you mean DSE 6.8 server images, the answer is "no". Only DSE 6.9 images have the k8ssandra Management API, and only since 6.9.3. However, the 6.9.3 image that was built did not have the changes necessary for it to load the Management API agent, so it's effectively broken in that image. That was fixed in 6.9.4.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I mean 6.9 also. We load 6.9 images from datastax/dse-mgmtapi-6_8 repository. So we need 6.8 and 6.9 images in that repository to use them, the dse-server repository is not used by us.

latest: true
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -535,10 +535,10 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
dse-version: [6.9.0, 6.9.1, 6.9.2, 6.9.3]
dse-version: [6.9.0, 6.9.1, 6.9.2, 6.9.3, 6.9.4]
image-base: [ubi8]
include:
- dse-version: 6.9.3
- dse-version: 6.9.4
latest: true
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect
## unreleased

* [FEATURE] [#566](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/566) Add listRoles and dropRole functionality to the REST interface
* [FEATURE] [#571](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/571) Add Cassandra 4.0.15 to the build matrix
* [FEATURE] [#569](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/569) Add DSE 6.9.4 to the build matrix
* [FEATURE] [#568](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/568) Add DSE 6.8.52 to the build matrix

## v0.1.89 (2024-10-29)
* [BUGFIX] [#564](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/564) Fix LatencyMetrics for DSE
Expand Down
59 changes: 30 additions & 29 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,34 @@

The following versions of Cassandra and DSE are published to Docker and supported:

| Cassandra 4.0.x | Cassandra 4.1.x | Cassandra 5.0.x | DSE 6.8.x | DSE 6.9.x | HCD 1.0.x |
| --------------- | --------------- |-----------------| --------- | ------------- | ----------|
| 4.0.0 | 4.1.0 | 5.0.1 | 6.8.25 | 6.9.0 | 1.0.0 |
| 4.0.1 | 4.1.1 | 5.0.2 | 6.8.26 | 6.9.1 | |
| 4.0.3 | 4.1.2 | | 6.8.28 | 6.9.2 | |
| 4.0.4 | 4.1.3 | | 6.8.29 | | |
| 4.0.5 | 4.1.4 | | 6.8.30 | | |
| 4.0.6 | 4.1.5 | | 6.8.31 | | |
| 4.0.7 | 4.1.6 | | 6.8.32 | | |
| 4.0.8 | 4.1.7 | | 6.8.33 | | |
| 4.0.9 | | | 6.8.34 | | |
| 4.0.10 | | | 6.8.35 | | |
| 4.0.11 | | | 6.8.36 | | |
| 4.0.12 | | | 6.8.37 | | |
| 4.0.13 | | | 6.8.38 | | |
| 4.0.14 | | | 6.8.39 | | |
| | | | 6.8.40 | | |
| | | | 6.8.41 | | |
| | | | 6.8.42 | | |
| | | | 6.8.43 | | |
| | | | 6.8.44 | | |
| | | | 6.8.46 | | |
| | | | 6.8.47 | | |
| | | | 6.8.48 | | |
| | | | 6.8.49 | | |
| | | | 6.8.50 | | |
| | | | 6.8.51 | | |
| Cassandra 4.0.x | Cassandra 4.1.x | Cassandra 5.0.x | DSE 6.8.x | DSE 6.9.x | HCD 1.0.x |
|-----------------| --------------- |-----------------|-----------|-----------| ----------|
| 4.0.0 | 4.1.0 | 5.0.1 | 6.8.25 | 6.9.0 | 1.0.0 |
| 4.0.1 | 4.1.1 | 5.0.2 | 6.8.26 | 6.9.1 | |
| 4.0.3 | 4.1.2 | | 6.8.28 | 6.9.2 | |
| 4.0.4 | 4.1.3 | | 6.8.29 | 6.9.3 | |
| 4.0.5 | 4.1.4 | | 6.8.30 | 6.9.4 | |
| 4.0.6 | 4.1.5 | | 6.8.31 | | |
| 4.0.7 | 4.1.6 | | 6.8.32 | | |
| 4.0.8 | 4.1.7 | | 6.8.33 | | |
| 4.0.9 | | | 6.8.34 | | |
| 4.0.10 | | | 6.8.35 | | |
| 4.0.11 | | | 6.8.36 | | |
| 4.0.12 | | | 6.8.37 | | |
| 4.0.13 | | | 6.8.38 | | |
| 4.0.14 | | | 6.8.39 | | |
| 4.0.15 | | | 6.8.40 | | |
| | | | 6.8.41 | | |
| | | | 6.8.42 | | |
| | | | 6.8.43 | | |
| | | | 6.8.44 | | |
| | | | 6.8.46 | | |
| | | | 6.8.47 | | |
| | | | 6.8.48 | | |
| | | | 6.8.49 | | |
| | | | 6.8.50 | | |
| | | | 6.8.51 | | |
| | | | 6.8.52 | | |

- Apache Cassandra images are available in `linux/amd64` or `linux/arm64` formats. The DSE images are available only in the `linux/amd64` format.
- All images (with the exception of Cassandra 5.0) are available as an Ubuntu based image or a RedHat UBI 8 based image.
Expand Down Expand Up @@ -329,9 +330,9 @@ For building an image based on DSE 6.9, see the [DSE 6.9 README](management-api-
By default, all images will listen on port 8080 for Management API connections. This can be overridden by specifying
the environment variable `MGMT_API_LISTEN_TCP_PORT` and setting it to your desired port. For example:

> docker run -e USE_MGMT_API=true -e MGMT_API_LISTEN_TCP_PORT=9090 -p 9090:9090 k8ssandra/cass-management-api:4.0.14
> docker run -e USE_MGMT_API=true -e MGMT_API_LISTEN_TCP_PORT=9090 -p 9090:9090 k8ssandra/cass-management-api:4.0.15

The above would run a Cassandra 4.0.14 image with Management API listening on port 9090 (instead of 8080).
The above would run a Cassandra 4.0.15 image with Management API listening on port 9090 (instead of 8080).
Comment on lines +333 to +335
Copy link
Contributor

Choose a reason for hiding this comment

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

nit:
You don't have to change this every time. This is just a README example.


## Usage with DSE

Expand Down
2 changes: 1 addition & 1 deletion cassandra/Dockerfile-4.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG CASSANDRA_VERSION=4.0.14
ARG CASSANDRA_VERSION=4.0.15

FROM --platform=$BUILDPLATFORM maven:3.8.7-eclipse-temurin-11 AS builder

Expand Down
2 changes: 1 addition & 1 deletion cassandra/Dockerfile-4.0.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG UBI_MAJOR=8
ARG UBI_BASETAG=latest
ARG CASSANDRA_VERSION=4.0.14
ARG CASSANDRA_VERSION=4.0.15
FROM registry.access.redhat.com/ubi${UBI_MAJOR}/ubi-minimal:${UBI_BASETAG} AS builder

ARG URL_PREFIX=https://dlcdn.apache.org/cassandra
Expand Down
2 changes: 1 addition & 1 deletion dse/Dockerfile-dse6.8.jdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright DataStax, Inc, 2017
# Please review the included LICENSE file for more information.
#
ARG DSE_VERSION=6.8.51
ARG DSE_VERSION=6.8.52
ARG DS_BASE_DEBIAN=ds-base-ubuntu-openjdk-11
ARG BASETAG=11.0.22-jdk-ubuntu-20240427
FROM datastax/${DS_BASE_DEBIAN}:${BASETAG} AS dse-server-prep
Expand Down
2 changes: 1 addition & 1 deletion dse/Dockerfile-dse6.8.jdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright DataStax, Inc, 2017
# Please review the included LICENSE file for more information.
#
ARG DSE_VERSION=6.8.51
ARG DSE_VERSION=6.8.52
ARG DS_BASE_DEBIAN=ds-base-ubuntu-openjdk-8
ARG BASETAG=8u402-jdk-ubuntu-20240427
FROM datastax/${DS_BASE_DEBIAN}:${BASETAG} AS dse-server-prep
Expand Down
2 changes: 1 addition & 1 deletion dse/Dockerfile-dse6.8.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DSE_VERSION=6.8.51
ARG DSE_VERSION=6.8.52
ARG UBI_MAJOR=8
ARG UBI_BASETAG=latest
ARG DSE_BASE_IMAGE=datastax/dse-mgmtapi-6_8:${DSE_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion dse/Dockerfile-dse6.9.jdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright DataStax, Inc, 2017
# Please review the included LICENSE file for more information.
#
ARG DSE_VERSION=6.9.3
ARG DSE_VERSION=6.9.4
ARG DS_BASE_DEBIAN=ds-base-ubuntu-openjdk-11
ARG BASETAG=11.0.22-jdk-ubuntu-20240427
FROM datastax/${DS_BASE_DEBIAN}:${BASETAG} AS dse-server-prep
Expand Down
2 changes: 1 addition & 1 deletion dse/Dockerfile-dse6.9.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DSE_VERSION=6.9.3
ARG DSE_VERSION=6.9.4
ARG UBI_MAJOR=8
ARG UBI_BASETAG=latest
ARG DSE_BASE_IMAGE=datastax/dse-mgmtapi-6_8:${DSE_VERSION}-jdk11
Expand Down
2 changes: 1 addition & 1 deletion management-api-agent-dse-6.8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</repository>
</repositories>
<properties>
<dse.version>6.8.51</dse.version>
<dse.version>6.8.52</dse.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion management-api-agent-dse-6.9/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</repository>
</repositories>
<properties>
<dse.version>6.9.3</dse.version>
<dse.version>6.9.4</dse.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<build.version.file>build_version.sh</build.version.file>
<revision>0.1.0-SNAPSHOT</revision>
<driver.version>4.15.0</driver.version>
<cassandra4.version>4.0.14</cassandra4.version>
<cassandra4.version>4.0.15</cassandra4.version>
<docker.java.version>3.3.6</docker.java.version>
<junit.version>4.13.2</junit.version>
<assertj.version>3.17.2</assertj.version>
Expand Down
Loading