From 4196f1173e73571985789e087971677f28c88d09 Mon Sep 17 00:00:00 2001 From: Jake Luciani Date: Fri, 8 May 2020 19:14:16 -0400 Subject: [PATCH] Update C* images to include metric-collector (#81) --- buildsettings.yaml | 2 +- .../pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go | 4 ++-- .../apis/cassandra/v1beta1/cassandradatacenter_types_test.go | 2 +- tests/testdata/oss-three-rack-three-node-dc.yaml | 2 +- tests/testdata/oss-two-rack-six-node-dc.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildsettings.yaml b/buildsettings.yaml index 462a9db82..fd6bff419 100644 --- a/buildsettings.yaml +++ b/buildsettings.yaml @@ -19,4 +19,4 @@ dev: images: - datastax/dse-server:6.8.0 - datastax/cass-config-builder:1.0.0 - - datastax/cassandra-mgmtapi-3_11_6:v0.1.0 + - datastax/cassandra-mgmtapi-3_11_6:v0.1.2 diff --git a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go index 59dbf823a..d9fd820c9 100644 --- a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go +++ b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go @@ -50,8 +50,8 @@ type ProgressState string // In the event that no image is found, an error is returned func getImageForServerVersion(server, version string) (string, error) { const ( - cassandra_3_11_6 = "datastax/cassandra-mgmtapi-3_11_6:v0.1.0" - cassandra_4_0_0 = "datastax/cassandra-mgmtapi-4_0_0:v0.1.0" + cassandra_3_11_6 = "datastax/cassandra-mgmtapi-3_11_6:v0.1.2" + cassandra_4_0_0 = "datastax/cassandra-mgmtapi-4_0_0:v0.1.2" dse_6_8_0 = "datastax/dse-server:6.8.0" ) sv := server + "-" + version diff --git a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go index d21ec9c5e..2f0b5e19b 100644 --- a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go +++ b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go @@ -41,7 +41,7 @@ func Test_makeImage(t *testing.T) { serverType: "cassandra", serverVersion: "3.11.6", }, - want: "datastax/cassandra-mgmtapi-3_11_6:v0.1.0", + want: "datastax/cassandra-mgmtapi-3_11_6:v0.1.2", errString: "", }, { diff --git a/tests/testdata/oss-three-rack-three-node-dc.yaml b/tests/testdata/oss-three-rack-three-node-dc.yaml index 4a3ef53f1..c2eccb34b 100644 --- a/tests/testdata/oss-three-rack-three-node-dc.yaml +++ b/tests/testdata/oss-three-rack-three-node-dc.yaml @@ -6,7 +6,7 @@ spec: clusterName: cluster1 serverType: cassandra serverVersion: "3.11.6" - serverImage: datastax/cassandra-mgmtapi-3_11_6:v0.1.0 + serverImage: datastax/cassandra-mgmtapi-3_11_6:v0.1.2 configBuilderImage: datastax/cass-config-builder:1.0.0 managementApiAuth: insecure: {} diff --git a/tests/testdata/oss-two-rack-six-node-dc.yaml b/tests/testdata/oss-two-rack-six-node-dc.yaml index 34a2076f1..b1a63a420 100644 --- a/tests/testdata/oss-two-rack-six-node-dc.yaml +++ b/tests/testdata/oss-two-rack-six-node-dc.yaml @@ -6,7 +6,7 @@ spec: clusterName: cluster1 serverType: cassandra serverVersion: "3.11.6" - serverImage: datastax/cassandra-mgmtapi-3_11_6:v0.1.0 + serverImage: datastax/cassandra-mgmtapi-3_11_6:v0.1.2 configBuilderImage: datastax/cass-config-builder:1.0.0 managementApiAuth: insecure: {}