From 696efdaea1c99bf1b40577ae8335dfb754d57959 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 20 Dec 2020 12:19:08 -0500 Subject: [PATCH 01/17] Create apiVersion: storage.k8s.io:storage.yaml --- .../iks/apiVersion: storage.k8s.io:storage.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml diff --git a/operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml b/operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml new file mode 100644 index 000000000..fb724dbb6 --- /dev/null +++ b/operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml @@ -0,0 +1,10 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: server-storage +provisioner: ibm.io/ibmc-file +parameters: + type: pd-ssd + replication-type: none +volumeBindingMode: WaitForFirstConsumer +reclaimPolicy: Delete \ No newline at end of file From b1a4f6139b6484f6dd7a57634b1f879f6a033042 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 20 Dec 2020 12:21:28 -0500 Subject: [PATCH 02/17] Delete apiVersion: storage.k8s.io:storage.yaml --- .../iks/apiVersion: storage.k8s.io:storage.yaml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml diff --git a/operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml b/operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml deleted file mode 100644 index fb724dbb6..000000000 --- a/operator/k8s-flavors/iks/apiVersion: storage.k8s.io:storage.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: server-storage -provisioner: ibm.io/ibmc-file -parameters: - type: pd-ssd - replication-type: none -volumeBindingMode: WaitForFirstConsumer -reclaimPolicy: Delete \ No newline at end of file From a137351b34177aa84a3fb310fd551cdbae48b60d Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 20 Dec 2020 12:21:33 -0500 Subject: [PATCH 03/17] Create storage.yaml --- operator/k8s-flavors/iks/storage.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 operator/k8s-flavors/iks/storage.yaml diff --git a/operator/k8s-flavors/iks/storage.yaml b/operator/k8s-flavors/iks/storage.yaml new file mode 100644 index 000000000..fb724dbb6 --- /dev/null +++ b/operator/k8s-flavors/iks/storage.yaml @@ -0,0 +1,10 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: server-storage +provisioner: ibm.io/ibmc-file +parameters: + type: pd-ssd + replication-type: none +volumeBindingMode: WaitForFirstConsumer +reclaimPolicy: Delete \ No newline at end of file From af3011d47005e97ee2a6e0346cd6b239661ddef5 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 20 Dec 2020 12:55:20 -0500 Subject: [PATCH 04/17] Issue-340 --- operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-full.yaml | 2 +- .../example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal.yaml | 2 +- .../dse-6.8.x/example-cassdc-three-rack-three-node.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 55ab3191a..65e2eb4b7 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 @@ -15,7 +15,7 @@ metadata: spec: # The cluster name. - clusterName: cluster2 + clusterName: cluster1 # The number of server nodes. size: 6 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 097e6712c..6f7bd5ffd 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 @@ -5,7 +5,7 @@ kind: CassandraDatacenter metadata: name: dc1 spec: - clusterName: cluster2 + clusterName: cluster1 serverType: dse serverVersion: "6.8.4" managementApiAuth: 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 e34a426c9..51f618aaa 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 @@ -5,7 +5,7 @@ kind: CassandraDatacenter metadata: name: dc1 spec: - clusterName: cluster2 + clusterName: cluster1 serverType: dse serverVersion: "6.8.4" managementApiAuth: From e5ebe38b8c82db410f84940713bf39bef7f232e2 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 10:35:49 -0500 Subject: [PATCH 05/17] Create storage2.yaml --- operator/k8s-flavors/iks/storage2.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 operator/k8s-flavors/iks/storage2.yaml diff --git a/operator/k8s-flavors/iks/storage2.yaml b/operator/k8s-flavors/iks/storage2.yaml new file mode 100644 index 000000000..affb15788 --- /dev/null +++ b/operator/k8s-flavors/iks/storage2.yaml @@ -0,0 +1,5 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: server-storage +provisioner: ibm.io/ibmc-file \ No newline at end of file From 655b351c39410b8c58a3bfee0eeb301057def71c Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 10:43:45 -0500 Subject: [PATCH 06/17] Create storage3.yaml --- operator/k8s-flavors/iks/storage3.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 operator/k8s-flavors/iks/storage3.yaml diff --git a/operator/k8s-flavors/iks/storage3.yaml b/operator/k8s-flavors/iks/storage3.yaml new file mode 100644 index 000000000..2705b88b6 --- /dev/null +++ b/operator/k8s-flavors/iks/storage3.yaml @@ -0,0 +1,14 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: server-storage + labels: + kubernetes.io/cluster-service: "true" +provisioner: ibm.io/ibmc-block +parameters: + zone: "dal12" + region: "us-south" + type: "Endurance" + iopsPerGB: "4" + sizeRange: "[20-12000]Gi" +reclaimPolicy: "Delete" \ No newline at end of file From 1edae74a910e5064b02c398abde92e38b10cdcf8 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 12:11:43 -0500 Subject: [PATCH 07/17] Create storage4.yaml --- operator/k8s-flavors/iks/storage4.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 operator/k8s-flavors/iks/storage4.yaml diff --git a/operator/k8s-flavors/iks/storage4.yaml b/operator/k8s-flavors/iks/storage4.yaml new file mode 100644 index 000000000..5d3fa0105 --- /dev/null +++ b/operator/k8s-flavors/iks/storage4.yaml @@ -0,0 +1,14 @@ +apiVersion: storage.k8s.io/v2 +kind: StorageClass +metadata: + name: server-storage + labels: + kubernetes.io/cluster-service: "true" +provisioner: ibm.io/ibmc-block +parameters: + zone: "dal12" + region: "us-south" + type: "Endurance" + iopsPerGB: "4" + sizeRange: "[4-20]Gi" +reclaimPolicy: "Delete" \ No newline at end of file From 6cc813f8f76a591e04b8690ad9f865b137529309 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 12:13:23 -0500 Subject: [PATCH 08/17] Update storage4.yaml --- operator/k8s-flavors/iks/storage4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/k8s-flavors/iks/storage4.yaml b/operator/k8s-flavors/iks/storage4.yaml index 5d3fa0105..1e7401dbe 100644 --- a/operator/k8s-flavors/iks/storage4.yaml +++ b/operator/k8s-flavors/iks/storage4.yaml @@ -1,4 +1,4 @@ -apiVersion: storage.k8s.io/v2 +apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: server-storage From d51313667ac776e379a938cb2827e7cc2c8aec69 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 12:20:57 -0500 Subject: [PATCH 09/17] Update storage4.yaml --- operator/k8s-flavors/iks/storage4.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/operator/k8s-flavors/iks/storage4.yaml b/operator/k8s-flavors/iks/storage4.yaml index 1e7401dbe..04b13668a 100644 --- a/operator/k8s-flavors/iks/storage4.yaml +++ b/operator/k8s-flavors/iks/storage4.yaml @@ -6,6 +6,7 @@ metadata: kubernetes.io/cluster-service: "true" provisioner: ibm.io/ibmc-block parameters: + classVersion: "2" zone: "dal12" region: "us-south" type: "Endurance" From 6e863375c29e6fbe42c17a6f976e73acc3cea60c Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 12:34:47 -0500 Subject: [PATCH 10/17] Update storage4.yaml --- operator/k8s-flavors/iks/storage4.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/operator/k8s-flavors/iks/storage4.yaml b/operator/k8s-flavors/iks/storage4.yaml index 04b13668a..362dca21a 100644 --- a/operator/k8s-flavors/iks/storage4.yaml +++ b/operator/k8s-flavors/iks/storage4.yaml @@ -12,4 +12,5 @@ parameters: type: "Endurance" iopsPerGB: "4" sizeRange: "[4-20]Gi" +volumeBindingMode: WaitForFirstConsumer reclaimPolicy: "Delete" \ No newline at end of file From f159b0ab12fc2130eb61eacce89e506c6ee4fe0f Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 12:45:04 -0500 Subject: [PATCH 11/17] Update storage4.yaml --- operator/k8s-flavors/iks/storage4.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/operator/k8s-flavors/iks/storage4.yaml b/operator/k8s-flavors/iks/storage4.yaml index 362dca21a..bb020a154 100644 --- a/operator/k8s-flavors/iks/storage4.yaml +++ b/operator/k8s-flavors/iks/storage4.yaml @@ -4,13 +4,13 @@ metadata: name: server-storage labels: kubernetes.io/cluster-service: "true" -provisioner: ibm.io/ibmc-block +provisioner: ibm.io/ibmc-block-bronze parameters: classVersion: "2" zone: "dal12" region: "us-south" type: "Endurance" - iopsPerGB: "4" - sizeRange: "[4-20]Gi" + iopsPerGB: "2" + sizeRange: "[20-12000]Gi" volumeBindingMode: WaitForFirstConsumer reclaimPolicy: "Delete" \ No newline at end of file From db275b82822264f97b6a7e8f3807edaf1323b017 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 21 Dec 2020 12:49:17 -0500 Subject: [PATCH 12/17] Create storage5.yaml --- operator/k8s-flavors/iks/storage5.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 operator/k8s-flavors/iks/storage5.yaml diff --git a/operator/k8s-flavors/iks/storage5.yaml b/operator/k8s-flavors/iks/storage5.yaml new file mode 100644 index 000000000..ae84699fd --- /dev/null +++ b/operator/k8s-flavors/iks/storage5.yaml @@ -0,0 +1,15 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: server-storage + labels: + kubernetes.io/cluster-service: "true" +provisioner: ibm.io/ibmc-block-bronze +parameters: + classVersion: "2" + zone: "dal12" + region: "us-south" + type: "Endurance" + iopsPerGB: "2" + sizeRange: "[20-12000]Gi" +reclaimPolicy: "Delete" \ No newline at end of file From ce64336fc899dd249d6e3677f4417f6188614f75 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 22 Dec 2020 10:21:51 -0500 Subject: [PATCH 13/17] Testing Day 3 --- .../dse-6.8.x/example-cassdc-minimal2.yaml | 29 +++++++++++++++++++ operator/k8s-flavors/iks/storage6.yaml | 15 ++++++++++ 2 files changed, 44 insertions(+) create mode 100644 operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal2.yaml create mode 100644 operator/k8s-flavors/iks/storage6.yaml diff --git a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal2.yaml b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal2.yaml new file mode 100644 index 000000000..ce8c9c141 --- /dev/null +++ b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal2.yaml @@ -0,0 +1,29 @@ +# Sized to work on 3 k8s workers nodes with 1 core / 4 GB RAM +# See neighboring example-cassdc-full.yaml for docs for each parameter +apiVersion: cassandra.datastax.com/v1beta1 +kind: CassandraDatacenter +metadata: + name: dc1 +spec: + clusterName: cluster1 + serverType: dse + serverVersion: "6.8.4" + managementApiAuth: + insecure: {} + size: 3 + storageConfig: + cassandraDataVolumeClaimSpec: + storageClassName: server-storage + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 25Gi + config: + jvm-server-options: + initial_heap_size: "800M" + max_heap_size: "800M" + additional-jvm-opts: + # As the database comes up for the first time, set system keyspaces to RF=3 + - "-Ddse.system_distributed_replication_dc_names=dc1" + - "-Ddse.system_distributed_replication_per_dc=3" diff --git a/operator/k8s-flavors/iks/storage6.yaml b/operator/k8s-flavors/iks/storage6.yaml new file mode 100644 index 000000000..573f0dab1 --- /dev/null +++ b/operator/k8s-flavors/iks/storage6.yaml @@ -0,0 +1,15 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: server-storage + labels: + kubernetes.io/cluster-service: "true" +provisioner: ibm.io/ibmc-block +parameters: + classVersion: "2" + zone: "dal12" + region: "us-south" + type: "Endurance" + iopsPerGB: "2" + sizeRange: "[20-12000]Gi" +reclaimPolicy: "Delete" \ No newline at end of file From 502c2b2952e906e754dd0661f2d78649f72ecde4 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 22 Dec 2020 11:15:10 -0500 Subject: [PATCH 14/17] Finalize working block storage yaml --- .../iks/{storage6.yaml => storage-block.yaml} | 0 operator/k8s-flavors/iks/storage2.yaml | 5 ----- operator/k8s-flavors/iks/storage3.yaml | 14 -------------- operator/k8s-flavors/iks/storage4.yaml | 16 ---------------- operator/k8s-flavors/iks/storage5.yaml | 15 --------------- 5 files changed, 50 deletions(-) rename operator/k8s-flavors/iks/{storage6.yaml => storage-block.yaml} (100%) delete mode 100644 operator/k8s-flavors/iks/storage2.yaml delete mode 100644 operator/k8s-flavors/iks/storage3.yaml delete mode 100644 operator/k8s-flavors/iks/storage4.yaml delete mode 100644 operator/k8s-flavors/iks/storage5.yaml diff --git a/operator/k8s-flavors/iks/storage6.yaml b/operator/k8s-flavors/iks/storage-block.yaml similarity index 100% rename from operator/k8s-flavors/iks/storage6.yaml rename to operator/k8s-flavors/iks/storage-block.yaml diff --git a/operator/k8s-flavors/iks/storage2.yaml b/operator/k8s-flavors/iks/storage2.yaml deleted file mode 100644 index affb15788..000000000 --- a/operator/k8s-flavors/iks/storage2.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: server-storage -provisioner: ibm.io/ibmc-file \ No newline at end of file diff --git a/operator/k8s-flavors/iks/storage3.yaml b/operator/k8s-flavors/iks/storage3.yaml deleted file mode 100644 index 2705b88b6..000000000 --- a/operator/k8s-flavors/iks/storage3.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: server-storage - labels: - kubernetes.io/cluster-service: "true" -provisioner: ibm.io/ibmc-block -parameters: - zone: "dal12" - region: "us-south" - type: "Endurance" - iopsPerGB: "4" - sizeRange: "[20-12000]Gi" -reclaimPolicy: "Delete" \ No newline at end of file diff --git a/operator/k8s-flavors/iks/storage4.yaml b/operator/k8s-flavors/iks/storage4.yaml deleted file mode 100644 index bb020a154..000000000 --- a/operator/k8s-flavors/iks/storage4.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: server-storage - labels: - kubernetes.io/cluster-service: "true" -provisioner: ibm.io/ibmc-block-bronze -parameters: - classVersion: "2" - zone: "dal12" - region: "us-south" - type: "Endurance" - iopsPerGB: "2" - sizeRange: "[20-12000]Gi" -volumeBindingMode: WaitForFirstConsumer -reclaimPolicy: "Delete" \ No newline at end of file diff --git a/operator/k8s-flavors/iks/storage5.yaml b/operator/k8s-flavors/iks/storage5.yaml deleted file mode 100644 index ae84699fd..000000000 --- a/operator/k8s-flavors/iks/storage5.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: server-storage - labels: - kubernetes.io/cluster-service: "true" -provisioner: ibm.io/ibmc-block-bronze -parameters: - classVersion: "2" - zone: "dal12" - region: "us-south" - type: "Endurance" - iopsPerGB: "2" - sizeRange: "[20-12000]Gi" -reclaimPolicy: "Delete" \ No newline at end of file From efe0bb68c62dbcd41629599174d19441d6d047ee Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 23 Dec 2020 10:19:37 -0500 Subject: [PATCH 15/17] Create example-cassdc-minimal3.yaml --- .../dse-6.8.x/example-cassdc-minimal3.yaml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml diff --git a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml new file mode 100644 index 000000000..b37bc837b --- /dev/null +++ b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml @@ -0,0 +1,31 @@ +# Sized to work on 3 k8s workers nodes with 1 core / 4 GB RAM +# See neighboring example-cassdc-full.yaml for docs for each parameter +apiVersion: cassandra.datastax.com/v1beta1 +kind: CassandraDatacenter +metadata: + name: dc1 +spec: + clusterName: cluster1 + serverType: dse + serverVersion: "6.8.4" + managementApiAuth: + insecure: {} + size: 3 + storageConfig: + cassandraDataVolumeClaimSpec: + storageClassName: server-storage + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 25Gi + config: + backup_service: + enabled: true + jvm-server-options: + initial_heap_size: "800M" + max_heap_size: "800M" + additional-jvm-opts: + # As the database comes up for the first time, set system keyspaces to RF=3 + - "-Ddse.system_distributed_replication_dc_names=dc1" + - "-Ddse.system_distributed_replication_per_dc=3" From 1034e4895ed84a7aa125c8ade13c97c998c2f1f1 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 23 Dec 2020 10:56:13 -0500 Subject: [PATCH 16/17] Update example-cassdc-minimal3.yaml --- .../dse-6.8.x/example-cassdc-minimal3.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml index b37bc837b..0453c0a8b 100644 --- a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml +++ b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml @@ -20,8 +20,9 @@ spec: requests: storage: 25Gi config: - backup_service: - enabled: true + cassandra-yaml: + backup_service: + enabled: true jvm-server-options: initial_heap_size: "800M" max_heap_size: "800M" From 9e030c317e79e041026a15d82454f6dc00445b18 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 4 Feb 2021 08:24:58 -0500 Subject: [PATCH 17/17] Update example-cassdc-minimal3.yaml --- .../example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml index 0453c0a8b..b4cefec21 100644 --- a/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml +++ b/operator/example-cassdc-yaml/dse-6.8.x/example-cassdc-minimal3.yaml @@ -23,6 +23,9 @@ spec: cassandra-yaml: backup_service: enabled: true + authenticator: org.apache.cassandra.auth.PasswordAuthenticator + authorizer: org.apache.cassandra.auth.CassandraAuthorizer + role_manager: org.apache.cassandra.auth.CassandraRoleManager jvm-server-options: initial_heap_size: "800M" max_heap_size: "800M"