Merge pull request #168 from uc-cdis/fix/metadata-gateway

Make sure metadata gateway creds are consistent
uc-cdis · Apr 11, 2024 · 46b8d44 · 46b8d44
2 parents 8d59868 + 0dcaa3a
commit 46b8d44
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml
@@ -52,7 +52,7 @@ dependencies:
   repository: "file://../manifestservice"
   condition: manifestservice.enabled
 - name: metadata
-  version: 0.1.10
+  version: 0.1.11
   repository: "file://../metadata"
   condition: metadata.enabled
 - name: peregrine
@@ -115,7 +115,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: 0.1.28
+version: 0.1.29
 
 # 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

diff --git a/helm/gen3/README.md b/helm/gen3/README.md
@@ -1,6 +1,6 @@
 # gen3
 
-![Version: 0.1.28](https://img.shields.io/badge/Version-0.1.28-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
+![Version: 0.1.29](https://img.shields.io/badge/Version-0.1.29-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 Helm chart to deploy Gen3 Data Commons
 
@@ -30,7 +30,7 @@ Helm chart to deploy Gen3 Data Commons
 | file://../hatchery | hatchery | 0.1.8 |
 | file://../indexd | indexd | 0.1.13 |
 | file://../manifestservice | manifestservice | 0.1.13 |
-| file://../metadata | metadata | 0.1.10 |
+| file://../metadata | metadata | 0.1.11 |
 | file://../peregrine | peregrine | 0.1.12 |
 | file://../pidgin | pidgin | 0.1.9 |
 | file://../portal | portal | 0.1.10 |

diff --git a/helm/metadata/Chart.yaml b/helm/metadata/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: 0.1.10
+version: 0.1.11
 
 # 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

diff --git a/helm/metadata/README.md b/helm/metadata/README.md
@@ -1,6 +1,6 @@
 # metadata
 
-![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
+![Version: 0.1.11](https://img.shields.io/badge/Version-0.1.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 A Helm chart for gen3 Metadata Service
 

diff --git a/helm/metadata/templates/secrets.yaml b/helm/metadata/templates/secrets.yaml
@@ -5,14 +5,7 @@ metadata:
   name: metadata-g3auto
 stringData:
   {{- $randomPass := printf "%s%s" "gateway:" (randAlphaNum 32)  }}
-  base64Authz.txt: {{  $randomPass | b64enc | quote  }}
-  dbcreds.json: |
-    {
-      "db_host": {{ .Values.postgres.host | quote }},
-      "db_username": {{ .Values.postgres.user | quote}},
-      "db_password": {{ include "metadata.postgres.password" . | quote }},
-      "db_database": {{ .Values.postgres.dbname | quote }}
-    }
+  base64Authz.txt: {{  $randomPass | quote | b64enc }}
   metadata.env: | 
     DEBUG={{ .Values.debug}}
     DB_HOST={{ .Values.postgres.host  }}