Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating etl, guppy, and portal to get the "export to workspace" tab … #234

Merged
merged 3 commits into from
Jan 15, 2025
Merged

updating etl, guppy, and portal to get the "export to workspace" tab … #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b45676
updating etl, guppy, and portal to get the "export to workspace" tab …
EliseCastle23 Jan 14, 2025
cbc15e5
version bump
EliseCastle23 Jan 14, 2025
d47a6ff
fixing default value
EliseCastle23 Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/etl/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
version: 0.1.10

# 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
Expand Down
5 changes: 4 additions & 1 deletion helm/etl/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# etl

![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-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.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)

A Helm chart for gen3 etl

Expand Down Expand Up @@ -62,6 +62,9 @@ A Helm chart for gen3 etl
| etlMapping.mappings[0].joining_props[0].props[2].fn | string | `"set"` | |
| etlMapping.mappings[0].joining_props[0].props[2].name | string | `"_file_id"` | |
| etlMapping.mappings[0].joining_props[0].props[2].src | string | `"_file_id"` | |
| etlMapping.mappings[0].joining_props[0].props[3].fn | string | `"set"` | |
| etlMapping.mappings[0].joining_props[0].props[3].name | string | `"object_id"` | |
| etlMapping.mappings[0].joining_props[0].props[3].src | string | `"object_id"` | |
| etlMapping.mappings[0].name | string | `"dev_case"` | |
| etlMapping.mappings[0].props[0].name | string | `"submitter_id"` | |
| etlMapping.mappings[0].props[1].name | string | `"project_id"` | |
Expand Down
3 changes: 3 additions & 0 deletions helm/etl/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ etlMapping:
- name: _file_id
src: _file_id
fn: set
- name: object_id
src: object_id
fn: set
- name: dev_file
doc_type: file
type: collector
Expand Down
8 changes: 4 additions & 4 deletions helm/gen3/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
version: 0.1.16
repository: file://../common
- name: etl
version: 0.1.9
version: 0.1.10
repository: file://../etl
condition: etl.enabled
- name: frontend-framework
Expand All @@ -40,7 +40,7 @@ dependencies:
repository: "file://../fence"
condition: fence.enabled
- name: guppy
version: 0.1.16
version: 0.1.17
repository: "file://../guppy"
condition: guppy.enabled
- name: hatchery
Expand All @@ -64,7 +64,7 @@ dependencies:
repository: "file://../peregrine"
condition: peregrine.enabled
- name: portal
version: 0.1.24
version: 0.1.26
repository: "file://../portal"
condition: portal.enabled
- name: requestor
Expand Down Expand Up @@ -128,7 +128,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.57
version: 0.1.58

# 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
Expand Down
8 changes: 4 additions & 4 deletions helm/gen3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gen3

![Version: 0.1.57](https://img.shields.io/badge/Version-0.1.57-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.58](https://img.shields.io/badge/Version-0.1.58-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

Expand All @@ -24,18 +24,18 @@ Helm chart to deploy Gen3 Data Commons
| file://../audit | audit | 0.1.16 |
| file://../aws-es-proxy | aws-es-proxy | 0.1.13 |
| file://../common | common | 0.1.16 |
| file://../etl | etl | 0.1.9 |
| file://../etl | etl | 0.1.10 |
| file://../fence | fence | 0.1.29 |
| file://../frontend-framework | frontend-framework | 0.1.6 |
| file://../gen3-network-policies | gen3-network-policies | 0.1.2 |
| file://../guppy | guppy | 0.1.16 |
| file://../guppy | guppy | 0.1.17 |
| file://../hatchery | hatchery | 0.1.12 |
| file://../indexd | indexd | 0.1.18 |
| file://../manifestservice | manifestservice | 0.1.18 |
| file://../metadata | metadata | 0.1.17 |
| file://../neuvector | neuvector | 0.1.2 |
| file://../peregrine | peregrine | 0.1.17 |
| file://../portal | portal | 0.1.24 |
| file://../portal | portal | 0.1.26 |
| file://../requestor | requestor | 0.1.16 |
| file://../revproxy | revproxy | 0.1.19 |
| file://../sheepdog | sheepdog | 0.1.20 |
Expand Down
2 changes: 1 addition & 1 deletion helm/guppy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.16
version: 0.1.17

# 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
Expand Down
4 changes: 2 additions & 2 deletions helm/guppy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# guppy

![Version: 0.1.16](https://img.shields.io/badge/Version-0.1.16-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.17](https://img.shields.io/badge/Version-0.1.17-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 Guppy Service

Expand Down Expand Up @@ -30,7 +30,7 @@ A Helm chart for gen3 Guppy Service
| autoscaling.minReplicas | int | `1` | The minimum number of replicas to scale down to |
| autoscaling.targetCPUUtilizationPercentage | int | `80` | The target CPU utilization percentage for autoscaling |
| commonLabels | map | `nil` | Will completely override the commonLabels defined in the common chart's _label_setup.tpl |
| configIndex | string | `"dev_case-array-config"` | The Elasticsearch configuration index |
| configIndex | string | `"dev_array-config"` | The Elasticsearch configuration index |
| criticalService | string | `"true"` | Valid options are "true" or "false". If invalid option is set- the value will default to "false". |
| dataDog | bool | `{"enabled":false,"env":"dev"}` | Whether Datadog is enabled. |
| dbRestore | bool | `false` | Whether or not to restore elasticsearch indices from a snapshot in s3 |
Expand Down
2 changes: 1 addition & 1 deletion helm/guppy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ indices:
- index: dev_file
type: file
# -- (string) The Elasticsearch configuration index
configIndex: dev_case-array-config
configIndex: dev_array-config
# -- (string) The field used for access control and authorization filters
authFilterField: auth_resource_path
# -- (bool) Whether or not to enable encryption for specified fields
Expand Down
2 changes: 1 addition & 1 deletion helm/portal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.24
version: 0.1.26

# 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
Expand Down
6 changes: 3 additions & 3 deletions helm/portal/README.md
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions helm/portal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ gitops:
"buttons": [
{
"enabled": true,
"type": "export-to-workspace",
"type": "export-files-to-workspace",
"title": "Export to Workspace",
"leftIcon": "datafile",
"rightIcon": "download"
Expand All @@ -475,13 +475,13 @@ gitops:
],
"nodeCountTitle": "Files",
"manifestMapping": {
"resourceIndexType": "file",
"resourceIdField": "object_id",
"resourceIndexType": "case",
"resourceIdField": "_case_id",
"referenceIdFieldInResourceIndex": "object_id",
"referenceIdFieldInDataIndex": "object_id"
},
"accessibleFieldCheckList": ["project_id"],
"accessibleValidationField": "project_id",
"accessibleFieldCheckList": ["_case_id"],
"accessibleValidationField": "_case_id",
"downloadAccessor": "object_id"
}
}
Expand Down
Loading