From 2664ec610735503e84203b173c46be7013bbc063 Mon Sep 17 00:00:00 2001 From: bhargav joshi Date: Tue, 2 Mar 2021 16:46:57 -0500 Subject: [PATCH 1/4] Update default version to fix CVEs https://github.com/datastax/management-api-for-apache-cassandra/issues/83 --- operator/pkg/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/pkg/images/images.go b/operator/pkg/images/images.go index 0e7fb1b2c..77a36f483 100644 --- a/operator/pkg/images/images.go +++ b/operator/pkg/images/images.go @@ -77,7 +77,7 @@ const ( var imageLookupMap map[Image]string = map[Image]string{ Cassandra_3_11_6: "datastax/cassandra-mgmtapi-3_11_6:v0.1.5", - Cassandra_3_11_7: "datastax/cassandra-mgmtapi-3_11_7:v0.1.13", + Cassandra_3_11_7: "datastax/cassandra-mgmtapi-3_11_7:v0.1.22", Cassandra_4_0_0: "datastax/cassandra-mgmtapi-4_0_0:v0.1.12", UBICassandra_3_11_6: "datastax/cassandra:3.11.6-ubi7", From 611c593c278bb693221612500aed36f41d2470ae Mon Sep 17 00:00:00 2001 From: bhargav joshi Date: Fri, 5 Mar 2021 14:16:43 -0500 Subject: [PATCH 2/4] Update cassandradatacenter_types_test.go --- .../apis/cassandra/v1beta1/cassandradatacenter_types_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go index 2c2d93b34..5bdf487d4 100644 --- a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go +++ b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go @@ -42,7 +42,7 @@ func Test_makeImage(t *testing.T) { serverType: "cassandra", serverVersion: "3.11.7", }, - want: "datastax/cassandra-mgmtapi-3_11_7:v0.1.13", + want: "datastax/cassandra-mgmtapi-3_11_7:v0.1.22", errString: "", }, { From 25a76b593b366d123a763a39ec4ba5ee0dbe132c Mon Sep 17 00:00:00 2001 From: bhargav joshi Date: Mon, 8 Mar 2021 13:22:11 -0500 Subject: [PATCH 3/4] Update images.go --- operator/pkg/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/pkg/images/images.go b/operator/pkg/images/images.go index 77a36f483..36696ef4b 100644 --- a/operator/pkg/images/images.go +++ b/operator/pkg/images/images.go @@ -169,7 +169,7 @@ func applyDefaultRegistryOverride(image string) string { // This is meant to be used when the CassandraDatacenter does not // explicitly set the DockerImageRunsAsCassandra field. func CalculateDockerImageRunsAsCassandra(version string) bool { - if version == "3.11.6" || version == "3.11.7" || version == "4.0.0" { + if version == "3.11.6" || version == "4.0.0" { return false } From 36d9701104186e998602dd25c315bf776a5c7b61 Mon Sep 17 00:00:00 2001 From: bhargav joshi Date: Mon, 8 Mar 2021 13:22:42 -0500 Subject: [PATCH 4/4] Update images_test.go --- operator/pkg/images/images_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/pkg/images/images_test.go b/operator/pkg/images/images_test.go index 58cf27f50..d13c6e268 100644 --- a/operator/pkg/images/images_test.go +++ b/operator/pkg/images/images_test.go @@ -67,7 +67,7 @@ func Test_CalculateDockerImageRunsAsCassandra(t *testing.T) { }, { version: "3.11.7", - want: false, + want: true, }, { version: "4.0.0",