Browse Source

Split route object out into a separate yaml file

pull/1259/head
Tim McCarthy 5 years ago
parent
commit
66b8797aea
3 changed files with 23 additions and 27 deletions
  1. +0
    -3
      deploy/aro/catalog-api/azure-pipelines.yml
  2. +23
    -0
      deploy/aro/catalog-api/catalog-public-route.yml
  3. +0
    -24
      deploy/aro/openshift-templates/catalogapi-deploy-template.yml

+ 0
- 3
deploy/aro/catalog-api/azure-pipelines.yml View File

@ -41,9 +41,6 @@ stages:
-p PIC_BASE_URL=$(PicBaseUrl) -p PIC_BASE_URL=$(PicBaseUrl)
-p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname)
-p CATALOG_PUBLIC_HOSTNAME=$(CatalogPublicHostName) -p CATALOG_PUBLIC_HOSTNAME=$(CatalogPublicHostName)
-p CA_CERTIFICATE=$(CaCertificate2)
-p CERTIFICATE=$(Certificate2)
-p PRIVATE_KEY=$(PrivateKey2)
| oc apply -f-' | oc apply -f-'
failOnStderr: true failOnStderr: true
displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service' displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service'

+ 23
- 0
deploy/aro/catalog-api/catalog-public-route.yml View File

@ -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

+ 0
- 24
deploy/aro/openshift-templates/catalogapi-deploy-template.yml View File

@ -92,30 +92,6 @@ objects:
type: ClusterIP type: ClusterIP
status: status:
loadBalancer: {} 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: parameters:
- description: The name for the application. - description: The name for the application.
displayName: Application Name displayName: Application Name


Loading…
Cancel
Save