From 8d57acbf84d681d9670a79e062a6777a90656ad1 Mon Sep 17 00:00:00 2001
From: Ann Taraday <akamyshnikova@mirantis.com>
Date: Thu, 25 Apr 2024 12:56:05 +0200
Subject: [PATCH] Bump cassandra-boostrap to fix CVE-2024-2961

---
 Makefile                                        | 2 +-
 api/v2/cassandracluster_types.go                | 2 +-
 test/kuttl/backup-restore/00-createCluster.yaml | 2 +-
 test/kuttl/sidecars/00-assert.yaml              | 2 +-
 website/docs/2_setup/5_upgrade_v1_to_v2.md      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index edb2336a..50cfbad6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ SERVICE_NAME := casskop
 BUILD_FOLDER = .
 MOUNTDIR = $(PWD)
 
-BOOTSTRAP_IMAGE ?= ghcr.io/cscetbon/casskop-bootstrap:0.1.14
+BOOTSTRAP_IMAGE ?= ghcr.io/cscetbon/casskop-bootstrap:0.1.15
 TELEPRESENCE_REGISTRY ?= datawire
 KUBESQUASH_REGISTRY:=
 KUBECONFIG ?= ~/.kube/config
diff --git a/api/v2/cassandracluster_types.go b/api/v2/cassandracluster_types.go
index dfeb24f1..9c532905 100644
--- a/api/v2/cassandracluster_types.go
+++ b/api/v2/cassandracluster_types.go
@@ -21,7 +21,7 @@ const (
 	DefaultReadinessHealthCheckPeriod   int32 = 10
 
 	defaultCassandraImage     = "cassandra:3.11.10"
-	defaultBootstrapImage     = "ghcr.io/cscetbon/casskop-bootstrap:0.1.14"
+	defaultBootstrapImage     = "ghcr.io/cscetbon/casskop-bootstrap:0.1.15"
 	defaultConfigBuilderImage = "datastax/cass-config-builder:1.0.4"
 
 	DefaultBackRestImage      = "ghcr.io/cscetbon/instaclustr-icarus:1.1.3"
diff --git a/test/kuttl/backup-restore/00-createCluster.yaml b/test/kuttl/backup-restore/00-createCluster.yaml
index b8f8de65..7264cb60 100644
--- a/test/kuttl/backup-restore/00-createCluster.yaml
+++ b/test/kuttl/backup-restore/00-createCluster.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   nodesPerRacks: 2
   cassandraImage: cassandra:3.11.9
-  bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.14
+  bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.15
   dataCapacity: 256Mi
   hardAntiAffinity: false
   deletePVC: true
diff --git a/test/kuttl/sidecars/00-assert.yaml b/test/kuttl/sidecars/00-assert.yaml
index c4e62546..31bd3274 100644
--- a/test/kuttl/sidecars/00-assert.yaml
+++ b/test/kuttl/sidecars/00-assert.yaml
@@ -47,7 +47,7 @@ spec:
         - name: config-builder
           image: datastax/cass-config-builder:1.0.3
         - name: bootstrap
-          image: ghcr.io/cscetbon/casskop-bootstrap:0.1.14
+          image: ghcr.io/cscetbon/casskop-bootstrap:0.1.15
       containers:
       - args:
         - tail
diff --git a/website/docs/2_setup/5_upgrade_v1_to_v2.md b/website/docs/2_setup/5_upgrade_v1_to_v2.md
index 031b7e8c..c995b93e 100644
--- a/website/docs/2_setup/5_upgrade_v1_to_v2.md
+++ b/website/docs/2_setup/5_upgrade_v1_to_v2.md
@@ -47,7 +47,7 @@ metadata:
 spec:
   nodesPerRacks: 2
   cassandraImage: cassandra:3.11.9
-  bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.14
+  bootstrapImage: ghcr.io/cscetbon/casskop-bootstrap:0.1.15
   config:
     cassandra-yaml:
       num_tokens: 256