Skip to content

Commit

Permalink
Add small fixes, pin peregrine to 2023.01, portal to master (#104)
Browse files Browse the repository at this point in the history
* Add small fixes, pin peregrine to 2023.01, portal to master
  • Loading branch information
jawadqur authored Mar 13, 2023
1 parent fd2b3ab commit 2bb206d
Show file tree
Hide file tree
Showing 14 changed files with 82 additions and 91 deletions.
85 changes: 38 additions & 47 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2023-03-03T20:55:43Z",
"generated_at": "2023-03-13T17:32:44Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -88,21 +88,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 37,
"line_number": 38,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 39,
"line_number": 40,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 58,
"line_number": 59,
"type": "Secret Keyword"
}
],
Expand All @@ -111,21 +110,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 48,
"line_number": 49,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 50,
"line_number": 51,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 77,
"line_number": 78,
"type": "Secret Keyword"
}
],
Expand Down Expand Up @@ -342,21 +340,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 40,
"line_number": 41,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 42,
"line_number": 43,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 60,
"line_number": 61,
"type": "Secret Keyword"
}
],
Expand Down Expand Up @@ -392,21 +389,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 51,
"line_number": 52,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 53,
"line_number": 54,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 78,
"line_number": 79,
"type": "Secret Keyword"
}
],
Expand All @@ -415,21 +411,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 40,
"line_number": 41,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 42,
"line_number": 43,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 60,
"line_number": 61,
"type": "Secret Keyword"
}
],
Expand Down Expand Up @@ -508,13 +503,13 @@
{
"hashed_secret": "08eeb737b239bdb7362a875b90e22c10b8826b20",
"is_verified": false,
"line_number": 418,
"line_number": 417,
"type": "Base64 High Entropy String"
},
{
"hashed_secret": "eb9739c6625f06b4ab73035223366dda6262ae77",
"is_verified": false,
"line_number": 421,
"line_number": 420,
"type": "Base64 High Entropy String"
}
],
Expand All @@ -523,21 +518,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 49,
"line_number": 50,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 51,
"line_number": 52,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 72,
"line_number": 73,
"type": "Secret Keyword"
}
],
Expand Down Expand Up @@ -578,21 +572,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 56,
"line_number": 57,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 58,
"line_number": 59,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 80,
"line_number": 81,
"type": "Secret Keyword"
}
],
Expand Down Expand Up @@ -662,21 +655,20 @@
"hashed_secret": "2546383b95bb44732e9be6a877fd476c0442fdab",
"is_secret": false,
"is_verified": false,
"line_number": 38,
"line_number": 39,
"type": "Secret Keyword"
},
{
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 40,
"line_number": 41,
"type": "Secret Keyword"
},
{
"hashed_secret": "abb751db44bcfd1bb9d4ad53e40138422abd739e",
"is_secret": false,
"hashed_secret": "f09dd6e359833a12f48c4c4255d6e87a6e55cfe9",
"is_verified": false,
"line_number": 66,
"line_number": 67,
"type": "Secret Keyword"
}
],
Expand All @@ -689,12 +681,11 @@
"type": "Secret Keyword"
}
],
"sample-values/values_aws_dev.yaml": [
"sample-values/values_local_dev.yaml": [
{
"hashed_secret": "9b5925ea817163740dfb287a9894e8ab3aba2c18",
"is_secret": false,
"hashed_secret": "db2e3619772c67cb47128ab5111584c51db38510",
"is_verified": false,
"line_number": 34,
"line_number": 25,
"type": "Secret Keyword"
}
],
Expand Down
1 change: 1 addition & 0 deletions docs/portal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ FROM nginx:latest

COPY overrides/nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=builder /data-portal/build/*.js /data-portal/build/index.html /usr/share/nginx/html/
COPY --from=builder /data-portal/data /usr/share/nginx/html/data
COPY --from=builder /data-portal/src/img/ /usr/share/nginx/html/src/img/
COPY --from=builder /data-portal/src/css/ /usr/share/nginx/html/src/css/

Expand Down
24 changes: 12 additions & 12 deletions helm/gen3/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ dependencies:
repository: "file://../ambassador"
condition: ambassador.enabled
- name: arborist
version: "0.1.3"
version: "0.1.4"
repository: "file://../arborist"
condition: arborist.enabled
- name: argo-wrapper
version: "0.1.0"
repository: "file://../argo-wrapper"
condition: argo-wrapper.enabled
- name: audit
version: "0.1.3"
version: "0.1.4"
repository: "file://../audit"
condition: audit.enabled
- name: aws-es-proxy
Expand All @@ -28,7 +28,7 @@ dependencies:
version: 0.1.3
repository: file://../common
- name: fence
version: "0.1.3"
version: "0.1.4"
repository: "file://../fence"
condition: fence.enabled
- name: guppy
Expand All @@ -40,47 +40,47 @@ dependencies:
repository: "file://../hatchery"
condition: hatchery.enabled
- name: indexd
version: "0.1.3"
version: "0.1.4"
repository: "file://../indexd"
condition: indexd.enabled
- name: manifestservice
version: "0.1.2"
repository: "file://../manifestservice"
condition: manifestservice.enabled
- name: metadata
version: "0.1.3"
version: "0.1.4"
repository: "file://../metadata"
condition: metadata.enabled
- name: peregrine
version: "0.1.3"
version: "0.1.5"
repository: "file://../peregrine"
condition: peregrine.enabled
- name: pidgin
version: "0.1.3"
repository: "file://../pidgin"
condition: pidgin.enabled
- name: portal
version: "0.1.1"
version: "0.1.2"
repository: "file://../portal"
condition: portal.enabled
- name: requestor
version: "0.1.3"
version: "0.1.4"
repository: "file://../requestor"
condition: requestor.enabled
- name: revproxy
version: "0.1.3"
version: "0.1.4"
repository: "file://../revproxy"
condition: revproxy.enabled
- name: sheepdog
version: "0.1.3"
version: "0.1.4"
repository: "file://../sheepdog"
condition: sheepdog.enabled
- name: ssjdispatcher
version: "0.1.1"
repository: "file://../ssjdispatcher"
condition: ssjdispatcher.enabled
- name: wts
version: "0.1.4"
version: "0.1.5"
repository: "file://../wts"
condition: wts.enabled

Expand All @@ -107,7 +107,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.4
version: 0.1.5

# 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
24 changes: 12 additions & 12 deletions helm/gen3/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gen3

![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-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.5](https://img.shields.io/badge/Version-0.1.5-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 @@ -19,26 +19,26 @@ Helm chart to deploy Gen3 Data Commons
| Repository | Name | Version |
|------------|------|---------|
| file://../ambassador | ambassador | 0.1.3 |
| file://../arborist | arborist | 0.1.3 |
| file://../arborist | arborist | 0.1.4 |
| file://../argo-wrapper | argo-wrapper | 0.1.0 |
| file://../audit | audit | 0.1.3 |
| file://../audit | audit | 0.1.4 |
| file://../aws-es-proxy | aws-es-proxy | 0.1.2 |
| file://../common | common | 0.1.3 |
| file://../elasticsearch | elasticsearch | 0.1.1 |
| file://../fence | fence | 0.1.3 |
| file://../fence | fence | 0.1.4 |
| file://../guppy | guppy | 0.1.3 |
| file://../hatchery | hatchery | 0.1.2 |
| file://../indexd | indexd | 0.1.3 |
| file://../indexd | indexd | 0.1.4 |
| file://../manifestservice | manifestservice | 0.1.2 |
| file://../metadata | metadata | 0.1.3 |
| file://../peregrine | peregrine | 0.1.3 |
| file://../metadata | metadata | 0.1.4 |
| file://../peregrine | peregrine | 0.1.5 |
| file://../pidgin | pidgin | 0.1.3 |
| file://../portal | portal | 0.1.1 |
| file://../requestor | requestor | 0.1.3 |
| file://../revproxy | revproxy | 0.1.3 |
| file://../sheepdog | sheepdog | 0.1.3 |
| file://../portal | portal | 0.1.2 |
| file://../requestor | requestor | 0.1.4 |
| file://../revproxy | revproxy | 0.1.4 |
| file://../sheepdog | sheepdog | 0.1.4 |
| file://../ssjdispatcher | ssjdispatcher | 0.1.1 |
| file://../wts | wts | 0.1.4 |
| file://../wts | wts | 0.1.5 |
| https://charts.bitnami.com/bitnami | postgresql | 11.9.13 |

## Values
Expand Down
Loading

0 comments on commit 2bb206d

Please sign in to comment.