DSE 6.8.4 support (#257)

Co-authored-by: Madhavan Sridharan <[email protected]>
datastax · Sep 28, 2020 · d4d4e3a · d4d4e3a
1 parent 7de00ac
commit d4d4e3a
Show file tree

Hide file tree

Showing 37 changed files with 53 additions and 37 deletions.
diff --git a/buildsettings.yaml b/buildsettings.yaml
@@ -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.13
diff --git a/charts/cass-operator-chart/templates/customresourcedefinition.yaml b/charts/cass-operator-chart/templates/customresourcedefinition.yaml
@@ -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

diff --git a/docs/ingress/kong/sni-ingress/README.md b/docs/ingress/kong/sni-ingress/README.md
@@ -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
     ```
 

diff --git 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.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
@@ -333,7 +333,7 @@ metadata:
   name: dtcntr
 spec:
   serverType: dse
-  serverVersion: 6.8.3
+  serverVersion: 6.8.4
 
 ```
 
@@ -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
 ```
 

diff --git a/docs/user/cass-operator-manifests-v1.13.yaml b/docs/user/cass-operator-manifests-v1.13.yaml
@@ -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

diff --git a/docs/user/cass-operator-manifests-v1.14.yaml b/docs/user/cass-operator-manifests-v1.14.yaml
@@ -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

diff --git a/docs/user/cass-operator-manifests-v1.15.yaml b/docs/user/cass-operator-manifests-v1.15.yaml
@@ -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

diff --git a/docs/user/cass-operator-manifests-v1.16.yaml b/docs/user/cass-operator-manifests-v1.16.yaml
@@ -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

diff --git a/docs/user/cass-operator-manifests-v1.17.yaml b/docs/user/cass-operator-manifests-v1.17.yaml
@@ -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

diff --git a/docs/user/cass-operator-manifests-v1.18.yaml b/docs/user/cass-operator-manifests-v1.18.yaml
@@ -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

diff --git a/operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml b/operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml
@@ -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

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
@@ -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

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
@@ -7,7 +7,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: dse
-  serverVersion: "6.8.3"
+  serverVersion: "6.8.4"
   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
@@ -7,7 +7,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: dse
-  serverVersion: "6.8.3"
+  serverVersion: "6.8.4"
   managementApiAuth:
     insecure: {}
   size: 3

diff --git a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go
@@ -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.

diff --git 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.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: "",
 		},
 	}

diff --git a/operator/pkg/apis/cassandra/v1beta1/webhook.go b/operator/pkg/apis/cassandra/v1beta1/webhook.go
@@ -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)
 		}

diff --git 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.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: "",
@@ -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,
 					},
@@ -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": {},
@@ -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",
@@ -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{
@@ -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,
 				},

diff --git a/operator/pkg/images/images.go b/operator/pkg/images/images.go
@@ -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
@@ -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",
@@ -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")

diff --git a/operator/pkg/reconciliation/testing.go b/operator/pkg/reconciliation/testing.go
@@ -84,7 +84,7 @@ func CreateMockReconciliationContext(
 			Size:          size,
 			ClusterName:   clusterName,
 			ServerType:    "dse",
-			ServerVersion: "6.8.3",
+			ServerVersion: "6.8.4",
 			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
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster1
   serverType: dse
-  serverVersion: "6.8.3"
+  serverVersion: "6.8.4"
   managementApiAuth:
     insecure: {}
   size: 4

diff --git 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.3"
+  serverVersion: "6.8.4"
   managementApiAuth:
     insecure: {}
   size: 1

diff --git 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.3"
+  serverVersion: "6.8.4"
   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
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: dse
-  serverVersion: "6.8.3"
+  serverVersion: "6.8.4"
   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
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: dse
-  serverVersion: "6.8.3"
+  serverVersion: "6.8.4"
   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
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: dse
-  serverVersion: "6.8.3"
+  serverVersion: "6.8.4"
   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
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster2
   serverType: dse
-  serverVersion: "6.8.3"
+  serverVersion: "6.8.4"
   managementApiAuth:
     insecure: {}
   size: 1

diff --git a/tests/testdata/default-three-rack-four-node-dc.yaml b/tests/testdata/default-three-rack-four-node-dc.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster1
   serverType: dse
-  serverVersion: "6.8.2"
+  serverVersion: "6.8.4"
   managementApiAuth:
     insecure: {}
   size: 4

diff --git a/tests/testdata/default-three-rack-four-node-limited-storage-dc.yaml b/tests/testdata/default-three-rack-four-node-limited-storage-dc.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   clusterName: cluster1
   serverType: dse
-  serverVersion: "6.8.2"
+  serverVersion: "6.8.4"
   managementApiAuth:
     insecure: {}
   size: 4

diff --git 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.3"
+  serverVersion: "6.8.4"
   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
@@ -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

diff --git 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.3"
+  serverVersion: "6.8.4"
   dseWorkloads:
     graphEnabled: true
   managementApiAuth:
-Original file 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 @@