diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 7716e9d29..1f5620cd3 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,9 +17,9 @@ on: workflow_dispatch: jobs: - deploy-dev: + deploy-unstable: # if this job runs on a branch, we deduce that code - # has been pushed to main and should be deployed to dev + # has been pushed to main and should be deployed to unstable if: ${{ github.ref_type == 'branch' }} runs-on: ubuntu-latest steps: @@ -34,10 +34,9 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: sandbox-gsa cf_space: dotgov-poc - push_arguments: "-f ops/manifests/manifest-dev.yaml" + push_arguments: "-f ops/manifests/manifest-unstable.yaml" - # deploy: + # deploy-staging: # # if this job runs on a tag, we deduce that code - # # has been tagged for release and should be deployed to - # # ____? (staging? prod?) + # # has been tagged for release and should be deployed to staging # if: ${{ github.ref_type == 'tag' }} diff --git a/.github/workflows/migrate.yaml b/.github/workflows/migrate.yaml index c772033ae..004352e48 100644 --- a/.github/workflows/migrate.yaml +++ b/.github/workflows/migrate.yaml @@ -3,7 +3,7 @@ name: Run Migrations # This workflow can be run from the CLI # gh workflow run migrate.yaml -f environment=sandbox # OR -# cf run-task getgov-dev --wait \ +# cf run-task getgov-unstable --wait \ # --command 'python manage.py migrate' --name migrate on: @@ -13,22 +13,22 @@ on: type: choice description: Where should we run migrations options: - - sandbox - - production + - unstable + - staging jobs: - migrate-dev: - if: ${{ github.event.inputs.environment == 'sandbox' }} + migrate-unstable: + if: ${{ github.event.inputs.environment == 'unstable' }} runs-on: ubuntu-latest steps: - - name: Run Django migrations for sandbox + - name: Run Django migrations for unstable uses: 18f/cg-deploy-action@main with: cf_username: ${{ secrets.CF_USERNAME }} cf_password: ${{ secrets.CF_PASSWORD }} cf_org: sandbox-gsa cf_space: dotgov-poc - full_command: "cf run-task getgov-dev --wait --command 'python manage.py migrate' --name migrate" + full_command: "cf run-task getgov-unstable --wait --command 'python manage.py migrate' --name migrate" # migrate: - # if: ${{ github.event.inputs.environment == 'production' }} \ No newline at end of file + # if: ${{ github.event.inputs.environment == 'staging' }} \ No newline at end of file diff --git a/docs/ops/README.md b/docs/ops/README.md index 85d3996e2..c87d6455d 100644 --- a/docs/ops/README.md +++ b/docs/ops/README.md @@ -35,7 +35,7 @@ Where `credentials-.json` looks like: } ``` -You can see the current environment with `cf env `, for example `cf env getgov-dev`. +You can see the current environment with `cf env `, for example `cf env getgov-unstable`. The command `cups` stands for [create user provided service](https://docs.cloudfoundry.org/devguide/services/user-provided.html). User provided services are the way currently recommended by Cloud.gov for deploying secrets. The user provided service is bound to the application in `manifest-.json`. @@ -45,7 +45,7 @@ Example: ```bash cf uups getgov-credentials -p credentials-unstable.json -cf restage getgov-dev --strategy rolling +cf restage getgov-unstable --strategy rolling ``` Non-secret environment variables can be declared in `manifest-.json` directly. diff --git a/ops/manifests/manifest-dev.yaml b/ops/manifests/manifest-unstable.yaml similarity index 88% rename from ops/manifests/manifest-dev.yaml rename to ops/manifests/manifest-unstable.yaml index 97b1511fe..976bd4425 100644 --- a/ops/manifests/manifest-dev.yaml +++ b/ops/manifests/manifest-unstable.yaml @@ -1,6 +1,6 @@ --- applications: -- name: getgov-dev +- name: getgov-unstable buildpacks: - python_buildpack path: ../../src @@ -17,7 +17,7 @@ applications: # Tell Django where to find its configuration DJANGO_SETTINGS_MODULE: registrar.config.settings routes: - - route: getgov-dev.app.cloud.gov + - route: getgov-unstable.app.cloud.gov services: - getgov-credentials - getgov-database \ No newline at end of file diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index 42d83e98d..a5408c168 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -44,7 +44,7 @@ DEBUG = env.bool("DJANGO_DEBUG", default=False) # TODO: configure and document security settings ALLOWED_HOSTS = [ - 'getgov-dev.app.cloud.gov', + 'getgov-unstable.app.cloud.gov', 'get.gov' ] ALLOWED_CIDR_NETS = ['10.0.0.0/8'] # nosec