Skip to content

Commit 8e733a0

Browse files
authored
Merge pull request #102 from uc-cdis/test/fix-image
Test/fix image
2 parents 39db197 + 4fe0594 commit 8e733a0

File tree

3 files changed

+40
-24
lines changed

3 files changed

+40
-24
lines changed

devplanetv2/dev-environments/binamb-helm/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.45
18+
version: 0.1.47
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

devplanetv2/dev-environments/binamb-helm/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: binamb-helm
55

66
# What branch of helm -- http://github.com/uc-cdis/gen3-helm
77
# helmBranch: chore/add_workspace_launch_test
8-
helmBranch: chore/add_workspace_launch_test
8+
helmBranch: feat/aws-data-replication
99

1010
# What branch of gitops -- http://github.com/uc-cdis/gen3-gitops-dev
1111
gitopsBranch: master

devplanetv2/dev-environments/binamb-helm/values/values.yaml

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ dashboard:
2727
serviceAccount:
2828
annotations:
2929
eks.amazonaws.com/role-arn: arn:aws:iam::707767160287:role/devplanetv2--binamb-helm--dashboard-access
30-
# datareplicate:
31-
# enabled: true
32-
# suspendCronjob: true
33-
# externalSecrets:
34-
# deploy: true
35-
# googleCredsSecret: binamb-gcloud-creds-secret
36-
# dcfDataserviceSettingsSecret: binamb-dcf-dataservice-settings-secrets
37-
# image:
38-
# # -- (string) Docker repository.
39-
# repository: quay.io/cdis/dcf-dataservice
40-
# # -- (string) Overrides the image tag whose default is the chart appVersion.
41-
# tag: "master"
30+
datareplicate:
31+
enabled: true
32+
suspendCronjob: true
33+
externalSecrets:
34+
deploy: true
35+
googleCredsSecret: binamb-gcloud-creds-secret
36+
dcfDataserviceSettingsSecret: binamb-dcf-dataservice-settings-secrets
37+
image:
38+
# -- (string) Docker repository.
39+
repository: quay.io/cdis/dcf-dataservice
40+
# -- (string) Overrides the image tag whose default is the chart appVersion.
41+
tag: "master"
4242
# googleBucketReplicateJob:
4343
# # -- (bool) Whether to enable the Google bucket replicate job
4444
# enabled: true
@@ -48,6 +48,22 @@ dashboard:
4848
# MANIFEST_FILE: gs://test-data-replication-manifest/GDC_only_3plusgig_open_active_manifest.tsv
4949
# IGNORED_FILE: gs://test-data-replication-manifest/ignored_files_manifest.csv
5050
# LOG_BUCKET: test-data-replication-manifest
51+
awsBucketReplicateJob:
52+
enabled: true
53+
schedule: "*/30 * * * *"
54+
THREAD_NUM: 20
55+
CHUNK_SIZE: 1
56+
GDC_BUCKET_NAME: test-gdc-bucket
57+
LOG_BUCKET: test-data-replication-manifest
58+
RELEASE: DR43
59+
QUICK_TEST: true
60+
MANIFEST_FILE: s3://test-data-replication-manifest/DR1/GDC_only_3plusgig_open_active_manifest.tsv
61+
resources:
62+
requests:
63+
cpu: "2"
64+
memory: 128Mi
65+
limits:
66+
memory: 2Gi
5167
etl:
5268
esEndpoint: elasticsearch
5369
mappings:
@@ -263,16 +279,16 @@ hatchery:
263279
}
264280
]
265281
}
266-
workspaceLaunchTest:
267-
enable: true
268-
schedule: "*/20 * * * *"
269-
workspaceImages: "(Generic) Jupyter Lab Notebook with R Kernel+(Tutorials) Example Analysis Jupyter Lab Notebooks"
270-
operatorName: "binamb@uchicago.edu"
271-
hostname: "https://binamb.dev.planx-pla.net/"
272-
externalSecrets:
273-
deploy: true
274-
fenceConfig: binamb-fence-config
275-
fenceJwtKeys: binamb-fence-jwt
282+
# workspaceLaunchTest:
283+
# enable: true
284+
# schedule: "*/20 * * * *"
285+
# workspaceImages: "(Generic) Jupyter Lab Notebook with R Kernel+(Tutorials) Example Analysis Jupyter Lab Notebooks"
286+
# operatorName: "binamb@uchicago.edu"
287+
# hostname: "https://binamb.dev.planx-pla.net/"
288+
# externalSecrets:
289+
# deploy: true
290+
# fenceConfig: binamb-fence-config
291+
# fenceJwtKeys: binamb-fence-jwt
276292

277293
indexd:
278294
enabled: true

0 commit comments

Comments
 (0)