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

Jump to bottom

chore(qa): Preparing 1st TheAnvil PROD release #1149

Merged
merged 3 commits into from
Feb 27, 2020
Merged

chore(qa): Preparing 1st TheAnvil PROD release #1149

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea8d890
setting up autscaling config
themarcelor Feb 21, 2020
7619abb
fix malformed json
themarcelor Feb 21, 2020
2a102a8
replicating latest changes from internal staging
themarcelor Feb 26, 2020
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
88 changes: 72 additions & 16 deletions gen3.theanvil.io/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "quay.io/cdis/arborist:deploy_anvil-staging",
"arborist": "quay.io/cdis/arborist:2020.02",
"arranger-adminapi": "quay.io/cdis/arranger-server:master",
"arranger-dashboard": "quay.io/cdis/arranger-dashboard:master",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove these arranger-*

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove these arranger-*

"aws-es-proxy": "abutaha/aws-es-proxy:0.8",
"fence": "quay.io/cdis/fence:4.2.1",
"fence": "quay.io/cdis/fence:2020.02",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch",
"guppy": "quay.io/cdis/guppy:0.3.0",
"hatchery": "quay.io/cdis/hatchery:0.1.0",
"indexd": "quay.io/cdis/indexd:2.0.0",
"manifestservice": "quay.io/cdis/manifestservice:master",
"peregrine": "quay.io/cdis/peregrine:master",
"pidgin": "quay.io/cdis/pidgin:1.1.0",
"portal": "quay.io/cdis/data-portal:2.17.0",
"guppy": "quay.io/cdis/guppy:2020.02",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the etlMapping.yaml and portal/gitops.json match what's working in staging - even though guppy is in the manifest - it's not actually running in production for some reason

"hatchery": "quay.io/cdis/hatchery:2020.02",
"indexd": "quay.io/cdis/indexd:2020.02",
"manifestservice": "quay.io/cdis/manifestservice:2020.02",
"peregrine": "quay.io/cdis/peregrine:2020.02",
"pidgin": "quay.io/cdis/pidgin:2020.02",
"portal": "quay.io/cdis/data-portal:2020.02",
"revproxy": "quay.io/cdis/nginx:1.15.5-ctds",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to deploy revproxy:1.17... to include the new security baseline and web application firewall

"sheepdog": "quay.io/cdis/sheepdog:master",
"sower": "quay.io/cdis/sower:0.3.0",
"spark": "quay.io/cdis/gen3-spark:master",
"tube": "quay.io/cdis/tube:0.3.18",
"sheepdog": "quay.io/cdis/sheepdog:2020.02",
"sower": "quay.io/cdis/sower:2020.02",
"spark": "quay.io/cdis/gen3-spark:2020.02",
"tube": "quay.io/cdis/tube:2020.02",
"ambassador": "quay.io/datawire/ambassador:0.60.3",
"wts": "quay.io/cdis/workspace-token-service:master"
},
"global": {
"environment": "anvilprod",
"hostname": "gen3.theanvil.io",
"revproxy_arn": "arn:aws:acm:us-east-1:474789003679:certificate/9fd731e3-3366-4bd0-a3ef-0453dc07289a",
"dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/gtexdictionary/3.1.4/schema.json",
"dictionary_url": "https://s3.amazonaws.com/dictionary-artifacts/anvil/1.1.0/schema.json",
"portal_app": "gitops",
"kube_bucket": "kube-anvilprod-gen3",
"logs_bucket": "logs-anvilprod-gen3",
Expand Down Expand Up @@ -67,7 +67,7 @@
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "512Mi",
"image": "quay.io/cdis/gen3fuse-sidecar:chore_sidecar",
"image": "quay.io/cdis/gen3fuse-sidecar:2020.02",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please bump the sidecar to 0.1.5 - has a fix for fuse hammering the squid

"env": {"NAMESPACE":"default", "HOSTNAME": "gen3.datastage.io"},
"args": [],
"command": ["/bin/bash", "/sidecarDockerrun.sh"],
Expand Down Expand Up @@ -111,7 +111,7 @@
"action": "export",
"container": {
"name": "job-task",
"image": "quay.io/cdis/pelican:0.1.3",
"image": "quay.io/cdis/pelican-export:2020.02",
"pull_policy": "Always",
"env": [
{
Expand Down Expand Up @@ -173,5 +173,61 @@
],
"canary": {
"default": 0
},
"scaling": {
"arborist": {
"strategy": "auto",
"min": 2,
"max": 4,
"targetCpu": 40
},
"portal": {
"strategy": "auto",
"min": 2,
"max": 4,
"targetCpu": 40
},
"fence": {
"strategy": "auto",
"min": 5,
"max": 15,
"targetCpu": 40
},
"presigned-url-fence": {
"strategy": "auto",
"min": 8,
"max": 25,
"targetCpu": 40
},
"indexd": {
"strategy": "auto",
"min": 4,
"max": 8,
"targetCpu": 40
},
"peregrine": {
"strategy": "auto",
"min": 2,
"max": 4,
"targetCpu": 40
},
"revproxy": {
"strategy": "auto",
"min": 2,
"max": 4,
"targetCpu": 40
},
"sheepdog": {
"strategy": "auto",
"min": 2,
"max": 4,
"targetCpu": 40
},
"guppy": {
"strategy": "auto",
"min": 2,
"max": 4,
"targetCpu": 40
}
}
}