Merge "Update Roles and fix Cassandra race cond."

2 files changed, 147 insertions, 5 deletions

diff --git a/kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql b/kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql
new file mode 100644
index 0000000000..7827727ebc
--- /dev/null
+++ b/kubernetes/portal/charts/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql
@@ -0,0 +1,145 @@
+// Copyright © 2018 Amdocs, Bell Canada, AT&T

+//

+// Licensed under the Apache License, Version 2.0 (the "License");

+// you may not use this file except in compliance with the License.

+// You may obtain a copy of the License at

+//

+//       http://www.apache.org/licenses/LICENSE-2.0

+//

+// Unless required by applicable law or agreed to in writing, software

+// distributed under the License is distributed on an "AS IS" BASIS,

+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+// See the License for the specific language governing permissions and

+// limitations under the License.

+

+

+CREATE KEYSPACE IF NOT EXISTS admin

+    WITH REPLICATION = {

+        'class' : 'SimpleStrategy',

+        'replication_factor': 1

+    }

+    AND DURABLE_WRITES = true;

+ 

+CREATE TABLE IF NOT EXISTS admin.keyspace_master (

+    uuid uuid,

+    keyspace_name text,

+    application_name text,

+    is_api boolean,

+    password text,

+    username text,

+    is_aaf boolean,

+    PRIMARY KEY (uuid)

+);

+

+

+CREATE KEYSPACE IF NOT EXISTS portal

+    WITH REPLICATION = {

+        'class' : 'SimpleStrategy',

+        'replication_factor': 1

+    }

+    AND DURABLE_WRITES = true;

+

+

+CREATE TABLE portal.spring_session (

+    primary_id text PRIMARY KEY,

+    creation_time text,

+    expiry_time text,

+    last_access_time text,

+    max_inactive_interval text,

+    principal_name text,

+    session_id text,

+    vector_ts text

+) WITH bloom_filter_fp_chance = 0.01

+    AND caching = {'keys': 'ALL', 'rows_per_partition': '10'}

+    AND comment = ''

+    AND compaction = {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}

+    AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}

+    AND crc_check_chance = 1.0

+    AND dclocal_read_repair_chance = 0.1

+    AND default_time_to_live = 0

+    AND gc_grace_seconds = 864000

+    AND max_index_interval = 2048

+    AND memtable_flush_period_in_ms = 0

+    AND min_index_interval = 128

+    AND read_repair_chance = 0.0

+    AND speculative_retry = '99PERCENTILE';

+

+

+CREATE TABLE portal.spring_session_attributes (

+    primary_id text,

+    attribute_name text,

+    attribute_bytes blob,

+    vector_ts text,

+    PRIMARY KEY (primary_id, attribute_name)

+) WITH CLUSTERING ORDER BY (attribute_name ASC)

+    AND bloom_filter_fp_chance = 0.01

+    AND caching = {'keys': 'ALL', 'rows_per_partition': '1'}

+    AND comment = ''

+    AND compaction = {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}

+    AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}

+    AND crc_check_chance = 1.0

+    AND dclocal_read_repair_chance = 0.1

+    AND default_time_to_live = 0

+    AND gc_grace_seconds = 864000

+    AND max_index_interval = 2048

+    AND memtable_flush_period_in_ms = 0

+    AND min_index_interval = 128

+    AND read_repair_chance = 0.0

+    AND speculative_retry = '99PERCENTILE';

+    

+

+

+CREATE KEYSPACE IF NOT EXISTS portalsdk

+    WITH REPLICATION = {

+        'class' : 'SimpleStrategy',

+        'replication_factor': 1

+    }

+    AND DURABLE_WRITES = true;

+

+

+CREATE TABLE portalsdk.spring_session (

+    primary_id text PRIMARY KEY,

+    creation_time text,

+    expiry_time text,

+    last_access_time text,

+    max_inactive_interval text,

+    principal_name text,

+    session_id text,

+    vector_ts text

+) WITH bloom_filter_fp_chance = 0.01

+    AND caching = {'keys': 'ALL', 'rows_per_partition': '10'}

+    AND comment = ''

+    AND compaction = {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}

+    AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}

+    AND crc_check_chance = 1.0

+    AND dclocal_read_repair_chance = 0.1

+    AND default_time_to_live = 0

+    AND gc_grace_seconds = 864000

+    AND max_index_interval = 2048

+    AND memtable_flush_period_in_ms = 0

+    AND min_index_interval = 128

+    AND read_repair_chance = 0.0

+    AND speculative_retry = '99PERCENTILE';

+

+

+CREATE TABLE portalsdk.spring_session_attributes (

+    primary_id text,

+    attribute_name text,

+    attribute_bytes blob,

+    vector_ts text,

+    PRIMARY KEY (primary_id, attribute_name)

+) WITH CLUSTERING ORDER BY (attribute_name ASC)

+    AND bloom_filter_fp_chance = 0.01

+    AND caching = {'keys': 'ALL', 'rows_per_partition': '1'}

+    AND comment = ''

+    AND compaction = {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'}

+    AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}

+    AND crc_check_chance = 1.0

+    AND dclocal_read_repair_chance = 0.1

+    AND default_time_to_live = 0

+    AND gc_grace_seconds = 864000

+    AND max_index_interval = 2048

+    AND memtable_flush_period_in_ms = 0

+    AND min_index_interval = 128

+    AND read_repair_chance = 0.0

+    AND speculative_retry = '99PERCENTILE';
\ No newline at end of file
diff --git a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
index 0adf4e1b79..2040794074 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
@@ -75,11 +75,8 @@ spec:
           name: localtime
           readOnly: true
         - name: cassandra-docker-entrypoint-initdb
-          mountPath: /docker-entrypoint-initdb.d/zzz_portal.cql
-          subPath: portal.cql
-        - name: cassandra-docker-entrypoint-initdb
-          mountPath: /docker-entrypoint-initdb.d/zzz_portalsdk.cql
-          subPath: portalsdk.cql
+          mountPath: /docker-entrypoint-initdb.d/aaa_portal_single.cql
+          subPath: portal_single.cql
         - name: {{ include "common.fullname" . }}-data
           mountPath: /var/lib/cassandra/data
         resources: