diff --git a/gen3.theanvil.io/manifest.json b/gen3.theanvil.io/manifest.json index 7c32c61ef6..3dd56f7d96 100644 --- a/gen3.theanvil.io/manifest.json +++ b/gen3.theanvil.io/manifest.json @@ -7,24 +7,22 @@ "autodeploy": "yes" }, "versions": { - "arborist": "quay.io/cdis/arborist:deploy_anvil-staging", - "arranger-adminapi": "quay.io/cdis/arranger-server:master", - "arranger-dashboard": "quay.io/cdis/arranger-dashboard:master", + "arborist": "quay.io/cdis/arborist:2020.02", "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", - "revproxy": "quay.io/cdis/nginx:1.15.5-ctds", - "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", + "guppy": "quay.io/cdis/guppy:2020.02", + "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.17.6-ctds-1.0.1", + "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" }, @@ -32,7 +30,7 @@ "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", @@ -67,7 +65,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "512Mi", - "image": "quay.io/cdis/gen3fuse-sidecar:chore_sidecar", + "image": "quay.io/cdis/gen3fuse-sidecar:0.1.5", "env": {"NAMESPACE":"default", "HOSTNAME": "gen3.datastage.io"}, "args": [], "command": ["/bin/bash", "/sidecarDockerrun.sh"], @@ -111,7 +109,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": [ { @@ -173,5 +171,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 + } } }