Skip to content

Commit 88cf393

Browse files
jawadqurjawadqur
authored
Merge pull request #561 from uc-cdis/feat/fix-ff-env
Remove hardcoded PORT and HOSTNAME from deployment; set them in value…
2 parents 2bfd644 + 923e84f commit 88cf393

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

‎helm/frontend-framework/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.25
18+
version: 0.1.26
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎helm/frontend-framework/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frontend-framework
22

3-
![Version: 0.1.25](https://img.shields.io/badge/Version-0.1.25-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)
3+
![Version: 0.1.26](https://img.shields.io/badge/Version-0.1.26-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)
44

55
A Helm chart for the gen3 frontend framework
66

@@ -29,7 +29,7 @@ A Helm chart for the gen3 frontend framework
2929
| customConfig.dir | string | `""` | directory to pull to the configuration from (e.g. gen3.datacommons.io/gen3ff) |
3030
| customConfig.enabled | bool | `false` | |
3131
| customConfig.repo | string | `"https://github.com/uc-cdis/commons-frontend-app.git"` | Repository for the config for CDIS this is cdis-manifest |
32-
| env | list | `{"DATACOMMONS":"","DATADOG_APPLICATION_ID":"","DATADOG_CLIENT_TOKEN":""}` | List of environment variables to add to the deployment. |
32+
| env | list | `{"DATACOMMONS":"","DATADOG_APPLICATION_ID":"","DATADOG_CLIENT_TOKEN":"","HOSTNAME":"0.0.0.0","PORT":"3000"}` | List of environment variables to add to the deployment. |
3333
| fullnameOverride | string | `""` | Override the full name of the deployment. |
3434
| global | map | `{"autoscaling":{"averageCPUValue":"500m","averageMemoryValue":"500Mi","enabled":false,"maxReplicas":10,"minReplicas":1},"aws":{"awsAccessKeyId":null,"awsSecretAccessKey":null,"enabled":false},"dev":true,"dictionaryUrl":"https://s3.amazonaws.com/dictionary-artifacts/datadictionary/develop/schema.json","dispatcherJobNum":10,"environment":"default","hostname":"localhost","kubeBucket":"kube-gen3","logsBucket":"logs-gen3","minAvailable":1,"netPolicy":{"enabled":false},"pdb":false,"portalApp":"gitops","postgres":{"dbCreate":true,"master":{"host":null,"password":null,"port":"5432","username":"postgres"}},"publicDataSets":true,"revproxyArn":"arn:aws:acm:us-east-1:123456:certificate","tierAccessLevel":"libre","topologySpread":{"enabled":false,"maxSkew":1,"topologyKey":"topology.kubernetes.io/zone"},"userYamlS3Path":"s3://cdis-gen3-users/test/user.yaml"}` | Global configuration options. |
3535
| global.aws | map | `{"awsAccessKeyId":null,"awsSecretAccessKey":null,"enabled":false}` | AWS configuration |
@@ -73,7 +73,6 @@ A Helm chart for the gen3 frontend framework
7373
| partOf | string | `"Front-End"` | Label to help organize pods and their use. Any value is valid, but use "_" or "-" to divide words. |
7474
| podAnnotations | map | `{}` | Annotations to add to the pod |
7575
| podSecurityContext | map | `{}` | Security context to apply to the pod |
76-
| port | int | `3000` | |
7776
| release | string | `"dev"` | Valid options are "production" or "dev". If invalid option is set- the value will default to "dev". |
7877
| replicaCount | int | `1` | Number of replicas for the deployment. |
7978
| resources | map | `{"limits":{"memory":"4096Mi"},"requests":{"memory":"512Mi"}}` | Resource requests and limits for the containers in the pod |

‎helm/frontend-framework/templates/deployment.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ spec:
145145
- name: {{ $key }}
146146
value: {{ $value | quote }}
147147
{{- end }}
148-
- name: PORT
149-
value: {{ .Values.port | quote }}
150-
- name: HOSTNAME
151-
value: revproxy-service
152148
{{- if eq "portal" .Values.global.frontendRoot }}
153149
- name: BASE_PATH
154150
value: /ff

‎helm/frontend-framework/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ service:
134134
# -- (int) The port number that the service exposes.
135135
port: 80
136136

137-
port: 3000
138-
139137

140138
customConfig:
141139
enabled: false
@@ -151,6 +149,8 @@ env:
151149
DATADOG_APPLICATION_ID: ""
152150
DATADOG_CLIENT_TOKEN: ""
153151
DATACOMMONS: ""
152+
HOSTNAME: "0.0.0.0"
153+
PORT: "3000"
154154

155155
# -- (map) Node selector to apply to the pod
156156
nodeSelector: {}

‎helm/gen3/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies:
6060
repository: file://../etl
6161
condition: etl.enabled
6262
- name: frontend-framework
63-
version: 0.1.25
63+
version: 0.1.26
6464
repository: "file://../frontend-framework"
6565
condition: frontend-framework.enabled
6666
- name: fence
@@ -193,7 +193,7 @@ type: application
193193
# to the chart and its templates, including the app version.
194194
# Versions are expected to follow Semantic Versioning (https://semver.org/)
195195

196-
version: 0.3.23
196+
version: 0.3.24
197197

198198
# This is the version number of the application being deployed. This version number should be
199199
# incremented each time you make changes to the application. Versions are not expected to

‎helm/gen3/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# gen3
22

3-
![Version: 0.3.23](https://img.shields.io/badge/Version-0.3.23-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)
3+
![Version: 0.3.24](https://img.shields.io/badge/Version-0.3.24-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)
44

55
Helm chart to deploy Gen3 Data Commons
66

@@ -34,7 +34,7 @@ Helm chart to deploy Gen3 Data Commons
3434
| file://../embedding-management-service | embedding-management-service | 0.1.4 |
3535
| file://../etl | etl | 0.1.22 |
3636
| file://../fence | fence | 0.1.73 |
37-
| file://../frontend-framework | frontend-framework | 0.1.25 |
37+
| file://../frontend-framework | frontend-framework | 0.1.26 |
3838
| file://../funnel | funnel | 0.1.13 |
3939
| file://../gen3-analysis | gen3-analysis | 0.1.9 |
4040
| file://../gen3-network-policies | gen3-network-policies | 0.1.3 |

0 commit comments

Comments
 (0)