default disable ci cache & conditional cf-keypairs (#6)

* default disable ci cache & conditional cf-keypairs

- package lock is actually required for circleCI to cache, it throws
without the key, see https://circleci.com/developer/orbs/orb/circleci/node#commands-install-package
- so now it will just npm install instead of trying to restore cache,
left commented block for user to switch to instead
- since CF keypairs are now optionally generated, the injection should
also be optionally done

Author: davidcheung

templates/.circleci/config.yml

@@ -112,9 +112,16 @@ jobs:
     steps: # steps that comprise the `build` job
       - attach_workspace:
           at: *workspace
-      - node/install-packages:
-          cache-path: "./node_modules"
-          app-dir: .
+      ## This `npm install` step is used so boilerplate can pick up latest version before locking
+      ## and also allow variances of database drivers to be not part of the package-lock.json
+      ## Once you commit your package-lock.json you can retire this step for the cached version
+      ## 1. remove npm i --package-lock step
+      ## 2. use the commented node/install-packages instead
+      - run:
+          command: npm install
+      # - node/install-packages:
+      #     cache-path: "./node_modules"
+      #     app-dir: .
       - run:
           name: Generating env file
           command: cp .env.example .env
@@ -132,9 +139,16 @@ jobs:
     steps:
       - attach_workspace:
           at: *workspace
-      - node/install-packages:
-          cache-path: "./node_modules"
-          app-dir: .
+      ## This `npm install` step is used so boilerplate can pick up latest version before locking
+      ## and also allow variances of database drivers to be not part of the package-lock.json
+      ## Once you commit your package-lock.json you can retire this step for the cached version
+      ## 1. remove npm i --package-lock step
+      ## 2. use the commented node/install-packages instead
+      - run:
+          command: npm install
+      # - node/install-packages:
+      #     cache-path: "./node_modules"
+      #     app-dir: .
       - run: npm run lint
 
   build_and_push:

templates/kubernetes/base/deployment.yml

@@ -47,7 +47,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.name
-          - name: CF_KEYPAIR_ID
+<% if eq (index .Params `fileUploads`) "yes" %>          - name: CF_KEYPAIR_ID
             valueFrom:
                 secretKeyRef:
                   name: cf-keypair
@@ -57,7 +57,7 @@ spec:
                 secretKeyRef:
                   name: cf-keypair
                   key: private_key
-          - name: DATABASE_USERNAME
+<% end %>          - name: DATABASE_USERNAME
             valueFrom:
                 secretKeyRef:
                   name: <% .Name %>