From 849126d89a8b9bdadfc14332d0796794c02afc0a Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 9 Jun 2022 13:51:56 -0700
Subject: [PATCH] openvpn: move ocp_nodes var to all, drop node-selector from
 testing

Putting ocp_nodes in group_vars/all allows both proxies and openvpn
openshift app to use it.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 inventory/group_vars/all                              | 9 +++++++++
 inventory/group_vars/proxies                          | 7 -------
 playbooks/openshift-apps/openvpn.yml                  | 2 --
 roles/openshift-apps/openvpn/templates/deployment.yml | 2 --
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 09ddc2b29d..f675a0ffe6 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -191,6 +191,15 @@ nrpe_procs_warn: 250
 num_cpus: 2
 # ocp4 is only set true in some proxy roles
 ocp4: false
+# All the ocp production nodes. We place this here so proxies and openvpn openshift app
+# can both use it.
+ocp_nodes:
+  - worker01.ocp.iad2.fedoraproject.org
+  - worker02.ocp.iad2.fedoraproject.org
+  - worker03.ocp.iad2.fedoraproject.org
+  - worker04.ocp.iad2.fedoraproject.org
+  - worker05.ocp.iad2.fedoraproject.org
+  - worker06.ocp.iad2.fedoraproject.org
 ocp_wildcard_cert_file: wildcard-2022.apps.ocp.fedoraproject.org.cert
 # This is the openshift wildcard cert for ocp
 ocp_wildcard_cert_name: wildcard-2022.apps.ocp.fedoraproject.org
diff --git a/inventory/group_vars/proxies b/inventory/group_vars/proxies
index 444b5debc4..ddc44777ca 100644
--- a/inventory/group_vars/proxies
+++ b/inventory/group_vars/proxies
@@ -47,13 +47,6 @@ ocp_masters:
   - ocp01.ocp.iad2.fedoraproject.org
   - ocp02.ocp.iad2.fedoraproject.org
   - ocp03.ocp.iad2.fedoraproject.org
-ocp_nodes:
-  - worker01.ocp.iad2.fedoraproject.org
-  - worker02.ocp.iad2.fedoraproject.org
-  - worker03.ocp.iad2.fedoraproject.org
-  - worker04.ocp.iad2.fedoraproject.org
-  - worker05.ocp.iad2.fedoraproject.org
-  - worker06.ocp.iad2.fedoraproject.org
 openshift_masters:
   - os-master01.vpn.fedoraproject.org
   - os-master02.vpn.fedoraproject.org
diff --git a/playbooks/openshift-apps/openvpn.yml b/playbooks/openshift-apps/openvpn.yml
index 9154ab4e13..87024c9d01 100644
--- a/playbooks/openshift-apps/openvpn.yml
+++ b/playbooks/openshift-apps/openvpn.yml
@@ -10,8 +10,6 @@
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   vars:
     app: openvpn
-    ocp_nodes:
-    - worker06.ocp.iad2.fedoraproject.org
 
   roles:
   - role: openshift/project
diff --git a/roles/openshift-apps/openvpn/templates/deployment.yml b/roles/openshift-apps/openvpn/templates/deployment.yml
index c98752594d..3d5b91e855 100644
--- a/roles/openshift-apps/openvpn/templates/deployment.yml
+++ b/roles/openshift-apps/openvpn/templates/deployment.yml
@@ -71,8 +71,6 @@ spec:
           path: /dev/net/tun
       - name: openvpn-ssl
         emptyDir: {}
-      nodeSelector:
-        kubernetes.io/hostname: worker06.ocp.iad2.fedoraproject.org
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution: