Skip to content

Commit

Permalink
Merge pull request #1701 from uc-cdis/feat/qa-mickey-2021-10
Browse files Browse the repository at this point in the history
feat: update to 2021.10
  • Loading branch information
m0nhawk authored Oct 19, 2021
2 parents eb5ae66 + e6c26bb commit 27e800d
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 37 deletions.
63 changes: 30 additions & 33 deletions qa-mickey.planx-pla.net/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,51 +8,48 @@
},
"versions": {
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"arborist": "quay.io/cdis/arborist:2020.08",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
"dashboard": "quay.io/cdis/gen3-statics:2020.08",
"fence": "quay.io/cdis/fence:4.29.1",
"arborist": "quay.io/cdis/arborist:2021.10",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:1.3",
"dashboard": "quay.io/cdis/gen3-statics:2021.10",
"fence": "quay.io/cdis/fence:2021.10",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch",
"guppy": "quay.io/cdis/guppy:2021.01",
"hatchery": "quay.io/cdis/hatchery:0.1.3",
"indexd": "quay.io/cdis/indexd:2021.01",
"manifestservice": "quay.io/cdis/manifestservice:0.3.0",
"metadata": "quay.io/cdis/metadata-service:2020.09",
"mariner": "quay.io/cdis/mariner-server:2020.12",
"ohdsi-atlas": "quay.io/cdis/ohdsi-atlas:latest",
"ohdsi-webapi": "quay.io/cdis/ohdsi-webapi:latest",
"peregrine": "quay.io/cdis/peregrine:2021.01",
"pidgin": "quay.io/cdis/pidgin:2021.01",
"portal": "quay.io/cdis/data-portal:chore_fix_feat_use_msg",
"revproxy": "quay.io/cdis/nginx:2020.08",
"sheepdog": "quay.io/cdis/sheepdog:2021.01",
"ssjdispatcher": "quay.io/cdis/ssjdispatcher:2021.07",
"sower": "quay.io/cdis/sower:2020.08",
"spark": "quay.io/cdis/gen3-spark:2020.08",
"tube": "quay.io/cdis/tube:2020.08",
"ws-storage": "quay.io/cdis/ws-storage:master",
"wts": "quay.io/cdis/workspace-token-service:2020.08"
"guppy": "quay.io/cdis/guppy:2021.10",
"hatchery": "quay.io/cdis/hatchery:2021.10",
"indexd": "quay.io/cdis/indexd:2021.10",
"manifestservice": "quay.io/cdis/manifestservice:2021.10",
"mariner": "quay.io/cdis/mariner-server:feat_initwkdir-commons",
"metadata": "quay.io/cdis/metadata-service:2021.10",
"ohdsi-atlas": "quay.io/cdis/ohdsi-atlas:master-2.8-manconf",
"ohdsi-webapi": "quay.io/cdis/ohdsi-webapi:master-2.8",
"peregrine": "quay.io/cdis/peregrine:2021.10",
"pidgin": "quay.io/cdis/pidgin:2021.10",
"portal": "quay.io/cdis/data-portal:feat_system_use_warning",
"revproxy": "quay.io/cdis/nginx:2021.10",
"sheepdog": "quay.io/cdis/sheepdog:2021.10",
"sower": "quay.io/cdis/sower:2021.10",
"spark": "quay.io/cdis/gen3-spark:2021.10",
"ssjdispatcher": "quay.io/cdis/ssjdispatcher:2021.10",
"tube": "quay.io/cdis/tube:2021.10",
"ws-storage": "quay.io/cdis/ws-storage:2021.10",
"wts": "quay.io/cdis/workspace-token-service:2021.10"
},
"arborist": {
"deployment_version": "2"
},
"indexd": {
"arborist": "true"
},
"mariner": {
"with_db": "yes",
"with_s3": "yes",
"with_cache": "no"
},
"ssjdispatcher": {
"job_images": {
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2021.05"
"indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2021.10"
}
},
"sower": {
"container": {
"name": "job-task",
"image": "quay.io/cdis/mickey-demo:master",
"pull_policy": "always",
"env": []
},
"restart_policy": "never"
},
"sower": [],
"global": {
"environment": "qaplanetv1",
"hostname": "qa-mickey.planx-pla.net",
Expand Down
9 changes: 6 additions & 3 deletions qa-mickey.planx-pla.net/manifests/mariner/mariner.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"containers": {
"engine": {
"name": "mariner-engine",
"image": "quay.io/cdis/mariner-engine:2020.12",
"image": "quay.io/cdis/mariner-engine:feat_initwkdir-commons",
"pull_policy": "always",
"command": [
"/mariner",
Expand All @@ -41,11 +41,14 @@
"memory": "8Gi",
"cpu": "800m"
}
},
"securitycontext": {
"privileged": true
}
},
"s3sidecar": {
"name": "mariner-s3sidecar",
"image": "quay.io/cdis/mariner-s3sidecar:2020.12",
"image": "quay.io/cdis/mariner-s3sidecar:feat_initwkdir-commons",
"pull_policy": "always",
"command": [
"/sidecar"
Expand All @@ -62,7 +65,7 @@
},
"gen3fusesidecar": {
"name": "mariner-gen3fusesidecar",
"image": "quay.io/cdis/gen3fuse-sidecar:2020.12",
"image": "quay.io/cdis/gen3fuse-sidecar:feat_initwkdir-commons",
"pull_policy": "always",
"command": [
"/bin/bash",
Expand Down
3 changes: 2 additions & 1 deletion qa-mickey.planx-pla.net/portal/gitops.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
},
"systemUse" : {
"systemUseText" : "VA systems are intended to be used by authorized VA network users for viewing and retrieving information; except as otherwise authorized for official business and limited personal use under VA policy. Information from this system resides on and transmits through computer systems and networks funded by VA. Access or use constitutes understanding and acceptance that there is no reasonable expectation of privacy in the use of Government networks or systems. Access or use of this system constitutes user understanding and acceptance of these terms and constitutes unconditional consent to review and action includes but is not limited to: monitoring; recording; copying; auditing; inspecting; investigating; restricting access; blocking; tracking; disclosing to authorized personnel; or other authorized actions by authorized VA and law enforcement personnel. Unauthorized user attempts or acts to (1) access; upload; download; change; or delete information on this system; (2) modify this system; (3) deny access to this system; (4) accrue resources for unauthorized use; or (5) otherwise misuse this system are strictly prohibited. Such attempts or acts are subject to action that result in criminal; civil; or administrative penalties.",
"displayUseMsg": "cookie"
"displayUseMsg": "session"
},
"footerLogos": [
{
Expand All @@ -167,6 +167,7 @@
},
"analysisTools": [
"GWASApp",
"GWASUIMockup",
{
"title": "OHDSI Atlas",
"description": "An Atlas App",
Expand Down

0 comments on commit 27e800d

Please sign in to comment.