Browse Source

YAML formatting

pull/1259/head
Tim McCarthy 5 years ago
parent
commit
0c059adbd2
2 changed files with 15 additions and 4 deletions
  1. +9
    -1
      deploy/aro/catalog-api/azure-pipelines.yml
  2. +6
    -3
      deploy/aro/openshift-templates/catalogapi-deploy-template.yml

+ 9
- 1
deploy/aro/catalog-api/azure-pipelines.yml View File

@ -36,6 +36,14 @@ 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) -p CATALOG_PUBLIC_HOSTNAME=$(CatalogPublicHostName) -p CA_CERTIFICATE="$(CaCertificate2)" -p CERTIFICATE="$(Certificate2)" -p PRIVATE_KEY="$(PrivateKey2)" | 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="$(CaCertificate2)"
-p CERTIFICATE="$(Certificate2)"
-p PRIVATE_KEY="$(PrivateKey2)"
| oc apply -f-'
failOnStderr: true
displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service'

+ 6
- 3
deploy/aro/openshift-templates/catalogapi-deploy-template.yml View File

@ -104,9 +104,12 @@ objects:
port:
targetPort: 8080-tcp
tls:
caCertificate: ${CA_CERTIFICATE}
certificate: ${CERTIFICATE}
key: ${PRIVATE_KEY}
caCertificate: |
${CA_CERTIFICATE}
certificate: |
${CERTIFICATE}
key: |
${PRIVATE_KEY}
termination: edge
to:
kind: Service


Loading…
Cancel
Save