Merge pull request #513 from uc-cdis/chore/add_env_variables_to_ff

Add Datadog ENV variables to frontend-framework chart

Author: jawadqur

helm/frontend-framework/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.22
+version: 0.1.23
 
 # 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
@@ -25,5 +25,5 @@ appVersion: "develop"
 
 dependencies:
   - name: common
-    version: 0.1.31
+    version: 0.1.34
     repository: file://../common

helm/frontend-framework/README.md

@@ -1,6 +1,6 @@
 # frontend-framework
 
-![Version: 0.1.22](https://img.shields.io/badge/Version-0.1.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: develop](https://img.shields.io/badge/AppVersion-develop-informational?style=flat-square)
+![Version: 0.1.23](https://img.shields.io/badge/Version-0.1.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: develop](https://img.shields.io/badge/AppVersion-develop-informational?style=flat-square)
 
 A Helm chart for the gen3 frontend framework
 

helm/frontend-framework/templates/deployment.yaml

@@ -60,21 +60,22 @@ spec:
             - /bin/sh
             - -c
             - |
+              echo "Starting config puller"
               mkdir -p /tmp/repo
               cd /tmp/repo
               # Clone with sparse checkout and filter
-              git clone --depth 1 ${GIT_REPO} siteconfig
-              cd siteconfig
-
-              # Fetch the branch
-              git fetch origin ${GIT_BRANCH}:config_branch
-              git switch config_branch
+              echo "Starting config puller"
+              git clone --depth 1 --branch ${GIT_BRANCH} --filter=blob:none --sparse ${GIT_REPO} /tmp/repo
+              cd /tmp/repo
+              git sparse-checkout set ${CONFIG_DIR}
+              echo "Done cloning config"
               {{- if .Values.customConfig.dir }}
-              cp -r /tmp/repo/siteconfig/{{ .Values.customConfig.dir }}/config/* /gen3/config
-              cp -r /tmp/repo/siteconfig/{{ .Values.customConfig.dir }}/public/* /gen3/public
+              cp -r /tmp/repo/{{ .Values.customConfig.dir }}/config/* /gen3/config
+              cp -r /tmp/repo/{{ .Values.customConfig.dir }}/public/* /gen3/public
               {{- else }}
-              cp -r /tmp/repo/siteconfig/config/* /gen3/config
-              cp -r /tmp/repo/siteconfig/public/* /gen3/public
+              cp -r /tmp/repo/config/* /gen3/config
+              cp -r /tmp/repo/public/* /gen3/public
+              echo "Done copying config"
               {{- end }}
           volumeMounts:
             - name: config-volume
@@ -131,6 +132,12 @@ spec:
               value: /portal
             {{- end }}
           {{- if .Values.customConfig.enabled }}
+            - name: DATADOG_APPLICATION_ID
+              value: {{ .Values.env.DATADOG_APPLICATION_ID | quote }}
+            - name: DATADOG_CLIENT_TOKEN
+              value: {{ .Values.env.DATADOG_CLIENT_TOKEN | quote }}
+            - name: DATACOMMONS
+              value: {{ .Values.env.DATACOMMONS | quote }}
           volumeMounts:
             - name: config-volume
               mountPath: /gen3/config

helm/gen3/Chart.yaml

@@ -60,7 +60,7 @@ dependencies:
     repository: file://../etl
     condition: etl.enabled
   - name: frontend-framework
-    version: 0.1.22
+    version: 0.1.23
     repository: "file://../frontend-framework"
     condition: frontend-framework.enabled
   - name: fence
@@ -193,7 +193,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.3.19
+version: 0.3.20
 
 # 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/gen3/README.md

@@ -1,6 +1,6 @@
 # gen3
 
-![Version: 0.3.19](https://img.shields.io/badge/Version-0.3.18-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.3.20](https://img.shields.io/badge/Version-0.3.18-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