From 07f9196d4d8ad0c1f2a5d03b054ec06ca2c748ce Mon Sep 17 00:00:00 2001
From: Vihang Patil <vihang.patil@gmail.com>
Date: Wed, 8 May 2019 12:09:11 +0200
Subject: [PATCH] Removed DATASTORE_NAMESPACE everywhere.

---
 prime/build.gradle                          | 2 +-
 prime/config/config.yaml                    | 2 +-
 prime/infra/prime-direct-values.yaml        | 1 -
 scaninfo-shredder/config/config.yaml        | 2 +-
 scaninfo-shredder/cronjob/shredder-dev.yaml | 2 --
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/prime/build.gradle b/prime/build.gradle
index 6a32fa0cb..6a305a3ac 100644
--- a/prime/build.gradle
+++ b/prime/build.gradle
@@ -18,7 +18,7 @@ sourceSets {
   }
 }
 
-version = "1.36.0"
+version = "1.36.1"
 
 repositories {
   maven {
diff --git a/prime/config/config.yaml b/prime/config/config.yaml
index 2e2b6fef1..f23ea0fd0 100644
--- a/prime/config/config.yaml
+++ b/prime/config/config.yaml
@@ -66,7 +66,7 @@ modules:
   - type: scaninfo-store
     config:
       keysetFilePathPrefix: /scaninfo-keysets/encrypt_key
-      namespace: ${DATASTORE_NAMESPACE:-""}
+      namespace: ""
   - type: sim-manager
     config:
       openApi:
diff --git a/prime/infra/prime-direct-values.yaml b/prime/infra/prime-direct-values.yaml
index 8a3f92b29..ee06c17c5 100644
--- a/prime/infra/prime-direct-values.yaml
+++ b/prime/infra/prime-direct-values.yaml
@@ -36,7 +36,6 @@ prime:
     FIREBASE_ROOT_PATH: direct
     NEO4J_HOST: neo4j-neo4j.neo4j.svc.cluster.local
     SLACK_CHANNEL: prime-alerts
-    DATASTORE_NAMESPACE: direct
     DATA_TRAFFIC_TOPIC: data-traffic
     PURCHASE_INFO_TOPIC: purchase-info
     ACTIVE_USERS_TOPIC: active-users
diff --git a/scaninfo-shredder/config/config.yaml b/scaninfo-shredder/config/config.yaml
index b4ca57daf..eb148a592 100644
--- a/scaninfo-shredder/config/config.yaml
+++ b/scaninfo-shredder/config/config.yaml
@@ -11,4 +11,4 @@ logging:
 
 deleteScan: true
 deleteUrl: "https://netverify.com/api/netverify/v2/scans/"
-namespace: ${DATASTORE_NAMESPACE:-""}
+namespace: ""
diff --git a/scaninfo-shredder/cronjob/shredder-dev.yaml b/scaninfo-shredder/cronjob/shredder-dev.yaml
index 58352e825..bdfc5541d 100644
--- a/scaninfo-shredder/cronjob/shredder-dev.yaml
+++ b/scaninfo-shredder/cronjob/shredder-dev.yaml
@@ -15,8 +15,6 @@ spec:
             env:
             - name: DATASET_PROJECT
               value: GCP_PROJECT_ID
-            - name: DATASTORE_NAMESPACE
-              value: dev
             - name: JUMIO_API_TOKEN
               valueFrom:
                 secretKeyRef: