diff --git a/buildsettings.yaml b/buildsettings.yaml index 1109e00e0..dcebf1afa 100644 --- a/buildsettings.yaml +++ b/buildsettings.yaml @@ -17,6 +17,6 @@ jenkins: - simple-theme-plugin dev: images: - - datastax/dse-server:6.8.2 + - datastax/dse-server:6.8.3 - datastax/cass-config-builder:1.0.2 - datastax/cassandra-mgmtapi-3_11_7:v0.1.12 diff --git a/charts/cass-operator-chart/templates/customresourcedefinition.yaml b/charts/cass-operator-chart/templates/customresourcedefinition.yaml index f14e4cb86..74822314d 100644 --- a/charts/cass-operator-chart/templates/customresourcedefinition.yaml +++ b/charts/cass-operator-chart/templates/customresourcedefinition.yaml @@ -6037,6 +6037,7 @@ spec: - 6.8.0 - 6.8.1 - 6.8.2 + - 6.8.3 - 3.11.6 - 3.11.7 - 4.0.0 diff --git a/docs/user/README.md b/docs/user/README.md index a2c4a9a69..7d7b42ddc 100644 --- a/docs/user/README.md +++ b/docs/user/README.md @@ -318,7 +318,7 @@ for your `CassandraDatacenter` resource, you can use the `serverType`, `serverVe spec properties. `serverType` is required and must be either `dse` or `cassandra`. `serverVersion` is also required, -and the supported versions for DSE are `6.8.0` through `6.8.2`, and for Cassandra it is `3.11.6`/`3.11.7`. More versions +and the supported versions for DSE are `6.8.0` through `6.8.3`, and for Cassandra it is `3.11.6` through `3.11.7`. More versions will be supported in the future. If `serverImage` is not specified, a default image for the provided `serverType` and @@ -333,7 +333,7 @@ metadata: name: dtcntr spec: serverType: dse - serverVersion: 6.8.2 + serverVersion: 6.8.3 ``` @@ -359,7 +359,7 @@ metadata: name: dtcntr spec: serverType: dse - serverVersion: 6.8.2 + serverVersion: 6.8.3 serverImage: private-docker-registry.example.com/dse-img/dse:5f6e7d8c ``` diff --git a/operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml b/operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml index fd6c24ae0..729b3e18b 100644 --- a/operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml +++ b/operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml @@ -6027,6 +6027,7 @@ spec: - 6.8.0 - 6.8.1 - 6.8.2 + - 6.8.3 - 3.11.6 - 3.11.7 - 4.0.0 diff --git a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-full.yaml b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-full.yaml index 7e01cec5d..a8a88d6a8 100644 --- a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-full.yaml +++ b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-full.yaml @@ -79,7 +79,7 @@ spec: serverType: "dse" # Which server version to use. Required. - serverVersion: "6.8.2" + serverVersion: "6.8.3" # Use the serverImage configuration to override Cass Operator's logic to map # the serverType plus serverVersion into a public container image on Docker diff --git a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal.yaml b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal.yaml index 20a4e3ce6..64ff295db 100644 --- a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal.yaml +++ b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal.yaml @@ -7,7 +7,7 @@ metadata: spec: clusterName: cluster2 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 3 diff --git a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-three-rack-three-node.yaml b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-three-rack-three-node.yaml index 083c04db6..6c6bab1b6 100644 --- a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-three-rack-three-node.yaml +++ b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-three-rack-three-node.yaml @@ -7,7 +7,7 @@ metadata: spec: clusterName: cluster2 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 3 diff --git a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go index bf66dad1f..c082d5426 100644 --- a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go +++ b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go @@ -64,10 +64,12 @@ const ( dse_6_8_0 = "datastax/dse-server:6.8.0" dse_6_8_1 = "datastax/dse-server:6.8.1" dse_6_8_2 = "datastax/dse-server:6.8.2" + dse_6_8_3 = "datastax/dse-server:6.8.3" ubi_dse_6_8_0 = "datastax/dse-server:6.8.0-ubi7" ubi_dse_6_8_1 = "datastax/dse-server:6.8.1-ubi7" ubi_dse_6_8_2 = "datastax/dse-server:6.8.2-ubi7" + ubi_dse_6_8_3 = "datastax/dse-server:6.8.3-ubi7" EnvBaseImageOs = "BASE_IMAGE_OS" ) @@ -110,6 +112,8 @@ func getImageForDefaultBaseOs(sv string) (string, bool) { return dse_6_8_1, true case "dse-6.8.2": return dse_6_8_2, true + case "dse-6.8.3": + return dse_6_8_3, true case "cassandra-3.11.6": return cassandra_3_11_6, true case "cassandra-3.11.7": @@ -128,6 +132,8 @@ func getImageForUniversalBaseOs(sv string) (string, bool) { return ubi_dse_6_8_1, true case "dse-6.8.2": return ubi_dse_6_8_2, true + case "dse-6.8.3": + return ubi_dse_6_8_3, true case "cassandra-3.11.6": return ubi_cassandra_3_11_6, true case "cassandra-3.11.7": @@ -156,7 +162,7 @@ type CassandraDatacenterSpec struct { // Version string for config builder, // used to generate Cassandra server configuration - // +kubebuilder:validation:Enum="6.8.0";"6.8.1";"6.8.2";"3.11.6";"3.11.7";"4.0.0" + // +kubebuilder:validation:Enum="6.8.0";"6.8.1";"6.8.2";"6.8.3";"3.11.6";"3.11.7";"4.0.0" ServerVersion string `json:"serverVersion"` // Cassandra server image name. diff --git a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go index 71bffd818..015785f73 100644 --- a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go +++ b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go @@ -64,13 +64,13 @@ func Test_makeImage(t *testing.T) { errString: "server 'dse' and version '6.7.0' do not work together", }, { - name: "test 6.8.2", + name: "test 6.8.3", args: args{ serverImage: "", serverType: "dse", - serverVersion: "6.8.2", + serverVersion: "6.8.3", }, - want: "datastax/dse-server:6.8.2", + want: "datastax/dse-server:6.8.3", errString: "", }, } diff --git a/operator/pkg/apis/cassandra/v1beta1/webhook.go b/operator/pkg/apis/cassandra/v1beta1/webhook.go index 2253ad0f9..97b37f03d 100644 --- a/operator/pkg/apis/cassandra/v1beta1/webhook.go +++ b/operator/pkg/apis/cassandra/v1beta1/webhook.go @@ -40,6 +40,8 @@ func ValidateSingleDatacenter(dc CassandraDatacenter) error { err = nil case "6.8.2": err = nil + case "6.8.3": + err = nil default: err = attemptedTo("use unsupported DSE version '%s'", dc.Spec.ServerVersion) } diff --git a/operator/pkg/apis/cassandra/v1beta1/webhook_test.go b/operator/pkg/apis/cassandra/v1beta1/webhook_test.go index 74ee558a9..39bf05061 100644 --- a/operator/pkg/apis/cassandra/v1beta1/webhook_test.go +++ b/operator/pkg/apis/cassandra/v1beta1/webhook_test.go @@ -34,14 +34,14 @@ func Test_ValidateSingleDatacenter(t *testing.T) { errString: "", }, { - name: "Dse 6.8.2 Valid", + name: "Dse 6.8.3 Valid", dc: &CassandraDatacenter{ ObjectMeta: metav1.ObjectMeta{ Name: "exampleDC", }, Spec: CassandraDatacenterSpec{ ServerType: "dse", - ServerVersion: "6.8.2", + ServerVersion: "6.8.3", }, }, errString: "", @@ -122,7 +122,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) { }, Spec: CassandraDatacenterSpec{ ServerType: "dse", - ServerVersion: "6.8.2", + ServerVersion: "6.8.3", DseWorkloads: &DseWorkloads{ AnalyticsEnabled: true, }, @@ -180,7 +180,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) { }, Spec: CassandraDatacenterSpec{ ServerType: "dse", - ServerVersion: "6.8.2", + ServerVersion: "6.8.3", Config: json.RawMessage(` { "cassandra-yaml": {}, @@ -191,7 +191,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) { `), }, }, - errString: "attempted to define config jvm-options with dse-6.8.2", + errString: "attempted to define config jvm-options with dse-6.8.3", }, { name: "Allow multiple nodes per worker requires resource requests", @@ -201,7 +201,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) { }, Spec: CassandraDatacenterSpec{ ServerType: "dse", - ServerVersion: "6.8.2", + ServerVersion: "6.8.3", Config: json.RawMessage(`{}`), AllowMultipleNodesPerWorker: true, Resources: corev1.ResourceRequirements{ @@ -226,7 +226,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) { }, Spec: CassandraDatacenterSpec{ ServerType: "dse", - ServerVersion: "6.8.2", + ServerVersion: "6.8.3", Config: json.RawMessage(`{}`), AllowMultipleNodesPerWorker: true, }, diff --git a/operator/pkg/reconciliation/testing.go b/operator/pkg/reconciliation/testing.go index 1ef3c8241..d34515a54 100644 --- a/operator/pkg/reconciliation/testing.go +++ b/operator/pkg/reconciliation/testing.go @@ -83,7 +83,7 @@ func CreateMockReconciliationContext( Size: size, ClusterName: clusterName, ServerType: "dse", - ServerVersion: "6.8.2", + ServerVersion: "6.8.3", StorageConfig: storageConfig, }, } diff --git a/tests/testdata/additional-seeds-two-rack-four-node-dc.yaml b/tests/testdata/additional-seeds-two-rack-four-node-dc.yaml index d640226e6..ff418827c 100644 --- a/tests/testdata/additional-seeds-two-rack-four-node-dc.yaml +++ b/tests/testdata/additional-seeds-two-rack-four-node-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 4 diff --git a/tests/testdata/cluster-wide-install-dc1.yaml b/tests/testdata/cluster-wide-install-dc1.yaml index 8c3161575..557953e3a 100644 --- a/tests/testdata/cluster-wide-install-dc1.yaml +++ b/tests/testdata/cluster-wide-install-dc1.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 1 diff --git a/tests/testdata/cluster-wide-install-dc2.yaml b/tests/testdata/cluster-wide-install-dc2.yaml index bd7232d98..1bb6c35d5 100644 --- a/tests/testdata/cluster-wide-install-dc2.yaml +++ b/tests/testdata/cluster-wide-install-dc2.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster2 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 1 diff --git a/tests/testdata/default-single-rack-2-node-dc-with-superuser-secret.yaml b/tests/testdata/default-single-rack-2-node-dc-with-superuser-secret.yaml index 50f950b21..b7c976095 100644 --- a/tests/testdata/default-single-rack-2-node-dc-with-superuser-secret.yaml +++ b/tests/testdata/default-single-rack-2-node-dc-with-superuser-secret.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster2 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 2 diff --git a/tests/testdata/default-single-rack-2-node-dc.yaml b/tests/testdata/default-single-rack-2-node-dc.yaml index 98c9dd484..6d7c97dfb 100644 --- a/tests/testdata/default-single-rack-2-node-dc.yaml +++ b/tests/testdata/default-single-rack-2-node-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster2 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 2 diff --git a/tests/testdata/default-single-rack-single-node-dc.yaml b/tests/testdata/default-single-rack-single-node-dc.yaml index bd7232d98..1bb6c35d5 100644 --- a/tests/testdata/default-single-rack-single-node-dc.yaml +++ b/tests/testdata/default-single-rack-single-node-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster2 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 1 diff --git a/tests/testdata/default-single-rack-single-node-extra-container-dc.yaml b/tests/testdata/default-single-rack-single-node-extra-container-dc.yaml index a0e660407..8555cf90d 100644 --- a/tests/testdata/default-single-rack-single-node-extra-container-dc.yaml +++ b/tests/testdata/default-single-rack-single-node-extra-container-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster2 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 1 diff --git a/tests/testdata/default-three-rack-three-node-dc.yaml b/tests/testdata/default-three-rack-three-node-dc.yaml index e0c952ebf..2d43676cf 100644 --- a/tests/testdata/default-three-rack-three-node-dc.yaml +++ b/tests/testdata/default-three-rack-three-node-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 3 diff --git a/tests/testdata/dse-one-node-dc-with-mtls.yaml b/tests/testdata/dse-one-node-dc-with-mtls.yaml index 62fc4e16b..f5576a4e6 100644 --- a/tests/testdata/dse-one-node-dc-with-mtls.yaml +++ b/tests/testdata/dse-one-node-dc-with-mtls.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: manual: clientSecretName: mgmt-api-client-credentials diff --git a/tests/testdata/graph-dc.yaml b/tests/testdata/graph-dc.yaml index 47275f3a6..abe4caa57 100644 --- a/tests/testdata/graph-dc.yaml +++ b/tests/testdata/graph-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" dseWorkloads: graphEnabled: true managementApiAuth: diff --git a/tests/testdata/host-network-dc.yaml b/tests/testdata/host-network-dc.yaml index 9cd551b1f..445db3d5e 100644 --- a/tests/testdata/host-network-dc.yaml +++ b/tests/testdata/host-network-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} size: 3 diff --git a/tests/testdata/nodeport-service-dc.yaml b/tests/testdata/nodeport-service-dc.yaml index e7b8cbe65..55e863a8a 100644 --- a/tests/testdata/nodeport-service-dc.yaml +++ b/tests/testdata/nodeport-service-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" managementApiAuth: insecure: {} networking: diff --git a/tests/testdata/solr-dc.yaml b/tests/testdata/solr-dc.yaml index 9d0f3a7e8..7f620fbce 100644 --- a/tests/testdata/solr-dc.yaml +++ b/tests/testdata/solr-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" dseWorkloads: searchEnabled: true managementApiAuth: diff --git a/tests/testdata/spark-dc.yaml b/tests/testdata/spark-dc.yaml index a0d2eccae..05cb1df68 100644 --- a/tests/testdata/spark-dc.yaml +++ b/tests/testdata/spark-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: clusterName: cluster1 serverType: dse - serverVersion: "6.8.2" + serverVersion: "6.8.3" dseWorkloads: analyticsEnabled: true managementApiAuth: diff --git a/tests/webhook_validation/webhook_validation_suite_test.go b/tests/webhook_validation/webhook_validation_suite_test.go index 96103cc4e..6439db6b4 100644 --- a/tests/webhook_validation/webhook_validation_suite_test.go +++ b/tests/webhook_validation/webhook_validation_suite_test.go @@ -77,7 +77,7 @@ var _ = Describe(testName, func() { json = "{\"spec\": {\"serverType\": \"dse\", \"serverVersion\": \"4.8.0\"}}" k = kubectl.PatchMerge(dcResource, json) ns.ExecAndLogAndExpectErrorString(step, k, - `spec.serverVersion: Unsupported value: "4.8.0": supported values: "6.8.0", "6.8.1", "6.8.2", "3.11.6", "3.11.7", "4.0.0"`) + `spec.serverVersion: Unsupported value: "4.8.0": supported values: "6.8.0", "6.8.1", "6.8.2", "6.8.3", "3.11.6", "3.11.7", "4.0.0"`) step = "attempt to change the dc name" json = "{\"spec\": {\"clusterName\": \"NewName\"}}" k = kubectl.PatchMerge(dcResource, json)