Merge pull request #6386 from jim-minter/spinning_tsb_pods

prevent TSB pods from spinning on inappropriate nodes

files/origin-components/apiserver-template.yaml

@@ -15,6 +15,8 @@ parameters:
    apiVersion: config.templateservicebroker.openshift.io/v1
    templateNamespaces:
    - openshift
+- name: NODE_SELECTOR
+  value: "{}"
 objects:
 
 # to create the tsb server
@@ -59,6 +61,7 @@ objects:
               path: /healthz
               port: 8443
               scheme: HTTPS
+        nodeSelector: "${{NODE_SELECTOR}}"
         volumes:
         - name: serving-cert
           secret:

roles/template_service_broker/defaults/main.yml

@@ -3,3 +3,4 @@
 template_service_broker_remove: False
 template_service_broker_install: True
 openshift_template_service_broker_namespaces: ['openshift']
+template_service_broker_selector: { "region": "infra" }

roles/template_service_broker/tasks/install.yml

@@ -15,6 +15,8 @@
 - oc_project:
     name: openshift-template-service-broker
     state: present
+    node_selector:
+      - ""
 
 - command: mktemp -d /tmp/tsb-ansible-XXXXXX
   register: mktemp
@@ -45,6 +47,7 @@
     {{ openshift.common.client_binary }} process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}"
     --param API_SERVER_CONFIG="{{ config['content'] | b64decode }}"
     --param IMAGE="{{ template_service_broker_prefix }}{{ template_service_broker_image_name }}:{{ template_service_broker_version }}"
+    --param NODE_SELECTOR={{ template_service_broker_selector | to_json | quote }}
     | {{ openshift.common.client_binary }} apply -f -
 
 # reconcile with rbac