fix(cohort-deploy-logic): Updated kube-roll-all to not deploy cohort …

…middleware twice and swapped order to fix dependency issues (#2333)

Co-authored-by: Edward Malinowski <edwardmalinowski@Eds-MacBook-Pro.attlocal.net>

gen3/bin/kube-roll-all.sh

@@ -243,6 +243,12 @@ else
   gen3_log_info "not deploying dicom-viewer - no manifest entry for '.versions[\"dicom-viewer\"]'"
 fi
 
+if g3k_manifest_lookup '.versions["ohdsi-atlas"]' && g3k_manifest_lookup '.versions["ohdsi-webapi"]' 2> /dev/null; then
+  gen3 kube-setup-ohdsi &
+else
+  gen3_log_info "not deploying OHDSI tools - no manifest entry for '.versions[\"ohdsi-atlas\"]' and '.versions[\"ohdsi-webapi\"]'"
+fi
+
 if g3k_manifest_lookup '.versions["cohort-middleware"]' 2> /dev/null; then
   gen3 kube-setup-cohort-middleware
 else
@@ -340,18 +346,6 @@ else
   gen3_log_info "not deploying argo-wrapper - no manifest entry for '.versions[\"argo-wrapper\"]'"
 fi
 
-if g3k_manifest_lookup '.versions["cohort-middleware"]' 2> /dev/null; then
-  gen3 roll cohort-middleware &
-else
-  gen3_log_info "not deploying cohort-middleware - no manifest entry for '.versions[\"cohort-middleware\"]'"
-fi
-
-if g3k_manifest_lookup '.versions["ohdsi-atlas"]' && g3k_manifest_lookup '.versions["ohdsi-webapi"]' 2> /dev/null; then
-  gen3 kube-setup-ohdsi &
-else
-  gen3_log_info "not deploying OHDSI tools - no manifest entry for '.versions[\"ohdsi-atlas\"]' and '.versions[\"ohdsi-webapi\"]'"
-fi
-
 gen3_log_info "enable network policy"
 gen3 kube-setup-networkpolicy "enable" || true &