Smarter location for values

Author: beergeek

README.md

@@ -251,7 +251,7 @@ If LDAP authorisation is not required this setting can be skipped.
 
 Two environment variables are required, called ENV and NS (both case senstive). The first describes the selected Git environment for deployment and the second describes the Kubernetes namespace.
 
-The variables for each deployment are contained in the `values.yaml`. The `values.yaml` file for the selected environment must reside in a directory under `charts/values/<ENV>` such as `charts/values/dev/values.yaml` or `charts/values/production/values.yaml`. Each **\<ENV\>** directory will be a different deployment. The `examples` directory contains an examples `values.yaml` file, plus there are examples under the `charts/values` directory so the reader can see the structure.
+The variables for each deployment are contained in the `values.yaml`. The `values.yaml` file for the selected environment must reside in a directory under `values/<ENV>` such as `values/dev/values.yaml` or `values/production/values.yaml`. Each **\<ENV\>** directory will be a different deployment. The `examples` directory contains an examples `values.yaml` file, plus there are examples under the `values` directory so the reader can see the structure.
 
 The following table describes the values required in the relevant `values.yaml`:
 

helmfile.yaml

@@ -7,4 +7,4 @@ releases:
     namespace: {{ requiredEnv "NS" }}
     chart: ./charts
     values:
-    - ./charts/values/{{ requiredEnv "ENV" }}/values.yaml
+    - ./values/{{ requiredEnv "ENV" }}/values.yaml

charts/values/blockstore/values.yaml renamed to values/blockstore/values.yaml

@@ -48,7 +48,7 @@ storage:
       storageClass: logClass
 
 tls:
-  enabled: true
+  enabled: false
   caConfigMap: custom-ca
 
 extAccess:
@@ -60,3 +60,15 @@ kmip:
   enabled: false
   host: kmip-svc.mongodb.svc.cluster.local
   port: 5696
+
+
+additionalUsers:
+  - username: blockstore0-om-user
+    passwdSecret: om-user
+    roles:
+      - db: admin
+        role: "clusterMonitor"
+      - db: admin
+        role: "readWriteAnyDatabase"
+      - db: admin
+        role: "userAdminAnyDatabase"

charts/values/dev/values.yaml renamed to values/dev/values.yaml

@@ -59,3 +59,15 @@ kmip:
   enabled: false
   host: kmip-svc.mongodb.svc.cluster.local
   port: 5696
+
+
+additionalUsers:
+  - username: oplog0-om-user
+    passwdSecret: om-user
+    roles:
+      - db: admin
+        role: "clusterMonitor"
+      - db: admin
+        role: "readWriteAnyDatabase"
+      - db: admin
+        role: "userAdminAnyDatabase"