Merge pull request #197 from razee-io/mongo_cert_update

don't use env variable for mongo_cert
razee-io · Mar 4, 2020 · 3ecc6e1 · 3ecc6e1
2 parents 54e66ae + 287fffe
commit 3ecc6e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/app/conf.js b/app/conf.js
@@ -18,7 +18,7 @@ const conf = {
   mongo: {
     url: process.env.MONGO_URL || 'mongodb://localhost:3001/meteor',
     dbName: process.env.MONGO_DB_NAME || 'meteor',
-    cert: process.env.MONGO_CERT
+    cert: '/var/run/secrets/razeeio/razeedash-secret/mongo_cert'
   },
   s3: {
     endpoint: process.env.S3_ENDPOINT,

diff --git a/app/mongo/mongoClient.js b/app/mongo/mongoClient.js
@@ -18,6 +18,7 @@ const clone = require('clone');
 const MongoDBClient = require('mongodb').MongoClient;
 const pLimit = require('p-limit');
 const objectPath = require('object-path');
+const fs = require('fs');
 
 module.exports = class MongoClient {
   constructor(options) {
@@ -124,7 +125,7 @@ module.exports = class MongoClient {
   async _clientConnect(){
     if (!this._client) {
       const options = {useNewUrlParser: true};
-      if(this._mongo.cert) {
+      if(fs.existsSync(this._mongo.cert)) {
         options['tlsCAFile'] = this._mongo.cert;
         this.log.info(`Using tlsCAFile: ${this._mongo.cert}`);
       }

diff --git a/kubernetes/razeedash-api/resource.yaml b/kubernetes/razeedash-api/resource.yaml
@@ -44,8 +44,6 @@ items:
                 secretKeyRef:
                   name: razeedash-secret
                   key: mongo_url
-            - name: MONGO_CERT
-              value: /var/run/secrets/razeeio/razeedash-secret/mongo_cert
             image: "quay.io/razee/razeedash-api:{{TRAVIS_TAG}}"
             command: ["npm", "run", "wait-mongo"]
             imagePullPolicy: Always
@@ -90,8 +88,6 @@ items:
                 secretKeyRef:
                   name: razeedash-secret
                   key: mongo_url
-            - name: MONGO_CERT
-              value: /var/run/secrets/razeeio/razeedash-secret/mongo_cert
             - name: MONGO_DB_NAME
               value: razeedash
             - name: ORG_ADMIN_KEY