config map and chart updates

cfpb · Feb 18, 2022 · a185613 · a185613
1 parent 80b3c08
commit a185613
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1 deletion.
diff --git a/UPGRADES.md b/UPGRADES.md
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS akka.all_persistence_ids(
   persistence_id text PRIMARY KEY);
 ```
 
-new environment variable to put into `cassandra-configmap`: `CASSANDRA_CLUSTER_DC` (e.g.: `dc` / `dc2`)
+new environment variable to put into `cassandra-configmap`: `cassandra-cluster-dc` (e.g.: `dc` / `dc2`)
 
 ### Migration
 newly added table needs to be populated, refer to [Migration Documentation](https://doc.akka.io/docs/akka-persistence-cassandra/current/migrations.html) in [plugin upgrade](#akka-cassandra-persistence-plugin-upgrade) section,

diff --git a/kubernetes/beta/config-maps/cassandra-configmap.yaml b/kubernetes/beta/config-maps/cassandra-configmap.yaml
@@ -4,5 +4,6 @@ metadata:
   name: cassandra-configmap
 data:
   cassandra-hosts: node-0-server.cassandra.autoip.dcos.thisdcos.directory
+  cassandra-cluster-dc: datacenter1
   cassandra-keyspace: hmda2_journal_beta
   cassandra-keyspace-snapshot: hmda2_snapshot_beta
diff --git a/kubernetes/beta/hmda-platform/templates/deployment.yaml b/kubernetes/beta/hmda-platform/templates/deployment.yaml
@@ -127,6 +127,11 @@ spec:
                 configMapKeyRef:
                   name: cassandra-configmap
                   key: cassandra-hosts
+            - name: CASSANDRA_CLUSTER_DC
+              valueFrom:
+                configMapKeyRef:
+                  name: cassandra-configmap
+                  key: cassandra-cluster-dc
             - name: CASSANDRA_JOURNAL_KEYSPACE
               valueFrom:
                 configMapKeyRef:

diff --git a/kubernetes/config-maps/cassandra-configmap.yaml b/kubernetes/config-maps/cassandra-configmap.yaml
@@ -6,5 +6,6 @@ metadata:
     reloader.stakater.com/match: "true"
 data:
   cassandra-hosts: cluster1-dc1-service.cass-operator
+  cassandra-cluster-dc: dc1
   cassandra-keyspace: hmda2_journal
   cassandra-keyspace-snapshot: hmda2_snapshot
diff --git a/kubernetes/hmda-platform/templates/deployment.yaml b/kubernetes/hmda-platform/templates/deployment.yaml
@@ -124,6 +124,11 @@ spec:
             configMapKeyRef:
               name: cassandra-configmap
               key: cassandra-hosts
+        - name: CASSANDRA_CLUSTER_DC
+          valueFrom:
+            configMapKeyRef:
+              name: cassandra-configmap
+              key: cassandra-cluster-dc
         - name: CASSANDRA_JOURNAL_KEYSPACE
           valueFrom:
             configMapKeyRef:

diff --git a/kubernetes/kind/hmda-platform/helm/templates/deployment.yaml b/kubernetes/kind/hmda-platform/helm/templates/deployment.yaml
@@ -214,6 +214,11 @@ spec:
             configMapKeyRef:
               name: cassandra-configmap
               key: cassandra-hosts
+        - name: CASSANDRA_CLUSTER_DC
+          valueFrom:
+            configMapKeyRef:
+              name: cassandra-configmap
+              key: cassandra-cluster-dc
         - name: CASSANDRA_JOURNAL_KEYSPACE
           valueFrom:
             configMapKeyRef:

diff --git a/kubernetes/kind/hmda-platform/kubernetes/cassandra-configmap.yaml b/kubernetes/kind/hmda-platform/kubernetes/cassandra-configmap.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 data:
   cassandra-hosts: cluster2-dc2-all-pods-service:9142
+  cassandra-cluster-dc: dc2
   cassandra-keyspace: hmda2_journal
   cassandra-keyspace-snapshot: hmda2_snapshot
 kind: ConfigMap