Merge pull request #10 from AustrianDataLAB/devel

Beta test api fix

Author: adammccartney

deployments/mongo-deployment.yaml

@@ -7,23 +7,27 @@ metadata:
   annotations:
     source: "https://github.com/saintdle/pacman-tanzu"
 spec:
+  progressDeadlineSeconds: 600
   replicas: 1
+  revisionHistoryLimit: 10
   selector:
     matchLabels:
       name: mongo
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
   template:
     metadata:
+      creationTimestamp: null
       labels:
         name: mongo
     spec:
-      volumes:
-      - name: mongo-db
-        persistentVolumeClaim:
-          claimName: mongo-storage
       containers:
-      - image: bitnami/mongodb:4.4.14
-        name: mongo
-        env:
+      - env:
+        - name: BITNAMI_DEBUG
+          value: "false"
         - name: MONGODB_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
@@ -44,6 +48,25 @@ spec:
             secretKeyRef:
               key: database-user
               name: mongodb-users-secret
+        - name: ALLOW_EMPTY_PASSWORD
+          value: "no"
+        - name: MONGODB_SYSTEM_LOG_VERBOSITY
+          value: "0"
+        - name: MONGODB_DISABLE_SYSTEM_LOG
+          value: "no"
+        - name: MONGODB_DISABLE_JAVASCRIPT
+          value: "no"
+        - name: MONGODB_ENABLE_JOURNAL
+          value: "yes"
+        - name: MONGODB_PORT_NUMBER
+          value: "27017"
+        - name: MONGODB_ENABLE_IPV6
+          value: "no"
+        - name: MONGODB_ENABLE_DIRECTORY_PER_DB
+          value: "no"
+        image: bitnami/mongodb:4.4.14
+        imagePullPolicy: IfNotPresent
+        name: mongo
         readinessProbe:
           exec:
            command:
@@ -52,9 +75,36 @@ spec:
             - -c
             - mongo 127.0.0.1:27017/$MONGODB_DATABASE -u $MONGODB_USERNAME -p $MONGODB_PASSWORD
               --eval="quit()"
+          failureThreshold: 6
+          initialDelaySeconds: 5
+          periodSeconds: 5
         ports:
-        - name: mongo
-          containerPort: 27017
+        - containerPort: 27017
+          name: mongo
+          protocol: TCP
+        securityContext: 
+          runAsNonRoot: true
+          runAsUser: 1001
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
         volumeMounts:
           - name: mongo-db
+            subPath: mongodb
             mountPath: /bitnami/mongodb/
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext:
+        fsGroup: 1001
+      serviceAccount: default
+      serviceAccountName: default
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - configMap:
+          defaultMode: 360
+          name: pacman-mongo-common-scripts
+        name: common-scripts
+      - name: mongo-db
+        persistentVolumeClaim:
+          claimName: mongo-storage
+

pacman-uninstall.sh

@@ -21,5 +21,3 @@ echo "cleaning up your files"
 rm persistentvolumeclaim/mongo-pvc.yaml
 rm security/secret.yaml
 rm ingress/ingress.yaml
-
-

src/lib/database.js

@@ -6,16 +6,19 @@ var _db;
 
 function Database() {
     this.connect = function(app, callback) {
+            // This no longer returns a db, instead it returns a client,
+            // against which there is a function called db() that returns
+            // db instance we are looking for. 
             MongoClient.connect(config.database.url,
                                 config.database.options,
-                                function (err, db) {
+                                function (err, client) {
                                     if (err) {
                                         console.log(err);
                                         console.log(config.database.url);
                                         console.log(config.database.options);
                                     } else {
-                                        _db = db;
-                                        app.locals.db = db;
+                                        _db = client.db(config.database.name);
+                                        app.locals.db = client.db(config.database.name);
                                     }
                                     callback(err);
                                 });