Skip to content

Commit

Permalink
Documentation updates
Browse files Browse the repository at this point in the history
  • Loading branch information
shaheislamdfe committed Oct 16, 2024
1 parent fece827 commit 74fb52d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 72 deletions.
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,13 @@ aks-production: production-cluster
domains:
$(eval include global_config/domains.sh)

# make review pr_id=5432 railsc
# make qa railsc
.PHONY: railsc
railsc: get-cluster-credentials
$(if $(env), , $(error Missing <env>. Usage: "make <env> railsc"))
kubectl -n $(azure_namespace) exec -ti deployment/teaching-vacancies-$(env) -- rails c

bin/konduit.sh:
curl -s https://raw.githubusercontent.com/DFE-Digital/teacher-services-cloud/main/scripts/konduit.sh -o bin/konduit.sh \
&& chmod +x bin/konduit.sh
Expand Down
30 changes: 13 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,17 @@ This repo is home to two services:

| Name | URL |
| ---------- | ------------ |
| Production | not deployed |
| Preprod | not deployed |
| Test | not deployed |
| Dev | in testing |
| Production | Deployed |
| Preprod | Deployed |
| Test | Deployed |

#### Check

| Name | URL |
| ---------- | ------------ |
| Production | not deployed |
| Preprod | not deployed |
| Test | not deployed |
| Dev | in testing |
| Production | Deployed |
| Preprod | Deployed |
| Test | Deployed |

All environments have continuous deployment, the state of which can be inspected in Github Actions.

Expand All @@ -36,7 +34,6 @@ All environments have continuous deployment, the state of which can be inspected
| Production | Public site |
| Preprod | For internal use by DfE to test deploys |
| Test | For external use by 3rd parties to run audits |
| Dev | For internal use by DfE for testing |

## Dependencies

Expand Down Expand Up @@ -219,7 +216,6 @@ We have a helpful command you can run that will connect you to the right Azure r
You will need the [Azure CLI](https://docs.microsoft.com/en-gb/cli) installed and a [PIM (Privileged Identity Management) request](docs/privileged-identity-management-requests.md) for `production`, `preprod` and `test`.

```bash
make dev az-console
make test az-console
make preprod az-console
make production az-console
Expand All @@ -230,14 +226,14 @@ The review app needs to be deployed first. You can do this manually by tagging a

### Updating keyvault secrets

Make sure `jq` is [installed](#local-development-dependencies).
Updating keyvault secrets is a manual process, the resource can be found in

```bash
make dev edit-keyvault-secret
make test edit-keyvault-secret
make preprod edit-keyvault-secret
make production edit-keyvault-secret
make review pr_id=<ID> edit-keyvault-secret

```
Review: s189t01-aytq-rv-app-kv
Test: s189t01-aytq-ts-app-kv
Preproduction: s189t01-aytq-pp-inf-kv
Produciton: s189p01-aytq-pd-app-kv
```

## Licence
Expand Down
47 changes: 0 additions & 47 deletions docs/azure_storage.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ The services are automatically deployed via a [Github action](https://github.com

We deploy across four environments:

- dev
- test
- preprod
- production
Expand Down
9 changes: 2 additions & 7 deletions docs/review_apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@ Both services are accessible at the single URL. By default, the base path will r

## Deployment

Pending a migration to AKS, the current process for provisioning a review app can be lengthy and somewhat unstable. The build and deploy action can fail for a number of reasons, as can the deployed app. This includes:
In order to deploy a review app you can either use the make target or raise a pull request and label the deployment with 'deploy-aks' and this will trigger the GHA workflow to deploy the review app based on the branch name.

- The slot swap that happens as part of the deployment can fail because the new service fails to respond to a ping
- The new service may not have its database created properly, resulting in missing table errors in the running app

Retrying the Github action usually resolves these issues, and subsequent deploys of the review app are generally faster and more reliable.

For troubleshooting, logs are available in both Github Actions and Logit.
This will then create a URL for testing and to destroy the review app you close the pull request which will trigger the delete workflow. Further details for this can be found in the github workflow build-and-deploy.yml aswell as the deploy-environment/action.yml

## Authentication

Expand Down

0 comments on commit 74fb52d

Please sign in to comment.