From 66b8797aeaaf00b5cd50d399d837cebc9ac9e9cb Mon Sep 17 00:00:00 2001
From: Tim McCarthy <tim.mccarthy@perficient.com>
Date: Wed, 26 Feb 2020 22:06:49 -0800
Subject: [PATCH] Split route object out into a separate yaml file

---
 deploy/aro/catalog-api/azure-pipelines.yml    |  3 ---
 .../aro/catalog-api/catalog-public-route.yml  | 23 ++++++++++++++++++
 .../catalogapi-deploy-template.yml            | 24 -------------------
 3 files changed, 23 insertions(+), 27 deletions(-)
 create mode 100644 deploy/aro/catalog-api/catalog-public-route.yml

diff --git a/deploy/aro/catalog-api/azure-pipelines.yml b/deploy/aro/catalog-api/azure-pipelines.yml
index 53f83958a..cbb4df6cd 100644
--- a/deploy/aro/catalog-api/azure-pipelines.yml
+++ b/deploy/aro/catalog-api/azure-pipelines.yml
@@ -41,9 +41,6 @@ stages:
             -p PIC_BASE_URL=$(PicBaseUrl) 
             -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) 
             -p CATALOG_PUBLIC_HOSTNAME=$(CatalogPublicHostName) 
-            -p CA_CERTIFICATE=$(CaCertificate2) 
-            -p CERTIFICATE=$(Certificate2) 
-            -p PRIVATE_KEY=$(PrivateKey2) 
             | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service'
\ No newline at end of file
diff --git a/deploy/aro/catalog-api/catalog-public-route.yml b/deploy/aro/catalog-api/catalog-public-route.yml
new file mode 100644
index 000000000..2eda27300
--- /dev/null
+++ b/deploy/aro/catalog-api/catalog-public-route.yml
@@ -0,0 +1,23 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+    app: catalogapi
+name: catalog-public-route
+spec:
+host: __CatalogPublicHostName__
+port:
+  targetPort: 8080-tcp
+tls:
+  caCertificate: |
+    __CaCertificate2__
+  certificate: |
+    __Certificate2__
+  key: |
+    __PrivateKey2__
+  termination: edge
+to:
+  kind: Service
+  name: catalogapi
+  weight: 100
+wildcardPolicy: None
\ No newline at end of file
diff --git a/deploy/aro/openshift-templates/catalogapi-deploy-template.yml b/deploy/aro/openshift-templates/catalogapi-deploy-template.yml
index 184820fca..1364286b5 100644
--- a/deploy/aro/openshift-templates/catalogapi-deploy-template.yml
+++ b/deploy/aro/openshift-templates/catalogapi-deploy-template.yml
@@ -92,30 +92,6 @@ objects:
     type: ClusterIP
   status:
     loadBalancer: {}
-- apiVersion: route.openshift.io/v1
-  kind: Route
-  metadata:
-    labels:
-      app: ${APPLICATION_NAME}
-      template: ${TEMPLATE_NAME}
-    name: catalog-public-route
-  spec:
-    host: ${CATALOG_PUBLIC_HOSTNAME}
-    port:
-      targetPort: 8080-tcp
-    tls:
-      caCertificate: |
-        ${CA_CERTIFICATE}
-      certificate: |
-        ${CERTIFICATE}
-      key: |
-        ${PRIVATE_KEY}
-      termination: edge
-    to:
-      kind: Service
-      name: ${APPLICATION_NAME}
-      weight: 100
-    wildcardPolicy: None
 parameters:
 - description: The name for the application.
   displayName: Application Name