diff --git a/deploy/aro/catalog-api/azure-pipelines.yml b/deploy/aro/catalog-api/azure-pipelines.yml index 0728fa15d..268999e71 100644 --- a/deploy/aro/catalog-api/azure-pipelines.yml +++ b/deploy/aro/catalog-api/azure-pipelines.yml @@ -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' \ 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 677282fb5..184820fca 100644 --- a/deploy/aro/openshift-templates/catalogapi-deploy-template.yml +++ b/deploy/aro/openshift-templates/catalogapi-deploy-template.yml @@ -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