Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DSE 6.8.4 support #257

Merged
merged 1 commit into from
Sep 28, 2020
Merged

DSE 6.8.4 support #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildsettings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jenkins:
- simple-theme-plugin
dev:
images:
- datastax/dse-server:6.8.3
- datastax/dse-server:6.8.4
- datastax/cass-config-builder:1.0.3
- datastax/cassandra-mgmtapi-3_11_7:v0.1.12
1 change: 1 addition & 0 deletions charts/cass-operator-chart/templates/customresourcedefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6038,6 +6038,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
2 changes: 1 addition & 1 deletion docs/ingress/kong/sni-ingress/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ When leveraging a single endpoint ingress / load balancer we lose the ability to
k3d load image --cluster k3s-default \
datastax/cass-operator:1.3.0 \
datastax/cass-config-builder:1.0.0-ubi7 \
datastax/dse-server:6.8.0-ubi7 \
datastax/dse-server:6.8.4-ubi7 \
datastax/cassandra:3.11.6-ubi7
```

Expand Down
6 changes: 3 additions & 3 deletions docs/user/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3`, and for Cassandra it is `3.11.6` through `3.11.7`. More versions
and the supported versions for DSE are `6.8.0` through `6.8.4`, 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
Expand All @@ -333,7 +333,7 @@ metadata:
name: dtcntr
spec:
serverType: dse
serverVersion: 6.8.3
serverVersion: 6.8.4

```

Expand All @@ -359,7 +359,7 @@ metadata:
name: dtcntr
spec:
serverType: dse
serverVersion: 6.8.3
serverVersion: 6.8.4
serverImage: private-docker-registry.example.com/dse-img/dse:5f6e7d8c
```

Expand Down
1 change: 1 addition & 0 deletions docs/user/cass-operator-manifests-v1.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6037,6 +6037,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
1 change: 1 addition & 0 deletions docs/user/cass-operator-manifests-v1.14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6037,6 +6037,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
1 change: 1 addition & 0 deletions docs/user/cass-operator-manifests-v1.15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6037,6 +6037,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
1 change: 1 addition & 0 deletions docs/user/cass-operator-manifests-v1.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6049,6 +6049,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
1 change: 1 addition & 0 deletions docs/user/cass-operator-manifests-v1.17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6049,6 +6049,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
1 change: 1 addition & 0 deletions docs/user/cass-operator-manifests-v1.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6047,6 +6047,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
1 change: 1 addition & 0 deletions operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6028,6 +6028,7 @@ spec:
- 6.8.1
- 6.8.2
- 6.8.3
- 6.8.4
- 3.11.6
- 3.11.7
- 4.0.0
Expand Down
2 changes: 1 addition & 1 deletion operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ spec:
serverType: "dse"

# Which server version to use. Required.
serverVersion: "6.8.3"
serverVersion: "6.8.4"

# Use the serverImage configuration to override Cass Operator's logic to map
# the serverType plus serverVersion into a public container image on Docker
Expand Down
2 changes: 1 addition & 1 deletion operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
clusterName: cluster2
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 3
Expand Down
2 changes: 1 addition & 1 deletion operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-three-rack-three-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
clusterName: cluster2
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 3
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,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";"6.8.3";"3.11.6";"3.11.7";"4.0.0"
// +kubebuilder:validation:Enum="6.8.0";"6.8.1";"6.8.2";"6.8.3";"6.8.4";"3.11.6";"3.11.7";"4.0.0"
ServerVersion string `json:"serverVersion"`

// Cassandra server image name.
Expand Down
6 changes: 3 additions & 3 deletions operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3",
name: "test 6.8.4",
args: args{
serverImage: "",
serverType: "dse",
serverVersion: "6.8.3",
serverVersion: "6.8.4",
},
want: "datastax/dse-server:6.8.3",
want: "datastax/dse-server:6.8.4",
errString: "",
},
}
Expand Down
2 changes: 2 additions & 0 deletions operator/pkg/apis/cassandra/v1beta1/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ func ValidateSingleDatacenter(dc CassandraDatacenter) error {
err = nil
case "6.8.3":
err = nil
case "6.8.4":
err = nil
default:
err = attemptedTo("use unsupported DSE version '%s'", dc.Spec.ServerVersion)
}
Expand Down
14 changes: 7 additions & 7 deletions operator/pkg/apis/cassandra/v1beta1/webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ func Test_ValidateSingleDatacenter(t *testing.T) {
errString: "",
},
{
name: "Dse 6.8.3 Valid",
name: "Dse 6.8.4 Valid",
dc: &CassandraDatacenter{
ObjectMeta: metav1.ObjectMeta{
Name: "exampleDC",
},
Spec: CassandraDatacenterSpec{
ServerType: "dse",
ServerVersion: "6.8.3",
ServerVersion: "6.8.4",
},
},
errString: "",
Expand Down Expand Up @@ -122,7 +122,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) {
},
Spec: CassandraDatacenterSpec{
ServerType: "dse",
ServerVersion: "6.8.3",
ServerVersion: "6.8.4",
DseWorkloads: &DseWorkloads{
AnalyticsEnabled: true,
},
Expand Down Expand Up @@ -180,7 +180,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) {
},
Spec: CassandraDatacenterSpec{
ServerType: "dse",
ServerVersion: "6.8.3",
ServerVersion: "6.8.4",
Config: json.RawMessage(`
{
"cassandra-yaml": {},
Expand All @@ -191,7 +191,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) {
`),
},
},
errString: "attempted to define config jvm-options with dse-6.8.3",
errString: "attempted to define config jvm-options with dse-6.8.4",
},
{
name: "Allow multiple nodes per worker requires resource requests",
Expand All @@ -201,7 +201,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) {
},
Spec: CassandraDatacenterSpec{
ServerType: "dse",
ServerVersion: "6.8.3",
ServerVersion: "6.8.4",
Config: json.RawMessage(`{}`),
AllowMultipleNodesPerWorker: true,
Resources: corev1.ResourceRequirements{
Expand All @@ -226,7 +226,7 @@ func Test_ValidateSingleDatacenter(t *testing.T) {
},
Spec: CassandraDatacenterSpec{
ServerType: "dse",
ServerVersion: "6.8.3",
ServerVersion: "6.8.4",
Config: json.RawMessage(`{}`),
AllowMultipleNodesPerWorker: true,
},
Expand Down
6 changes: 6 additions & 0 deletions operator/pkg/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,13 @@ const (
DSE_6_8_1
DSE_6_8_2
DSE_6_8_3
DSE_6_8_4

UBIDSE_6_8_0
UBIDSE_6_8_1
UBIDSE_6_8_2
UBIDSE_6_8_3
UBIDSE_6_8_4

ConfigBuilder
UBIConfigBuilder
Expand All @@ -79,11 +81,13 @@ var imageLookupMap map[Image]string = map[Image]string {
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",
DSE_6_8_4: "datastax/dse-server:6.8.4",

UBIDSE_6_8_0: "datastax/dse-server:6.8.0-ubi7",
UBIDSE_6_8_1: "datastax/dse-server:6.8.1-ubi7",
UBIDSE_6_8_2: "datastax/dse-server:6.8.2-ubi7",
UBIDSE_6_8_3: "datastax/dse-server:6.8.3-ubi7",
UBIDSE_6_8_4: "datastax/dse-server:6.8.4-ubi7",

ConfigBuilder: "datastax/cass-config-builder:1.0.3",
UBIConfigBuilder: "datastax/cass-config-builder:1.0.3-ubi7",
Expand All @@ -109,13 +113,15 @@ var versionToDSE map[string]Image = map[string]Image {
"6.8.1": DSE_6_8_1,
"6.8.2": DSE_6_8_2,
"6.8.3": DSE_6_8_3,
"6.8.4": DSE_6_8_4,
}

var versionToUBIDSE map[string]Image = map[string]Image {
"6.8.0": UBIDSE_6_8_0,
"6.8.1": UBIDSE_6_8_1,
"6.8.2": UBIDSE_6_8_2,
"6.8.3": UBIDSE_6_8_3,
"6.8.4": UBIDSE_6_8_4,
}

var log = logf.Log.WithName("images")
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/reconciliation/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func CreateMockReconciliationContext(
Size: size,
ClusterName: clusterName,
ServerType: "dse",
ServerVersion: "6.8.3",
ServerVersion: "6.8.4",
StorageConfig: storageConfig,
},
}
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/additional-seeds-two-rack-four-node-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster1
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 4
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/cluster-wide-install-dc1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster1
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/cluster-wide-install-dc2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster2
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/default-single-rack-2-node-dc-with-superuser-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster2
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 2
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/default-single-rack-2-node-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster2
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 2
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/default-single-rack-single-node-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster2
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/default-single-rack-single-node-extra-container-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster2
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/default-three-rack-four-node-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster1
serverType: dse
serverVersion: "6.8.2"
serverVersion: "6.8.4"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great find!

managementApiAuth:
insecure: {}
size: 4
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/default-three-rack-four-node-limited-storage-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster1
serverType: dse
serverVersion: "6.8.2"
serverVersion: "6.8.4"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

managementApiAuth:
insecure: {}
size: 4
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/default-three-rack-three-node-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster1
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
insecure: {}
size: 3
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/dse-one-node-dc-with-mtls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster1
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
managementApiAuth:
manual:
clientSecretName: mgmt-api-client-credentials
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/graph-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
clusterName: cluster1
serverType: dse
serverVersion: "6.8.3"
serverVersion: "6.8.4"
dseWorkloads:
graphEnabled: true
managementApiAuth:
Expand Down
Loading