From 19d2e4c67c6393f48c55c865e8549bf6510aa10f Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Sat, 15 May 2021 13:35:39 -0500
Subject: [PATCH] solr: use a route instead of joining pod networks

---
 .../openshift-apps/fedora-packages-static.yml |  2 +-
 playbooks/openshift-apps/solr.yml             | 28 ++++++++++---------
 .../templates/configmap.yml                   |  2 +-
 .../templates/deploymentconfig.yml            |  6 ++--
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/playbooks/openshift-apps/fedora-packages-static.yml b/playbooks/openshift-apps/fedora-packages-static.yml
index 701782c689..56b774a48a 100644
--- a/playbooks/openshift-apps/fedora-packages-static.yml
+++ b/playbooks/openshift-apps/fedora-packages-static.yml
@@ -65,4 +65,4 @@
     app: fedora-packages-static
     objecttype: project
     objectname: fedora-packages-static
-    tags: [ never, delete ]
\ No newline at end of file
+    tags: [ never, delete ]
diff --git a/playbooks/openshift-apps/solr.yml b/playbooks/openshift-apps/solr.yml
index f6a81c0b59..b371e88b5d 100644
--- a/playbooks/openshift-apps/solr.yml
+++ b/playbooks/openshift-apps/solr.yml
@@ -35,21 +35,23 @@
     file: service.yml
     objectname: service.yml
 
+  - role: openshift/route
+    app: solr
+    routename: solr
+    host: "solr{{ env_suffix }}.fedoraproject.org"
+    serviceport: 8983-tcp
+    servicename: solr
+    annotations:
+      haproxy.router.openshift.io/ip_whitelist: 10.0.0.0/8
+
   - role: openshift/object
     app: solr
     template: deploymentconfig.yml
     objectname: deploymentconfig.yml
 
-- name: Link solr and fedora-packages-static networks
-  hosts: os_masters_stg[0]
-  user: root
-  gather_facts: False
-
-  vars_files:
-    - /srv/web/infra/ansible/vars/global.yml
-    - "/srv/private/ansible/vars.yml"
-    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  tasks:
-  - name: Run oc adm command to link solr to other projects
-    command: "oc adm pod-network join-projects --to=solr fedora-packages-static"
+# to run: sudo rbac-playbook -l staging -t delete openshift-apps/solr.yml
+  - role: openshift/object-delete
+    app: solr
+    objecttype: project
+    objectname: solr
+    tags: [ never, delete ]
diff --git a/roles/openshift-apps/fedora-packages-static/templates/configmap.yml b/roles/openshift-apps/fedora-packages-static/templates/configmap.yml
index 37044ebf68..55d358db6c 100644
--- a/roles/openshift-apps/fedora-packages-static/templates/configmap.yml
+++ b/roles/openshift-apps/fedora-packages-static/templates/configmap.yml
@@ -6,5 +6,5 @@ metadata:
   labels:
     app: fedora-packages-static
 data:
-  solr-url: "http://solr.solr.svc.cluster.local:8983/"
+  solr-url: "https://solr{{ env_suffix }}.fedoraproject.org:8983/"
   sitemap-url: "https://packages{{ env_suffix }}.fedoraproject.org"
diff --git a/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml b/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml
index a442976270..14f6706c54 100644
--- a/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml
@@ -22,7 +22,7 @@ spec:
       initContainers:
       - name: init-solr
         image: busybox
-        command: ['sh', '-c', 'until nslookup solr.solr.svc.cluster.local; do echo waiting for solr; sleep 2; done;']
+        command: ['sh', '-c', 'until ping -c1 solr{{ env_suffix }}.fedoraproject.org >/dev/null 2>&1; do echo waiting for solr; sleep 2; done']
       containers:
       - name: fedora-packages-static
         image: fedora-packages-static:latest
@@ -30,12 +30,12 @@ spec:
         - name: SOLR_URL
           valueFrom:
             configMapKeyRef:
-              name: fedora-packages-static-configmap 
+              name: fedora-packages-static-configmap
               key: solr-url
         - name: SITEMAP_URL
           valueFrom:
             configMapKeyRef:
-              name: fedora-packages-static-configmap 
+              name: fedora-packages-static-configmap
               key: sitemap-url
         ports:
         - containerPort: 80