From 1d6d5f1a18ac23c0f8903a9665c8c4473378eea9 Mon Sep 17 00:00:00 2001 From: Jawad Qureshi Date: Wed, 1 May 2024 11:37:54 -0500 Subject: [PATCH] Set portal as root on default --- .secrets.baseline | 8 ++++---- helm/gen3/Chart.yaml | 4 ++-- helm/gen3/README.md | 8 ++++---- helm/gen3/values.yaml | 2 +- helm/portal/Chart.yaml | 2 +- helm/portal/README.md | 3 ++- helm/portal/templates/deployment.yaml | 8 ++++---- helm/portal/values.yaml | 2 ++ 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 69ff47fc..1b97c1c2 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2024-05-01T14:42:54Z", + "generated_at": "2024-05-01T16:37:41Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -563,7 +563,7 @@ "hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900", "is_secret": false, "is_verified": false, - "line_number": 61, + "line_number": 62, "type": "Secret Keyword" } ], @@ -571,13 +571,13 @@ { "hashed_secret": "08eeb737b239bdb7362a875b90e22c10b8826b20", "is_verified": false, - "line_number": 478, + "line_number": 480, "type": "Base64 High Entropy String" }, { "hashed_secret": "eb9739c6625f06b4ab73035223366dda6262ae77", "is_verified": false, - "line_number": 481, + "line_number": 483, "type": "Base64 High Entropy String" } ], diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml index 7adfaa2b..e8dd4e97 100644 --- a/helm/gen3/Chart.yaml +++ b/helm/gen3/Chart.yaml @@ -68,7 +68,7 @@ dependencies: repository: "file://../pidgin" condition: pidgin.enabled - name: portal - version: 0.1.11 + version: 0.1.12 repository: "file://../portal" condition: portal.enabled - name: requestor @@ -119,7 +119,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.31 +version: 0.1.32 # 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 index ebc401e4..40c2dd42 100644 --- a/helm/gen3/README.md +++ b/helm/gen3/README.md @@ -1,6 +1,6 @@ # gen3 -![Version: 0.1.31](https://img.shields.io/badge/Version-0.1.31-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.32](https://img.shields.io/badge/Version-0.1.32-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 @@ -34,7 +34,7 @@ Helm chart to deploy Gen3 Data Commons | file://../metadata | metadata | 0.1.12 | | file://../peregrine | peregrine | 0.1.13 | | file://../pidgin | pidgin | 0.1.10 | -| file://../portal | portal | 0.1.11 | +| file://../portal | portal | 0.1.12 | | file://../requestor | requestor | 0.1.11 | | file://../revproxy | revproxy | 0.1.14 | | file://../sheepdog | sheepdog | 0.1.14 | @@ -73,8 +73,8 @@ Helm chart to deploy Gen3 Data Commons | fence.usersync.syncFromDbgap | bool | `false` | Whether to sync data from dbGaP. | | fence.usersync.userYamlS3Path | string | `"s3://cdis-gen3-users/helm-test/user.yaml"` | Path to the user.yaml file in S3. | | fence.usersync.usersync | bool | `false` | Whether to run Fence usersync or not. | -| frontend-framework | map | `{"enabled":true,"image":{"repository":"quay.io/cdis/frontend-framework","tag":"develop"}}` | Configurations for frontend-framework chart. | -| frontend-framework.enabled | bool | `true` | Whether to deploy the frontend-framework subchart. | +| frontend-framework | map | `{"enabled":false,"image":{"repository":"quay.io/cdis/frontend-framework","tag":"develop"}}` | Configurations for frontend-framework chart. | +| frontend-framework.enabled | bool | `false` | Whether to deploy the frontend-framework subchart. | | frontend-framework.image | map | `{"repository":"quay.io/cdis/frontend-framework","tag":"develop"}` | Docker image information. | | frontend-framework.image.repository | string | `"quay.io/cdis/frontend-framework"` | The Docker image repository for the frontend-framework. | | frontend-framework.image.tag | string | `"develop"` | Overrides the image tag whose default is the chart appVersion. | diff --git a/helm/gen3/values.yaml b/helm/gen3/values.yaml index 4ff88423..0d375e91 100644 --- a/helm/gen3/values.yaml +++ b/helm/gen3/values.yaml @@ -127,7 +127,7 @@ fence: # -- (map) Configurations for frontend-framework chart. frontend-framework: # -- (bool) Whether to deploy the frontend-framework subchart. - enabled: true + enabled: false # -- (map) Docker image information. image: # -- (string) The Docker image repository for the frontend-framework. diff --git a/helm/portal/Chart.yaml b/helm/portal/Chart.yaml index 8106cae3..52eed637 100644 --- a/helm/portal/Chart.yaml +++ b/helm/portal/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.11 +version: 0.1.12 # 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/portal/README.md b/helm/portal/README.md index 8bbe12b5..49220d24 100644 --- a/helm/portal/README.md +++ b/helm/portal/README.md @@ -1,6 +1,6 @@ # portal -![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) +![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-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 data-portal @@ -49,6 +49,7 @@ A Helm chart for gen3 data-portal | global.dictionaryUrl | string | `"https://s3.amazonaws.com/dictionary-artifacts/datadictionary/develop/schema.json"` | URL of the data dictionary. | | global.dispatcherJobNum | int | `"10"` | Number of dispatcher jobs. | | global.environment | string | `"default"` | Environment name. This should be the same as vpcname if you're doing an AWS deployment. Currently this is being used to share ALB's if you have multiple namespaces. Might be used other places too. | +| global.frontendRoot | string | `"portal"` | Which app will be served on /. Needs be set to portal for portal, or "gen3ff" for frontendframework. | | global.hostname | string | `"localhost"` | Hostname for the deployment. | | global.kubeBucket | string | `"kube-gen3"` | S3 bucket name for Kubernetes manifest files. | | global.logsBucket | string | `"logs-gen3"` | S3 bucket name for log files. | diff --git a/helm/portal/templates/deployment.yaml b/helm/portal/templates/deployment.yaml index 3ba483dd..691aef6f 100644 --- a/helm/portal/templates/deployment.yaml +++ b/helm/portal/templates/deployment.yaml @@ -82,10 +82,10 @@ spec: # failureThreshold: 30 readinessProbe: httpGet: - {{- if eq "portal" .Values.global.frontendRoot }} - path: / - {{- else }} + {{- if eq "gen3ff" .Values.global.frontendRoot }} path: /portal + {{- else }} + path: / {{- end }} port: 80 initialDelaySeconds: 30 @@ -197,7 +197,7 @@ spec: - name: DATA_UPLOAD_BUCKET value: {{ . }} {{- end }} - {{- if eq "portal" .Values.global.frontendRoot }} + {{- if eq "gen3ff" .Values.global.frontendRoot }} - name: BASENAME value: /portal {{- end }} diff --git a/helm/portal/values.yaml b/helm/portal/values.yaml index c45a5b02..7e0c6723 100644 --- a/helm/portal/values.yaml +++ b/helm/portal/values.yaml @@ -60,6 +60,8 @@ global: pdb: false # -- (int) The minimum amount of pods that are available at all times if the PDB is deployed. minAvialable: 1 + # -- (string) Which app will be served on /. Needs be set to portal for portal, or "gen3ff" for frontendframework. + frontendRoot: "portal" # -- (int) Number of replicas for the deployment. replicaCount: 1