From b3b0a09326c70f970fe301f3ad13f200f8a54352 Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Tue, 19 Nov 2024 14:45:45 +0200 Subject: [PATCH 1/2] Add Cassandra 4.0.15, DSE versions 6.8.52 and 6.9.4 to build matrix --- .github/workflows/docker-release.yaml | 20 ++++----- CHANGELOG.md | 3 ++ README.md | 59 ++++++++++++++------------- cassandra/Dockerfile-4.0 | 2 +- cassandra/Dockerfile-4.0.ubi8 | 2 +- dse/Dockerfile-dse6.8.jdk11 | 2 +- dse/Dockerfile-dse6.8.jdk8 | 2 +- dse/Dockerfile-dse6.8.ubi8 | 2 +- dse/Dockerfile-dse6.9.jdk11 | 2 +- dse/Dockerfile-dse6.9.ubi8 | 2 +- management-api-agent-dse-6.8/pom.xml | 2 +- management-api-agent-dse-6.9/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 53 insertions(+), 49 deletions(-) diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml index 61e8dfb8..00392fd8 100644 --- a/.github/workflows/docker-release.yaml +++ b/.github/workflows/docker-release.yaml @@ -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: @@ -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: @@ -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: @@ -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 latest: true runs-on: ubuntu-latest steps: @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 413b9f1b..7075505f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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] [#](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/) Add Cassandra 4.0.15 to the build matrix +* [FEATURE] [#](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/) Add DSE 6.9.4 to the build matrix +* [FEATURE] [#](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/) 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 diff --git a/README.md b/README.md index 54e708d7..ecb77fd6 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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). ## Usage with DSE diff --git a/cassandra/Dockerfile-4.0 b/cassandra/Dockerfile-4.0 index 24bfd691..f173da38 100644 --- a/cassandra/Dockerfile-4.0 +++ b/cassandra/Dockerfile-4.0 @@ -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 diff --git a/cassandra/Dockerfile-4.0.ubi8 b/cassandra/Dockerfile-4.0.ubi8 index a23b4f2e..1708522f 100644 --- a/cassandra/Dockerfile-4.0.ubi8 +++ b/cassandra/Dockerfile-4.0.ubi8 @@ -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 diff --git a/dse/Dockerfile-dse6.8.jdk11 b/dse/Dockerfile-dse6.8.jdk11 index 0925ebc2..436ac26f 100644 --- a/dse/Dockerfile-dse6.8.jdk11 +++ b/dse/Dockerfile-dse6.8.jdk11 @@ -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 diff --git a/dse/Dockerfile-dse6.8.jdk8 b/dse/Dockerfile-dse6.8.jdk8 index fab033a0..17e4e8b3 100644 --- a/dse/Dockerfile-dse6.8.jdk8 +++ b/dse/Dockerfile-dse6.8.jdk8 @@ -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 diff --git a/dse/Dockerfile-dse6.8.ubi8 b/dse/Dockerfile-dse6.8.ubi8 index 014243a8..d93121cf 100644 --- a/dse/Dockerfile-dse6.8.ubi8 +++ b/dse/Dockerfile-dse6.8.ubi8 @@ -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} diff --git a/dse/Dockerfile-dse6.9.jdk11 b/dse/Dockerfile-dse6.9.jdk11 index 84754c95..643d3617 100644 --- a/dse/Dockerfile-dse6.9.jdk11 +++ b/dse/Dockerfile-dse6.9.jdk11 @@ -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 diff --git a/dse/Dockerfile-dse6.9.ubi8 b/dse/Dockerfile-dse6.9.ubi8 index d8374989..a99795c2 100644 --- a/dse/Dockerfile-dse6.9.ubi8 +++ b/dse/Dockerfile-dse6.9.ubi8 @@ -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 diff --git a/management-api-agent-dse-6.8/pom.xml b/management-api-agent-dse-6.8/pom.xml index 30178baa..d66057b5 100644 --- a/management-api-agent-dse-6.8/pom.xml +++ b/management-api-agent-dse-6.8/pom.xml @@ -30,7 +30,7 @@ - 6.8.51 + 6.8.52 diff --git a/management-api-agent-dse-6.9/pom.xml b/management-api-agent-dse-6.9/pom.xml index 29dab985..9d8a004e 100644 --- a/management-api-agent-dse-6.9/pom.xml +++ b/management-api-agent-dse-6.9/pom.xml @@ -30,7 +30,7 @@ - 6.9.3 + 6.9.4 diff --git a/pom.xml b/pom.xml index 1dc19a99..b8ac3c3e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ build_version.sh 0.1.0-SNAPSHOT 4.15.0 - 4.0.14 + 4.0.15 3.3.6 4.13.2 3.17.2 From a4f3d6f5ee1efcf4b2d7963e909ad30600722ee0 Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Wed, 20 Nov 2024 14:26:53 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md Co-authored-by: Erik Merkle --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7075505f..c683a8ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,9 +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] [#](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/) Add Cassandra 4.0.15 to the build matrix -* [FEATURE] [#](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/) Add DSE 6.9.4 to the build matrix -* [FEATURE] [#](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/) Add DSE 6.8.52 to the build matrix +* [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