Updated Web SPA health check URL; added public route to catalogapi

deploy/aro/azure-devops-templates/variables.yml

@@ -16,7 +16,8 @@ variables:
   CatalogApiHostName: catalogapi.$(OpenShiftProject).svc
   CatalogApiUrl: http://$(CatalogApiHostName):8080
   CatalogApiGrpcUrl: http://$(CatalogApiHostName):8081
-  CatalogApiUrlExternal: https://$(CatalogPublicHostName)
+  CatalogPublicHostName: catalog$(EnvironmentName)
+  CatalogUrlExternal: https://$(CatalogPublicHostName)
   CatalogApiHc: $(CatalogApiUrl)/hc
   PicBaseUrl: $(CatalogApiUrlExternal)/api/v1/catalog/items/[0]/pic/
   LocationsApiHostName: locationsapi.$(OpenShiftProject).svc
@@ -54,7 +55,8 @@ variables:
   WebhooksWebClientUrl: http://$(WebhooksWebClientHostName):8080
   WebhooksToken: 6168DB8D-DC58-4094-AF24-483278923590
   WebSpaUrl: https://eshop-spa$(EnvironmentName)
-  WebSpaHc: $(WebSpaUrl)/hc
+  WebSpaHostName: webspa.$(OpenShiftProject).svc
+  WebSpaHc: http://$(WebSpaHostName):8080/hc
   WebMvcUrl: https://$(PublicHostName)
   WebMvcHc: $(WebMvcUrl)/hc
   WebShoppingApiGatewayHostName: webshoppingapigw.$(OpenShiftProject).svc

deploy/aro/catalog-api/azure-pipelines.yml

@@ -31,6 +31,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/catalogapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p PIC_BASE_URL=$(PicBaseUrl) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/openshift-templates/catalogapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p PIC_BASE_URL=$(PicBaseUrl) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p CATALOG_PUBLIC_HOSTNAME=$(CatalogPublicHostName) -p CA_CERTIFICATE=$(CaCertificate) -p CERTIFICATE=$(Certificate) -p PRIVATE_KEY=$(PrivateKey) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service'

deploy/aro/mobileshoppingagg/azure-pipelines.yml

@@ -15,6 +15,7 @@ stages:
     variables:
       OpenShiftProject: development
       SourceImageRegistryProjectName: development
+      EnvironmentName: -dev.msftnbu.com
     jobs:
       - job: MobileShoppingAggregatorDeployment
         displayName: 'Mobile Shopping Aggregator Deployment'

deploy/aro/openshift-templates/catalogapi-deploy-template.yml

@@ -92,6 +92,28 @@ 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}
+    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
@@ -115,3 +137,19 @@ parameters:
   displayName: RabbitMQ Hostname
   name: RABBITMQ_HOSTNAME
   required: true
+- description: The public hostname of the Catalog route
+  displayName: Catalog Public Hostname
+  name: CATALOG_PUBLIC_HOSTNAME
+  required: true
+- description: The CA Certificate thumbprint value
+  displayName: CA Certificate
+  name: CA_CERTIFICATE
+  required: true
+- description: The Certificate thumbprint value
+  displayName: Certificate
+  name: CERTIFICATE
+  required: true
+- description: The private key thumbprint value for the certificate
+  displayName: Private Key
+  name: PRIVATE_KEY
+  required: true