From c4703d3389a82945ef9d75de9172b6887721d8b3 Mon Sep 17 00:00:00 2001 From: Stefan Miklosovic Date: Fri, 6 Nov 2020 17:45:02 +0100 Subject: [PATCH] update to Cassandra 3.11.9 and 4.0-beta3 --- README.md | 2 +- buildenv/build-all | 12 ++++++------ buildenv/release-all | 12 ++++++------ docker/cassandra/Dockerfile | 2 +- docker/cassandra/Makefile | 8 ++++---- examples/default-values-config.yaml | 2 +- helm/cassandra/values.yaml | 2 +- java/cassandra-3-k8s-addons/pom.xml | 2 +- java/cassandra-4-k8s-addons/pom.xml | 2 +- test/cassandra-cluster-deployment-test.sh | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 49636079..0c966fac 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Currently user facing Cassandra cluster objects are created as [Kubernetes Custo ### Cassandra version support -We are currently building images for Cassandra 3.11.8 and 4.0-beta2. +We are currently building images for Cassandra 3.11.9 and 4.0-beta3. ## Documentation diff --git a/buildenv/build-all b/buildenv/build-all index 1936a33d..7bfe6e48 100755 --- a/buildenv/build-all +++ b/buildenv/build-all @@ -13,8 +13,8 @@ make function release_dev() { docker tag cassandra-operator:latest "${REGISTRY}/cassandra-operator:latest-dev" docker tag instaclustr-icarus:latest "${REGISTRY}/instaclustr-icarus:latest-dev" - docker tag cassandra-3.11.8:latest "${REGISTRY}/cassandra-3.11.8:latest-dev" - docker tag cassandra-4.0-beta2:latest "${REGISTRY}/cassandra-4.0-beta2:latest-dev" + docker tag cassandra-3.11.9:latest "${REGISTRY}/cassandra-3.11.9:latest-dev" + docker tag cassandra-4.0-beta3:latest "${REGISTRY}/cassandra-4.0-beta3:latest-dev" } function release_prod() { @@ -22,10 +22,10 @@ function release_prod() { docker tag cassandra-operator:latest "${REGISTRY}/cassandra-operator:latest" docker tag instaclustr-icarus:latest "${REGISTRY}/instaclustr-icarus:${TAG}" docker tag instaclustr-icarus:latest "${REGISTRY}/instaclustr-icarus:latest" - docker tag cassandra-3.11.8:latest "${REGISTRY}/cassandra-3.11.8:${TAG}" - docker tag cassandra-3.11.8:latest "${REGISTRY}/cassandra-3.11.8:latest" - docker tag cassandra-4.0-beta2:latest "${REGISTRY}/cassandra-4.0-beta2:${TAG}" - docker tag cassandra-4.0-beta2:latest "${REGISTRY}/cassandra-4.0-beta2:latest" + docker tag cassandra-3.11.9:latest "${REGISTRY}/cassandra-3.11.9:${TAG}" + docker tag cassandra-3.11.9:latest "${REGISTRY}/cassandra-3.11.9:latest" + docker tag cassandra-4.0-beta3:latest "${REGISTRY}/cassandra-4.0-beta3:${TAG}" + docker tag cassandra-4.0-beta3:latest "${REGISTRY}/cassandra-4.0-beta3:latest" } if [ "${1}" = "dev" ]; then diff --git a/buildenv/release-all b/buildenv/release-all index d72f7db1..91149955 100755 --- a/buildenv/release-all +++ b/buildenv/release-all @@ -17,10 +17,10 @@ function release_prod() { docker push "${REGISTRY}/cassandra-operator:latest" docker push "${REGISTRY}/instaclustr-icarus:${TAG}" docker push "${REGISTRY}/instaclustr-icarus:latest" - docker push "${REGISTRY}/cassandra-3.11.8:latest" - docker push "${REGISTRY}/cassandra-3.11.8:${TAG}" - docker push "${REGISTRY}/cassandra-4.0-beta2:latest" - docker push "${REGISTRY}/cassandra-4.0-beta2:${TAG}" + docker push "${REGISTRY}/cassandra-3.11.9:latest" + docker push "${REGISTRY}/cassandra-3.11.9:${TAG}" + docker push "${REGISTRY}/cassandra-4.0-beta3:latest" + docker push "${REGISTRY}/cassandra-4.0-beta3:${TAG}" fi } @@ -66,8 +66,8 @@ function release_helm() { function release_dev() { docker push "${REGISTRY}/cassandra-operator:latest-dev" docker push "${REGISTRY}/instaclustr-icarus:latest-dev" - docker push "${REGISTRY}/cassandra-3.11.8:latest-dev" - docker push "${REGISTRY}/cassandra-4.0-beta2:latest-dev" + docker push "${REGISTRY}/cassandra-3.11.9:latest-dev" + docker push "${REGISTRY}/cassandra-4.0-beta3:latest-dev" } trap defer EXIT diff --git a/docker/cassandra/Dockerfile b/docker/cassandra/Dockerfile index 1c6cd40e..5a101525 100644 --- a/docker/cassandra/Dockerfile +++ b/docker/cassandra/Dockerfile @@ -3,7 +3,7 @@ ARG openjre_image FROM ${openjre_image} ARG cassandra_major_version=3 -ARG cassandra_version=3.11.8 +ARG cassandra_version=3.11.9 ARG cassandra_exporter_version=0.9.10 ARG apache_mirror_url=https://dl.bintray.com/apache/cassandra/pool/main/c/cassandra ARG install_cassandra_exporter=true diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile index f3fd1f85..e7de606d 100644 --- a/docker/cassandra/Makefile +++ b/docker/cassandra/Makefile @@ -1,10 +1,10 @@ CASSANDRA_3_OPENJRE_IMAGE := $(if $(OPENJRE_IMAGE),$(OPENJRE_IMAGE),"base-openjre:stretch-8u252-b09-1-deb9u1") -CASSANDRA_3_VERSION := $(if $(CASSANDRA_VERSION),$(CASSANDRA_VERSION),"3.11.8") -CASSANDRA_3_VERSION_IMAGE_TAG := $(if $(CASSANDRA_VERSION),$(subst ~,-,$(CASSANDRA_VERSION)),"3.11.8") +CASSANDRA_3_VERSION := $(if $(CASSANDRA_VERSION),$(CASSANDRA_VERSION),"3.11.9") +CASSANDRA_3_VERSION_IMAGE_TAG := $(if $(CASSANDRA_VERSION),$(subst ~,-,$(CASSANDRA_VERSION)),"3.11.9") CASSANDRA_4_OPENJRE_IMAGE := $(if $(CASSANDRA_4_OPENJRE_IMAGE),$(CASSANDRA_4_OPENJRE_IMAGE),"base-openjre:buster-11.0.8-10-1-deb10u1") -CASSANDRA_4_VERSION=$(if $(CASSANDRA_VERSION),$(CASSANDRA_VERSION),"4.0~beta2") -CASSANDRA_4_VERSION_IMAGE_TAG := $(if $(CASSANDRA_4_VERSION),$(subst ~,-,$(CASSANDRA_4_VERSION)),"4.0~beta2") +CASSANDRA_4_VERSION=$(if $(CASSANDRA_VERSION),$(CASSANDRA_VERSION),"4.0~beta3") +CASSANDRA_4_VERSION_IMAGE_TAG := $(if $(CASSANDRA_4_VERSION),$(subst ~,-,$(CASSANDRA_4_VERSION)),"4.0~beta3") CASSANDRA_EXPORTER_VERSION := $(if $(CASSANDRA_EXPORTER_VERSION),$(CASSANDRA_EXPORTER_VERSION),"0.9.10") CASSANDRA_K8S_ADDONS_VERSION := $(if $(CASSANDRA_K8S_ADDONS_VERSION),$(CASSANDRA_K8S_ADDONS_VERSION),"1.0.2") diff --git a/examples/default-values-config.yaml b/examples/default-values-config.yaml index 3773bc12..a39dbeb7 100644 --- a/examples/default-values-config.yaml +++ b/examples/default-values-config.yaml @@ -4,7 +4,7 @@ metadata: name: cassandra-operator-default-config data: nodes: "3" - cassandraImage: gcr.io/cassandra-operator/cassandra-3.11.8:latest + cassandraImage: gcr.io/cassandra-operator/cassandra-3.11.9:latest sidecarImage: gcr.io/cassandra-operator/instaclustr-icarus:latest memory: 1Gi disk: 1Gi diff --git a/helm/cassandra/values.yaml b/helm/cassandra/values.yaml index b7ad8512..544edc34 100644 --- a/helm/cassandra/values.yaml +++ b/helm/cassandra/values.yaml @@ -10,7 +10,7 @@ datacenter: dc1 cluster: test-cluster image: - cassandraRepository: gcr.io/cassandra-operator/cassandra-3.11.8 + cassandraRepository: gcr.io/cassandra-operator/cassandra-3.11.9 sidecarRepository: gcr.io/cassandra-operator/instaclustr-icarus cassandraTag: latest sidecarTag: latest diff --git a/java/cassandra-3-k8s-addons/pom.xml b/java/cassandra-3-k8s-addons/pom.xml index 2e3aa7d8..133f7066 100644 --- a/java/cassandra-3-k8s-addons/pom.xml +++ b/java/cassandra-3-k8s-addons/pom.xml @@ -11,7 +11,7 @@ 1.0.2 - 3.11.8 + 3.11.9 1.8 1.8 diff --git a/java/cassandra-4-k8s-addons/pom.xml b/java/cassandra-4-k8s-addons/pom.xml index 9299cc00..f171396f 100644 --- a/java/cassandra-4-k8s-addons/pom.xml +++ b/java/cassandra-4-k8s-addons/pom.xml @@ -11,7 +11,7 @@ 1.0.2 - 4.0-beta2 + 4.0-beta3 1.8 1.8 diff --git a/test/cassandra-cluster-deployment-test.sh b/test/cassandra-cluster-deployment-test.sh index d3fd7ab9..b73f9c84 100755 --- a/test/cassandra-cluster-deployment-test.sh +++ b/test/cassandra-cluster-deployment-test.sh @@ -7,7 +7,7 @@ docker images helm install \ cassandra \ $SCRIPT_DIR/../helm/cassandra \ - --set image.cassandraRepository=gcr.io/cassandra-operator/cassandra-4.0-beta2 \ + --set image.cassandraRepository=gcr.io/cassandra-operator/cassandra-4.0-beta3 \ --set image.cassandraTag=latest-dev \ --set image.sidecarRepository=gcr.io/cassandra-operator/instaclustr-icarus \ --set image.sidecarTag=latest-dev \