From 7124201454b9ac362be832ab0aec7f28de05aa12 Mon Sep 17 00:00:00 2001
From: EliseCastle23 <elisemcastle@uchicago.edu>
Date: Fri, 15 Dec 2023 15:52:53 -0700
Subject: [PATCH 1/3] Updating Niaiddata to release 2023.12 in preparation for
 ES7 changes.

---
 diseasedatahub.org/manifest.json | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/diseasedatahub.org/manifest.json b/diseasedatahub.org/manifest.json
index c6c814d3fa..ced4bdca94 100644
--- a/diseasedatahub.org/manifest.json
+++ b/diseasedatahub.org/manifest.json
@@ -5,23 +5,23 @@
   ],
   "versions": {
     "aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
-    "arborist": "quay.io/cdis/arborist:2.3.0",
-    "fence": "quay.io/cdis/fence:4.10.0",
-    "indexd": "quay.io/cdis/indexd:2.1.0",
+    "arborist": "quay.io/cdis/arborist:2023.12",
+    "fence": "quay.io/cdis/fence:2023.12",
+    "indexd": "quay.io/cdis/indexd:2023.12",
     "portal": "quay.io/cdis/data-ecosystem-portal:1.2.4",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:2023.12",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
     "jupyterhub": "quay.io/occ_data/jupyterhub:master",
-    "spark": "quay.io/cdis/gen3-spark:1.0.0",
-    "wts": "quay.io/cdis/workspace-token-service:0.2.0",
-    "manifestservice": "quay.io/cdis/manifestservice:0.2.0",
-    "tube": "quay.io/cdis/tube:0.3.15",
-    "hatchery": "quay.io/cdis/hatchery:0.1.1",
+    "spark": "quay.io/cdis/gen3-spark:2023.12",
+    "wts": "quay.io/cdis/workspace-token-service:2023.12",
+    "manifestservice": "quay.io/cdis/manifestservice:2023.12",
+    "tube": "quay.io/cdis/tube:2023.12",
+    "hatchery": "quay.io/cdis/hatchery:2023.12",
     "ambassador": "quay.io/datawire/ambassador:0.60.3",
-    "guppy": "quay.io/cdis/guppy:0.3.7",
-    "sheepdog": "quay.io/cdis/sheepdog:1.1.12",
-    "peregrine": "quay.io/cdis/peregrine:1.2.1",
-    "pidgin": "quay.io/cdis/pidgin:1.1.0"
+    "guppy": "quay.io/cdis/guppy:2023.12",
+    "sheepdog": "quay.io/cdis/sheepdog:2023.12",
+    "peregrine": "quay.io/cdis/peregrine:2023.12",
+    "pidgin": "quay.io/cdis/pidgin:2023.12"
   },
   "global": {
     "environment": "niaiddata",
@@ -39,7 +39,8 @@
     "cookie_domain": "diseasedatahub.org",
     "public_datasets": true,
     "pdb": "on",
-    "tier_access_level": "libre"
+    "tier_access_level": "libre",
+    "es7": true
   },
   "hatchery": {
     "user-namespace": "jupyter-pods-niaiddata",

From 8882b9f0b5c5697b4a78c2e6314c02e65786112f Mon Sep 17 00:00:00 2001
From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:51:20 -0700
Subject: [PATCH 2/3] removing Pidgin as it is now deprecated

---
 diseasedatahub.org/manifest.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/diseasedatahub.org/manifest.json b/diseasedatahub.org/manifest.json
index ced4bdca94..c4b23eeb50 100644
--- a/diseasedatahub.org/manifest.json
+++ b/diseasedatahub.org/manifest.json
@@ -20,8 +20,7 @@
     "ambassador": "quay.io/datawire/ambassador:0.60.3",
     "guppy": "quay.io/cdis/guppy:2023.12",
     "sheepdog": "quay.io/cdis/sheepdog:2023.12",
-    "peregrine": "quay.io/cdis/peregrine:2023.12",
-    "pidgin": "quay.io/cdis/pidgin:2023.12"
+    "peregrine": "quay.io/cdis/peregrine:2023.12"
   },
   "global": {
     "environment": "niaiddata",

From c1b79528a25172a19e817dd436c8fd3ffeda33ef Mon Sep 17 00:00:00 2001
From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:46:49 -0700
Subject: [PATCH 3/3] switching networkpolicy to "on"

---
 diseasedatahub.org/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diseasedatahub.org/manifest.json b/diseasedatahub.org/manifest.json
index c4b23eeb50..cce04362cd 100644
--- a/diseasedatahub.org/manifest.json
+++ b/diseasedatahub.org/manifest.json
@@ -34,7 +34,7 @@
     "dispatcher_job_num": "10",
     "useryaml_s3path": "s3://cdis-gen3-users/nde/user.yaml",
     "origins_allow_credentials": ["https://tb.diseasedatahub.org", "https://aids.diseasedatahub.org", "https://microbiome.diseasedatahub.org", "https://flu.diseasedatahub.org"],
-    "netpolicy": "off",
+    "netpolicy": "on",
     "cookie_domain": "diseasedatahub.org",
     "public_datasets": true,
     "pdb": "on",