Merge pull request #8086 from dymurray/dr

Bug 1569220 - Add dashboard redirector feature

roles/ansible_service_broker/defaults/main.yml

@@ -1,6 +1,8 @@
 ---
 
 ansible_service_broker_node_selector: "{{ openshift_hosted_infra_selector | default('region=infra') | map_from_pairs }}"
+ansible_service_broker_enable_dashboard_redirector: false
+ansible_service_broker_dashboard_redirector_route: "dr-1337-openshift-ansible-service-broker.{{ openshift_master_default_subdomain }}"
 
 ansible_service_broker_remove: false
 ansible_service_broker_install: true

roles/ansible_service_broker/tasks/install.yml

@@ -141,6 +141,10 @@
         port: 1338
         targetPort: 1338
         protocol: TCP
+      - name: port-1337
+        port: 1337
+        targetPort: 1337
+        protocol: TCP
     selector:
       app: openshift-ansible-service-broker
       service: asb
@@ -157,6 +161,18 @@
     port: 1338
     tls_termination: Reencrypt
 
+- name: create route for dashboard-redirector service
+  oc_route:
+    name: dr-1337
+    namespace: openshift-ansible-service-broker
+    state: present
+    labels:
+      app: openshift-ansible-service-broker
+      service: asb
+    service_name: asb
+    port: 1337
+  when: ansible_service_broker_enable_dashboard_redirector
+
 - name: Set Ansible Service Broker deployment config
   oc_obj:
     force: yes

roles/ansible_service_broker/tasks/remove.yml

@@ -70,6 +70,13 @@
     namespace: openshift-ansible-service-broker
     state: absent
 
+- name: remove route for dashboard-redirector service
+  oc_route:
+    name: dr-1337
+    namespace: openshift-ansible-service-broker
+    state: absent
+  when: ansible_service_broker_enable_dashboard_redirector
+
 - name: remove Ansible Service Broker deployment config
   oc_obj:
     name: asb

roles/ansible_service_broker/templates/asb_dc.yaml.j2

@@ -21,6 +21,17 @@ spec:
     spec:
       serviceAccount: asb
       containers:
+{% if ansible_service_broker_enable_dashboard_redirector %}
+        - image: {{ ansible_service_broker_image }}
+          name: dashboard-redirector
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 1337
+              protocol: TCP
+          command:
+            - dashboard-redirector
+          imagePullPolicy: IfNotPresent
+{% endif %}
         - image: {{ ansible_service_broker_image }}
           name: asb
           imagePullPolicy: IfNotPresent

roles/ansible_service_broker/templates/configmap.yaml.j2

@@ -38,6 +38,9 @@ data:
       keep_namespace_on_error: {{ ansible_service_broker_keep_namespace_on_error | bool | lower }}
     broker:
       dev_broker: {{ ansible_service_broker_dev_broker | bool | lower }}
+{% if ansible_service_broker_enable_dashboard_redirector %}
+      dashboard_redirector: {{ ansible_service_broker_dashboard_redirector }}
+{% endif %}
       bootstrap_on_startup: {{ ansible_service_broker_bootstrap_on_startup | bool | lower }}
       refresh_interval: {{ ansible_service_broker_refresh_interval }}
       launch_apb_on_bind: {{ ansible_service_broker_launch_apb_on_bind | bool | lower }}