Merge pull request #601 from ostelco/feature/upgrade-helm-chart-version

upgrade helm chart version and prod deployment config
ostelco · May 8, 2019 · 17009be · 17009be
2 parents b1fc032 + 07f9196
commit 17009be
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -260,7 +260,7 @@ jobs:
             /authenticate.bash
             helm repo add ostelco https://storage.googleapis.com/pi-ostelco-helm-charts-repo/
             helm repo update
-            helm upgrade prime ostelco/prime --version 0.6.1 --install --namespace dev \
+            helm upgrade prime ostelco/prime --version 0.6.2 --install --namespace dev \
              -f .circleci/prime-dev-values.yaml \
              --set prime.tag=${CIRCLE_SHA1:0:9} 
 
@@ -316,7 +316,7 @@ jobs:
             /authenticate.bash
             helm repo add ostelco https://storage.googleapis.com/pi-ostelco-helm-charts-repo/
             helm repo update
-            helm upgrade prime ostelco/prime --version 0.6.1 --install --namespace prod \
+            helm upgrade prime ostelco/prime --version 0.6.2 --install --namespace prod \
              -f .circleci/prime-prod-values.yaml  --set-string canary.tag=${CIRCLE_SHA1:0:9}
 
       - run:

diff --git a/.circleci/prime-dev-values.yaml b/.circleci/prime-dev-values.yaml
@@ -36,7 +36,6 @@ prime:
     FIREBASE_ROOT_PATH: dev
     NEO4J_HOST: neo4j-neo4j.neo4j.svc.cluster.local
     SLACK_CHANNEL: prime-alerts
-    DATASTORE_NAMESPACE: dev
     DATA_TRAFFIC_TOPIC: data-traffic
     PURCHASE_INFO_TOPIC: purchase-info
     ACTIVE_USERS_TOPIC: active-users

diff --git a/.circleci/prime-prod-values.yaml b/.circleci/prime-prod-values.yaml
@@ -15,28 +15,27 @@ podAutoscaling:
 
 cronjobs: 
   extractor: 
-    enabled: false
+    enabled: true
     image: eu.gcr.io/pi-ostelco-dev/bq-metrics-extractor
     tag: "1.3.212.1.0-2d41d62b-dev"  
     dataset_project: pi-ostelco-prod
   shredder:
-    enabled: false
+    enabled: true
     image: eu.gcr.io/pi-ostelco-dev/scaninfo-shredder
     tag: "1.0.0-6052932a-dev"
     dataset_project: pi-ostelco-prod
     dev: false
 
 prime:
   image: eu.gcr.io/pi-ostelco-dev/prime
-  tag: 658618fc1 # stable tag
+  tag: b1fc032f4 # stable tag
   pullPolicy: Always
-  configDataBucket: "gs://pi-ostelco-prod-prime-files/"
+  configDataBucket: "gs://pi-ostelco-prod-prime-files/prod"
 
   env:
     FIREBASE_ROOT_PATH: v2
     NEO4J_HOST: neo4j-neo4j.neo4j.svc.cluster.local
     SLACK_CHANNEL: prime-alerts
-    DATASTORE_NAMESPACE: ""
     DATA_TRAFFIC_TOPIC: data-traffic
     PURCHASE_INFO_TOPIC: purchase-info
     ACTIVE_USERS_TOPIC: active-users
@@ -269,8 +268,6 @@ services:
     clientCert: true
     caCert: smdp-cacert.prod # secretname.namespace
 
-ingress:
-  enabled: false
 
 
 certs: 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -15,8 +15,6 @@ spec:
             env:
             - name: DATASET_PROJECT
               value: GCP_PROJECT_ID
-            - name: DATASTORE_NAMESPACE
-              value: dev
             - name: JUMIO_API_TOKEN
               valueFrom:
                 secretKeyRef:
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ sourceSets { @@
       }
     }
-    version = "1.36.0"
+    version = "1.36.1"
     repositories {
       maven {
@@ Expand Down @@