Merge branch 'develop' into feature-support-json

Author: jeanetteclark

docs/metadig-101.md

@@ -144,11 +144,11 @@ The most comprehensive source of documentation for development is in the [develo
 
 ### Dependencies
 
-- `metadig-engine@feature-hashstore-support`
-- `metadig-checks@feature-data-quality`
-- `metadig-webapp@develop` (only if you are doing dev work on the API)
-- [`metadig-R`](https://github.com/NCEAS/metadig-r/tree)
-- [`metadig-py@feature-store-interface`](https://github.com/NCEAS/metadig-py/tree/feature-store-interface)
+- `metadig-engine`
+- `metadig-checks`
+- `metadig-webapp`
+- [`metadig-R`](https://github.com/NCEAS/metadig-r/)
+- [`metadig-py`](https://github.com/NCEAS/metadig-py)
 - Jep (it should install with metadig-py, but just in case `pip install jep`)
 
 ### Local Configuration
@@ -305,4 +305,4 @@ for (i in 1:length(pids)){
 }
 ```
 
-Once you've run that, just run the `run.sh` script that just got written.
+Once you've run that, just run the `run.sh` script that just got written.

helm/metadig-controller/config/metadig.properties

@@ -37,7 +37,7 @@ solr.location = http://metadig-solr.metadig.svc.cluster.local:8983/solr
 # PostgreSQL connection information
 postgres.user = metadig
 postgres.passwd = metadig
-jdbc.url = jdbc:postgresql://metadig-postgres.metadig.svc.cluster.local:6432/metadig
+jdbc.url = jdbc:postgresql://metadig-pg-pooler.metadig.svc.cluster.local:5432/metadig?sslmode=disable
 # The metadig-scheduler task file
 task.file = /opt/local/metadig/taskList.csv
 # The metadig-scheduler service does not use the public MetaDIG URL, but instead

helm/metadig-postgres/cluster.yaml

@@ -21,11 +21,18 @@ spec:
         name: metadig-pg
   storage:
     storageClass: csi-cephfs-sc
-    size: 50Gi
+    size: 200Gi
+  resources:
+    requests:
+      cpu: 1
+      memory: 1Gi
+    limits:
+      cpu: 2
+      memory: 4Gi
   externalClusters:
     - name: cluster-metadig-10
       connectionParameters:
         # Use the correct IP or host name for the source database
-        host: 10.109.52.33
+        host: 10.98.125.147
         user: metadig
         dbname: metadig

helm/metadig-postgres/pooler.yaml

@@ -1,7 +1,7 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Pooler
 metadata:
-  name: pooler-metadig-pg
+  name: metadig-pg-pooler
 spec:
   cluster:
     name: metadig-pg

helm/metadig-worker/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.7
+version: 1.0.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm/metadig-worker/values.yaml

@@ -55,6 +55,8 @@ podSecurityContext:
   runAsUser: 59990
   runAsGroup: 59997
   fsGroup: 59990
+  supplementalGroups:
+    - 1004
 
 #topologySpreadConstraints:
 #  - maxSkew: 10
@@ -80,7 +82,7 @@ ingress:
 
 resources:
   requests:
-    cpu: 500m
+    cpu: 50m
     memory: 512Mi
   limits:
     cpu: 1