Merge pull request #2719 from uc-cdis/feat/GPE-1163

Updating all qa environments to point to ES7.
uc-cdis · Dec 15, 2023 · 73e469c · 73e469c
2 parents aec26e2 + bd6bec8
commit 73e469c
Show file tree

Hide file tree

Showing 19 changed files with 327 additions and 312 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -371,21 +371,21 @@
         "filename": "qa-anvil.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 144
+        "line_number": 145
       },
       {
         "type": "Secret Keyword",
         "filename": "qa-anvil.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 150
+        "line_number": 151
       },
       {
         "type": "Secret Keyword",
         "filename": "qa-anvil.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 255
+        "line_number": 256
       }
     ],
     "qa-bloodpac.planx-pla.net/manifest.json": [
@@ -6869,28 +6869,28 @@
         "filename": "qa-covid19.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 129
+        "line_number": 130
       },
       {
         "type": "Secret Keyword",
         "filename": "qa-covid19.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 135
+        "line_number": 136
       },
       {
         "type": "Secret Keyword",
         "filename": "qa-covid19.planx-pla.net/manifest.json",
         "hashed_secret": "aee98a99696237d70b6854ee4c2d9e42bc696039",
         "is_verified": false,
-        "line_number": 141
+        "line_number": 142
       },
       {
         "type": "Secret Keyword",
         "filename": "qa-covid19.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 181
+        "line_number": 182
       }
     ],
     "qa-dcp.planx-pla.net/manifest.json": [
@@ -7602,21 +7602,21 @@
         "filename": "qa-niaid.planx-pla.net/manifest.json",
         "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 145
+        "line_number": 146
       },
       {
         "type": "Secret Keyword",
         "filename": "qa-niaid.planx-pla.net/manifest.json",
         "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 151
+        "line_number": 152
       },
       {
         "type": "Secret Keyword",
         "filename": "qa-niaid.planx-pla.net/manifest.json",
         "hashed_secret": "aee98a99696237d70b6854ee4c2d9e42bc696039",
         "is_verified": false,
-        "line_number": 157
+        "line_number": 158
       }
     ]
   },

diff --git a/qa-acct.planx-pla.net/manifest.json b/qa-acct.planx-pla.net/manifest.json
@@ -8,24 +8,24 @@
   },
   "versions": {
     "ambassador": "quay.io/datawire/ambassador:1.4.2",
-    "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2021.06",
+    "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.12",
     "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
-    "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2021.06",
-    "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.06",
-    "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.06",
-    "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2021.06",
-    "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2021.06",
-    "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2021.06",
-    "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2021.06",
+    "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.12",
+    "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.12",
+    "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.12",
+    "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2023.12",
+    "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.12",
+    "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.12",
+    "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2023.12",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
-    "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2021.06",
-    "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2021.06",
-    "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2021.06",
-    "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2021.06",
-    "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2021.06",
-    "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2021.06",
-    "metadata": "quay.io/cdis/metadata-service:2021.06",
-    "dashboard": "quay.io/cdis/gen3-statics:2021.06"
+    "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.12",
+    "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.12",
+    "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.12",
+    "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.12",
+    "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.12",
+    "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.12",
+    "metadata": "quay.io/cdis/metadata-service:2023.12",
+    "dashboard": "quay.io/cdis/gen3-statics:2023.12"
   },
   "arborist": {
     "deployment_version": "2"
@@ -48,7 +48,8 @@
     "dispatcher_job_num": "10",
     "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml",
     "netpolicy": "on",
-    "lb_type": "internal"
+    "lb_type": "internal",
+    "es7": true
   },
   "ssjdispatcher": {
     "job_images": {

diff --git a/qa-aids.planx-pla.net/manifest.json b/qa-aids.planx-pla.net/manifest.json
@@ -5,22 +5,22 @@
   ],
   "versions": {
     "ambassador": "quay.io/datawire/ambassador:1.4.2",
-    "arborist": "quay.io/cdis/arborist:2020.08",
+    "arborist": "quay.io/cdis/arborist:2023.12",
     "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
-    "fence": "quay.io/cdis/fence:2020.08",
+    "fence": "quay.io/cdis/fence:2023.12",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
-    "guppy": "quay.io/cdis/guppy:2020.08",
-    "indexd": "quay.io/cdis/indexd:2020.08",
-    "manifestservice": "quay.io/cdis/manifestservice:2020.08",
-    "peregrine": "quay.io/cdis/peregrine:2020.08",
-    "pidgin": "quay.io/cdis/pidgin:2020.08",
-    "portal": "quay.io/cdis/data-portal:2020.08",
-    "revproxy": "quay.io/cdis/nginx:2020.08",
-    "sheepdog": "quay.io/cdis/sheepdog:2020.08",
-    "sower": "quay.io/cdis/sower:2020.08",
-    "spark": "quay.io/cdis/gen3-spark:2020.08",
-    "tube": "quay.io/cdis/tube:2020.08",
-    "dashboard": "quay.io/cdis/gen3-statics:2020.08"
+    "guppy": "quay.io/cdis/guppy:2023.12",
+    "indexd": "quay.io/cdis/indexd:2023.12",
+    "manifestservice": "quay.io/cdis/manifestservice:2023.12",
+    "peregrine": "quay.io/cdis/peregrine:2023.12",
+    "pidgin": "quay.io/cdis/pidgin:2023.12",
+    "portal": "quay.io/cdis/data-portal:2023.12",
+    "revproxy": "quay.io/cdis/nginx:2023.12",
+    "sheepdog": "quay.io/cdis/sheepdog:2023.12",
+    "sower": "quay.io/cdis/sower:2023.12",
+    "spark": "quay.io/cdis/gen3-spark:2023.12",
+    "tube": "quay.io/cdis/tube:2023.12",
+    "dashboard": "quay.io/cdis/gen3-statics:2023.12"
   },
   "global": {
     "dispatcher_job_num": "10",
@@ -47,7 +47,8 @@
     "netpolicy": "off",
     "cookie_domain": "planx-pla.net",
     "des_namespace": "qa-nde",
-    "lb_type": "internal"
+    "lb_type": "internal",
+    "es7": true
   },
   "arborist": {
     "deployment_version": "2"
@@ -80,7 +81,7 @@
     "name": "pelican-export",
     "container": {
       "name": "job-task",
-      "image": "quay.io/cdis/pelican:2020.08",
+      "image": "quay.io/cdis/pelican:2023.12",
       "pull_policy": "always",
       "env": [],
       "cpu-limit": "1",
@@ -90,7 +91,7 @@
   },
   "ssjdispatcher": {
     "job_images": {
-      "indexing": "quay.io/cdis/indexs3client:2020.08"
+      "indexing": "quay.io/cdis/indexs3client:2023.12"
     }
   },
   "canary": {

diff --git a/qa-anvil.planx-pla.net/manifest.json b/qa-anvil.planx-pla.net/manifest.json
@@ -7,27 +7,27 @@
     "autodeploy": "yes"
   },
   "versions": {
-    "access-backend": "quay.io/cdis/access-backend:2021.06",
+    "access-backend": "quay.io/cdis/access-backend:2023.12",
     "ambassador": "quay.io/datawire/ambassador:0.60.3",
-    "arborist": "quay.io/cdis/arborist:2021.06",
+    "arborist": "quay.io/cdis/arborist:2023.12",
     "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
-    "fence": "quay.io/cdis/fence:2021.06",
+    "fence": "quay.io/cdis/fence:2023.12",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
-    "guppy": "quay.io/cdis/guppy:2021.06",
-    "hatchery": "quay.io/cdis/hatchery:2021.06",
-    "indexd": "quay.io/cdis/indexd:2021.06",
-    "manifestservice": "quay.io/cdis/manifestservice:2021.06",
-    "metadata": "quay.io/cdis/metadata-service:2021.06",
-    "peregrine": "quay.io/cdis/peregrine:2021.06",
-    "pidgin": "quay.io/cdis/pidgin:2021.06",
-    "portal": "quay.io/cdis/data-portal:2021.06",
-    "revproxy": "quay.io/cdis/nginx:2021.06",
-    "sheepdog": "quay.io/cdis/sheepdog:2021.06",
-    "sower": "quay.io/cdis/sower:2021.06",
-    "spark": "quay.io/cdis/gen3-spark:2021.06",
-    "tube": "quay.io/cdis/tube:2021.06",
-    "ssjdispatcher": "quay.io/cdis/ssjdispatcher:2021.06",
-    "wts": "quay.io/cdis/workspace-token-service:2021.06",
+    "guppy": "quay.io/cdis/guppy:2023.12",
+    "hatchery": "quay.io/cdis/hatchery:2023.12",
+    "indexd": "quay.io/cdis/indexd:2023.12",
+    "manifestservice": "quay.io/cdis/manifestservice:2023.12",
+    "metadata": "quay.io/cdis/metadata-service:2023.12",
+    "peregrine": "quay.io/cdis/peregrine:2023.12",
+    "pidgin": "quay.io/cdis/pidgin:2023.12",
+    "portal": "quay.io/cdis/data-portal:2023.12",
+    "revproxy": "quay.io/cdis/nginx:2023.12",
+    "sheepdog": "quay.io/cdis/sheepdog:2023.12",
+    "sower": "quay.io/cdis/sower:2023.12",
+    "spark": "quay.io/cdis/gen3-spark:2023.12",
+    "tube": "quay.io/cdis/tube:2023.12",
+    "ssjdispatcher": "quay.io/cdis/ssjdispatcher:2023.12",
+    "wts": "quay.io/cdis/workspace-token-service:2023.12",
     "dashboard": "quay.io/cdis/gen3-statics:2020.10"
   },
   "global": {
@@ -45,11 +45,12 @@
     "tier_access_level": "regular",
     "tier_access_limit": 50,
     "public_datasets": true,
-    "lb_type": "internal"
+    "lb_type": "internal",
+    "es7": true
   },
   "ssjdispatcher": {
     "job_images": {
-      "indexing": "quay.io/cdis/indexs3client:2021.06"
+      "indexing": "quay.io/cdis/indexs3client:2023.12"
     }
   },
   "arborist": {
@@ -90,7 +91,7 @@
       "action": "export",
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/pelican-export:2021.06",
+        "image": "quay.io/cdis/pelican-export:2023.12",
         "pull_policy": "Always",
         "env": [
           {
@@ -158,7 +159,7 @@
       "action": "export-files",
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/pelican-export:2021.06",
+        "image": "quay.io/cdis/pelican-export:2023.12",
         "pull_policy": "Always",
         "env": [
           {
@@ -224,7 +225,7 @@
       "serviceAccountName": "jobs-qa-anvil-planx-pla-net",
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/metadata-manifest-ingestion:2021.06",
+        "image": "quay.io/cdis/metadata-manifest-ingestion:2023.12",
         "pull_policy": "Always",
         "env": [
           {
@@ -264,7 +265,7 @@
       "serviceAccountName": "jobs-qa-anvil-planx-pla-net",
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/get-dbgap-metadata:2021.06",
+        "image": "quay.io/cdis/get-dbgap-metadata:2023.12",
         "pull_policy": "Always",
         "env": [],
         "volumeMounts": [
@@ -295,7 +296,7 @@
       "serviceAccountName": "jobs-qa-anvil-planx-pla-net",
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/manifest-indexing:2021.06",
+        "image": "quay.io/cdis/manifest-indexing:2023.12",
         "pull_policy": "Always",
         "env": [
           {
@@ -336,7 +337,7 @@
       "serviceAccountName": "jobs-qa-anvil-planx-pla-net",
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/download-indexd-manifest:2021.06",
+        "image": "quay.io/cdis/download-indexd-manifest:2023.12",
         "pull_policy": "Always",
         "env": [
           {

diff --git a/qa-bloodpac.planx-pla.net/manifest.json b/qa-bloodpac.planx-pla.net/manifest.json
@@ -4,35 +4,35 @@
     "That's all I have to say."
   ],
   "versions": {
-    "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.08",
+    "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2023.12",
     "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
-    "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.07",
-    "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.08",
-    "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.08",
-    "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2022.08",
-    "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:feat_serial-id2",
-    "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.08",
-    "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.08",
-    "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.08",
-    "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2022.08",
+    "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.12",
+    "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.12",
+    "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.12",
+    "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.12",
+    "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.12",
+    "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2023.12",
+    "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.12",
+    "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.12",
+    "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2023.12",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
-    "jupyterhub": "quay.io/occ_data/jupyterhub:2022.08",
-    "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.08",
-    "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2022.08",
-    "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.08",
-    "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.08",
-    "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.08",
+    "jupyterhub": "quay.io/occ_data/jupyterhub:2023.12",
+    "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.12",
+    "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.12",
+    "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.12",
+    "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.12",
+    "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.12",
     "ambassador": "quay.io/datawire/ambassador:1.4.2",
-    "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.08",
-    "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2022.08",
-    "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.08"
+    "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.12",
+    "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.12",
+    "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2023.12"
   },
   "indexd": {
     "arborist": "true"
   },
   "ssjdispatcher": {
     "job_images": {
-      "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2022.08"
+      "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2023.12"
     }
   },
   "arborist": {
@@ -46,7 +46,7 @@
       "serviceAccountName": "jobs-qa-bloodpac-planx-pla-net",
       "container": {
         "name": "job-task",
-        "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2022.08",
+        "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifest-indexing:2023.12",
         "pull_policy": "Always",
         "env": [
           {
@@ -111,7 +111,8 @@
     "netpolicy": "on",
     "kube_bucket": "kube-qaplanetv1-gen3",
     "logs_bucket": "logs-qaplanetv1-gen3",
-    "lb_type": "internal"
+    "lb_type": "internal",
+    "es7": true
   },
   "canary": {
     "default": 0