diff --git a/.github/workflows/merge-demo.yml b/.github/workflows/merge-demo.yml index 411925ab..ac40e3ed 100644 --- a/.github/workflows/merge-demo.yml +++ b/.github/workflows/merge-demo.yml @@ -65,7 +65,7 @@ jobs: - name: admin file: admin/openshift.deploy.yml overwrite: true - parameters: -p URL=fom-demo.apps.silver.devops.gov.bc.ca -p CERTBOT=false + parameters: -p URL=fom-demo.apps.silver.devops.gov.bc.ca - name: db file: db/openshift.deploy.yml overwrite: false @@ -75,7 +75,7 @@ jobs: - name: public file: public/openshift.deploy.yml overwrite: true - parameters: -p URL=fom-demo.apps.silver.devops.gov.bc.ca -p CERTBOT=false + parameters: -p URL=fom-demo.apps.silver.devops.gov.bc.ca steps: - uses: bcgov-nr/action-deployer-openshift@v2.2.0 with: diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index 630ebace..7d09d5ce 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -90,7 +90,6 @@ jobs: -p LOGOUT_CHAIN_URL="https://logon7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/logout?redirect_uri=" -p MEMORY_REQUEST=650Mi -p MEMORY_LIMIT=4Gi - post_rollout: oc create job "certbot-manual-$(date +%s)" --from=cronjob/certbot - name: admin file: admin/openshift.deploy.yml overwrite: true diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index c60edebf..b3b48032 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -93,7 +93,7 @@ jobs: overwrite: true parameters: -p OC_NAMESPACE=${{ vars.OC_NAMESPACE }} - -p CERTBOT=false -p REPLICA_COUNT=1 + -p REPLICA_COUNT=1 -p FOM_EMAIL_NOTIFY=SIBIFSAF@victoria1.gov.bc.ca -p DB_TESTDATA=true -p AWS_USER_POOLS_WEB_CLIENT_ID="7hpo4qa7j0hs0rkfl2pm0sto5k" @@ -102,7 +102,7 @@ jobs: - name: admin file: admin/openshift.deploy.yml overwrite: true - parameters: -p CERTBOT=false -p REPLICA_COUNT=1 + parameters: -p REPLICA_COUNT=1 triggers: ('db/' 'libs/' 'api/' 'admin/') - name: db file: db/openshift.deploy.yml @@ -111,7 +111,7 @@ jobs: - name: public file: public/openshift.deploy.yml overwrite: true - parameters: -p CERTBOT=false -p REPLICA_COUNT=1 + parameters: -p REPLICA_COUNT=1 triggers: ('db/' 'libs/' 'api/' 'public/') steps: - uses: bcgov-nr/action-deployer-openshift@v2.2.0 diff --git a/admin/openshift.deploy.yml b/admin/openshift.deploy.yml index dac6fdd1..bcc19e1f 100644 --- a/admin/openshift.deploy.yml +++ b/admin/openshift.deploy.yml @@ -22,9 +22,6 @@ parameters: - name: URL description: Deployment URL, e.g. fom-123.apps.silver.devops.gov.bc.ca or fom.nrs.gov.bc.ca required: true - - name: CERTBOT - description: Is certbot handling these certs [true/false]? - value: "true" - name: CPU_REQUEST value: 20m - name: MEMORY_REQUEST @@ -179,7 +176,6 @@ objects: metadata: labels: app: ${NAME}-${ZONE} - certbot-managed: ${CERTBOT} name: ${NAME}-${ZONE}-${COMPONENT} spec: host: ${URL} diff --git a/api/openshift.deploy.yml b/api/openshift.deploy.yml index 1576cec3..3ea0f150 100644 --- a/api/openshift.deploy.yml +++ b/api/openshift.deploy.yml @@ -35,9 +35,6 @@ parameters: - name: URL description: Deployment URL, e.g. fom-123.apps.silver.devops.gov.bc.ca or fom.nrs.gov.bc.ca required: true - - name: CERTBOT - description: Is certbot handling these certs [true/false]? - value: "true" - name: CPU_REQUEST value: 30m - name: MEMORY_REQUEST @@ -292,7 +289,6 @@ objects: metadata: labels: app: ${NAME}-${ZONE} - certbot-managed: ${CERTBOT} name: ${NAME}-${ZONE}-${COMPONENT} annotations: haproxy.router.openshift.io/timeout: 120s # (Fix 611 - /bcgw-extract long time response in prod) diff --git a/public/openshift.deploy.yml b/public/openshift.deploy.yml index 6bffc955..76b6998a 100644 --- a/public/openshift.deploy.yml +++ b/public/openshift.deploy.yml @@ -22,9 +22,6 @@ parameters: - name: URL description: Deployment URL, e.g. fom-123.apps.silver.devops.gov.bc.ca or fom.nrs.gov.bc.ca required: true - - name: CERTBOT - description: Is certbot handling these certs [true/false]? - value: "true" - name: CPU_REQUEST value: 20m - name: MEMORY_REQUEST @@ -179,7 +176,6 @@ objects: metadata: labels: app: ${NAME}-${ZONE} - certbot-managed: ${CERTBOT} name: ${NAME}-${ZONE}-${COMPONENT} spec: host: ${URL}