wip

DFE-Digital · May 2, 2024 · 3f8176f · 3f8176f
1 parent a5959f4
commit 3f8176f
Show file tree

Hide file tree

Showing 53 changed files with 564 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -87,3 +87,5 @@ bin/konduit.sh
 ministerial-report-applications*.txt
 
 .cftoken
+
+maintenance_page/manifests/maintenance/deployment_maintenance.yml
diff --git a/Makefile b/Makefile
@@ -271,16 +271,17 @@ bin/terrafile: ## Install terrafile to manage terraform modules
 
 maintenance-image-push:
 	$(if ${GITHUB_TOKEN},, $(error Provide a valid Github token with write:packages permissions as GITHUB_TOKEN variable))
-	$(if ${MAINTENANCE_IMAGE_TAG},, $(eval MAINTENANCE_IMAGE_TAG=main))
-	docker build -t ghcr.io/dfe-digital/apply-teacher-training-maintenance:${MAINTENANCE_IMAGE_TAG} service_unavailable_page
+	$(if ${MAINTENANCE_IMAGE_TAG},, $(eval export MAINTENANCE_IMAGE_TAG=$(shell date +%s)))
+	docker build -t ghcr.io/dfe-digital/apply-teacher-training-maintenance:${MAINTENANCE_IMAGE_TAG} maintenance_page
 	echo ${GITHUB_TOKEN} | docker login ghcr.io -u USERNAME --password-stdin
 	docker push ghcr.io/dfe-digital/apply-teacher-training-maintenance:${MAINTENANCE_IMAGE_TAG}
 
-maintenance-fail-over:
+maintenance-fail-over: get-cluster-credentials
 	$(eval export CONFIG)
-	./service_unavailable_page/scripts/failover.sh
+	./maintenance_page/scripts/failover.sh
 
 enable-maintenance: maintenance-image-push maintenance-fail-over
-disable-maintenance:
+
+disable-maintenance: get-cluster-credentials
 	$(eval export CONFIG)
-	./service_unavailable_page/scripts/failback.sh
+	./maintenance_page/scripts/failback.sh
diff --git a/maintenance_page/Dockerfile b/maintenance_page/Dockerfile
@@ -0,0 +1,4 @@
+FROM nginx:1.25.4
+
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY ./html/ /usr/share/nginx/html/
diff --git a/maintenance_page/html/assets/fonts/bold-affa96571d-v2.woff b/maintenance_page/html/assets/fonts/bold-affa96571d-v2.woff
diff --git a/maintenance_page/html/assets/fonts/bold-b542beb274-v2.woff2 b/maintenance_page/html/assets/fonts/bold-b542beb274-v2.woff2
diff --git a/maintenance_page/html/assets/fonts/light-94a07e06a1-v2.woff2 b/maintenance_page/html/assets/fonts/light-94a07e06a1-v2.woff2
diff --git a/maintenance_page/html/assets/fonts/light-f591b13f7d-v2.woff b/maintenance_page/html/assets/fonts/light-f591b13f7d-v2.woff
diff --git a/maintenance_page/html/assets/images/favicon.ico b/maintenance_page/html/assets/images/favicon.ico
diff --git a/maintenance_page/html/assets/images/favicon.svg b/maintenance_page/html/assets/images/favicon.svg
diff --git a/maintenance_page/html/assets/images/govuk-apple-touch-icon-152x152.png b/maintenance_page/html/assets/images/govuk-apple-touch-icon-152x152.png
diff --git a/maintenance_page/html/assets/images/govuk-apple-touch-icon-167x167.png b/maintenance_page/html/assets/images/govuk-apple-touch-icon-167x167.png
diff --git a/maintenance_page/html/assets/images/govuk-apple-touch-icon-180x180.png b/maintenance_page/html/assets/images/govuk-apple-touch-icon-180x180.png
diff --git a/maintenance_page/html/assets/images/govuk-apple-touch-icon.png b/maintenance_page/html/assets/images/govuk-apple-touch-icon.png
diff --git a/maintenance_page/html/assets/images/govuk-crest-2x.png b/maintenance_page/html/assets/images/govuk-crest-2x.png
diff --git a/maintenance_page/html/assets/images/govuk-crest.png b/maintenance_page/html/assets/images/govuk-crest.png
diff --git a/maintenance_page/html/assets/images/govuk-icon-180.png b/maintenance_page/html/assets/images/govuk-icon-180.png
diff --git a/maintenance_page/html/assets/images/govuk-icon-192.png b/maintenance_page/html/assets/images/govuk-icon-192.png
diff --git a/maintenance_page/html/assets/images/govuk-icon-512.png b/maintenance_page/html/assets/images/govuk-icon-512.png
diff --git a/maintenance_page/html/assets/images/govuk-icon-mask.svg b/maintenance_page/html/assets/images/govuk-icon-mask.svg
diff --git a/maintenance_page/html/assets/images/govuk-logotype-crown.png b/maintenance_page/html/assets/images/govuk-logotype-crown.png
diff --git a/maintenance_page/html/assets/images/govuk-mask-icon.svg b/maintenance_page/html/assets/images/govuk-mask-icon.svg
diff --git a/maintenance_page/html/assets/images/govuk-opengraph-image.png b/maintenance_page/html/assets/images/govuk-opengraph-image.png
diff --git a/maintenance_page/html/index.html b/maintenance_page/html/index.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html lang="en" class="govuk-template">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>This service is currently unavailable - Apply for teacher training - GOV.UK</title>
+    <meta name="robots" content="noindex, nofollow">
+    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+    <meta name="theme-color" content="#0b0c0c">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="assets/images/favicon.ico" type="image/x-icon">
+    <link rel="mask-icon" href="assets/images/govuk-mask-icon.svg" color="#0b0c0c">
+    <link rel="apple-touch-icon" sizes="180x180" href="assets/images/govuk-apple-touch-icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="167x167" href="assets/images/govuk-apple-touch-icon-167x167.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="assets/images/govuk-apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" href="assets/images/govuk-apple-touch-icon.png">
+    <meta property="og:image" content="assets/govuk-opengraph-image.png">
+    <link rel="stylesheet" media="all" href="stylesheets/govuk-frontend-3.13.1.min.css">
+  </head>
+  <body class="govuk-template__body">
+    <header class="govuk-header govuk-!-display-none-print app-header--production app-header--full-border app-header--wide-logo" role="banner" data-module="govuk-header">
+      <div class="govuk-header__container govuk-width-container">
+        <div class="govuk-header__logo">
+          <a class="govuk-header__link govuk-header__link--homepage" href="https://www.gov.uk/">
+            <span class="govuk-header__logotype">
+              <svg
+              focusable="false"
+              role="img"
+              class="govuk-header__logotype"
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 148 30"
+              height="30"
+              width="148"
+              aria-label="GOV.UK"
+            >
+              <title>GOV.UK</title>
+              <path d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8m28.3-11.6c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H55v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zM71.5 6.8c1.5 0 2.9.3 4.2.8 1.2.6 2.3 1.3 3.1 2.3.9 1 1.5 2.1 2 3.4s.7 2.7.7 4.2-.2 2.9-.7 4.2c-.4 1.3-1.1 2.4-2 3.4-.9 1-1.9 1.7-3.1 2.3-1.2.6-2.6.8-4.2.8s-2.9-.3-4.2-.8c-1.2-.6-2.3-1.3-3.1-2.3-.9-1-1.5-2.1-2-3.4-.4-1.3-.7-2.7-.7-4.2s.2-2.9.7-4.2c.4-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.5 2.6-.8 4.2-.8zm0 17.6c.9 0 1.7-.2 2.4-.5s1.3-.8 1.7-1.4c.5-.6.8-1.3 1.1-2.2.2-.8.4-1.7.4-2.7v-.1c0-1-.1-1.9-.4-2.7-.2-.8-.6-1.6-1.1-2.2-.5-.6-1.1-1.1-1.7-1.4-.7-.3-1.5-.5-2.4-.5s-1.7.2-2.4.5-1.3.8-1.7 1.4c-.5.6-.8 1.3-1.1 2.2-.2.8-.4 1.7-.4 2.7v.1c0 1 .1 1.9.4 2.7.2.8.6 1.6 1.1 2.2.5.6 1.1 1.1 1.7 1.4.6.3 1.4.5 2.4.5zM88.9 28 83 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L148 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
+            </svg>
+              <span class="govuk-header__logotype-text">GOV.UK</span>
+            </span>
+          </a>
+        </div>
+        <div class="govuk-header__product-name">
+          Apply for teacher training
+        </div>
+      </div>
+    </header>
+    <div class="govuk-width-container">
+      <main class="govuk-main-wrapper" id="main-content" role="main">
+        <div class="govuk-grid-row">
+          <div class="govuk-grid-column-two-thirds">
+            <h1 class="govuk-heading-l">This service is currently unavailable</h1>
+            <p class="govuk-body">We're sorry the service is not available right now.</p>
+            <p class="govuk-body">Try again later.</p>
+            <p class="govuk-body">If you reached this page after submitting information then it has not been saved. You will need to enter it again when the service is available.</p>
+            <p class="govuk-body">If you have any questions, email us at<br>
+            <a class="govuk-link" href="mailto:[email protected]">[email protected]</a>.</p>
+          </div>
+        </div>
+      </main>
+    </div>
+    <footer class="govuk-footer govuk-!-display-none-print" role="contentinfo">
+      <div class="govuk-width-container">
+        <div class="govuk-footer__meta">
+          <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+            <h2 class="govuk-heading-m">Get help</h2>
+            <div class="govuk-grid-row govuk-!-margin-bottom-5">
+              <div class=" govuk-grid-column-one-half">
+                <h2 class="govuk-heading-s govuk-!-margin-bottom-1">Email</h2>
+                <ul class="govuk-footer__meta-custom govuk-list govuk-!-font-size-16">
+                  <li><a class="govuk-footer__link" href=" mailto:[email protected]">[email protected]</a> </li>
+                  <li>You will get a response within 5 working days, or one working day for urgent requests.</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+          <div class="govuk-footer__meta-item">
+            <a class="govuk-footer__link govuk-footer__copyright-logo govuk-!-margin-bottom-1" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
+          </div>
+        </div>
+      </div>
+    </footer>
+  </body>
+</html>
diff --git a/maintenance_page/html/javascript/govuk-frontend-3.13.1.min.js b/maintenance_page/html/javascript/govuk-frontend-3.13.1.min.js
diff --git a/maintenance_page/html/stylesheets/govuk-frontend-3.13.1.min.css b/maintenance_page/html/stylesheets/govuk-frontend-3.13.1.min.css
diff --git a/maintenance_page/html/stylesheets/govuk-frontend-ie8-3.13.1.min.css b/maintenance_page/html/stylesheets/govuk-frontend-ie8-3.13.1.min.css
diff --git a/maintenance_page/manifests/maintenance/deployment_maintenance.yml.tmpl b/maintenance_page/manifests/maintenance/deployment_maintenance.yml.tmpl
@@ -0,0 +1,31 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: apply-maintenance
+  labels:
+    app: apply-maintenance
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: apply-maintenance
+  template:
+    metadata:
+      labels:
+        app: apply-maintenance
+    spec:
+      nodeSelector:
+        teacherservices.cloud/node_pool: applications
+        kubernetes.io/os: linux
+      containers:
+      - name: apply-maintenance
+        image: ghcr.io/dfe-digital/apply-maintenance:#MAINTENANCE_IMAGE_TAG#
+        ports:
+        - containerPort: 80
+        resources:
+          requests:
+            memory: 64M
+            cpu: 0.1
+          limits:
+            memory: 64M
+            cpu: 1
diff --git a/maintenance_page/manifests/maintenance/service_maintenance.yml b/maintenance_page/manifests/maintenance/service_maintenance.yml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: apply-maintenance
+spec:
+  selector:
+    app: apply-maintenance
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
diff --git a/maintenance_page/manifests/production_aks/ingress_external_to_main.yml b/maintenance_page/manifests/production_aks/ingress_external_to_main.yml
@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: www.apply-for-teacher-training.service.gov.uk
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: www.apply-for-teacher-training.service.gov.uk
+    http:
+      paths:
+      - pathType: ImplementationSpecific
+        backend:
+          service:
+            name: apply-production
+            port:
+              number: 80
diff --git a/maintenance_page/manifests/production_aks/ingress_external_to_maintenance.yml b/maintenance_page/manifests/production_aks/ingress_external_to_maintenance.yml
@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: www.apply-for-teacher-training.service.gov.uk
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: www.apply-for-teacher-training.service.gov.uk
+    http:
+      paths:
+      - pathType: ImplementationSpecific
+        backend:
+          service:
+            name: apply-maintenance
+            port:
+              number: 80
diff --git a/maintenance_page/manifests/production_aks/ingress_internal_to_main.yml b/maintenance_page/manifests/production_aks/ingress_internal_to_main.yml
@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: apply-production.teacherservices.cloud
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: apply-production.teacherservices.cloud
+    http:
+      paths:
+      - pathType: ImplementationSpecific
+        backend:
+          service:
+            name: apply-production
+            port:
+              number: 80
diff --git a/maintenance_page/manifests/production_aks/ingress_internal_to_maintenance.yml b/maintenance_page/manifests/production_aks/ingress_internal_to_maintenance.yml
@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: apply-production.teacherservices.cloud
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: apply-production.teacherservices.cloud
+    http:
+      paths:
+      - pathType: ImplementationSpecific
+        backend:
+          service:
+            name: apply-maintenance
+            port:
+              number: 80
diff --git a/maintenance_page/manifests/production_aks/ingress_maintenance.yml b/maintenance_page/manifests/production_aks/ingress_maintenance.yml
@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: apply-maintenance.teacherservices.cloud
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: apply-maintenance.teacherservices.cloud
+    http:
+      paths:
+      - pathType: ImplementationSpecific
+        backend:
+          service:
+            name: apply-maintenance
+            port:
+              number: 80
Original file line number	Diff line number	Diff line change
Expand Up		@@ -87,3 +87,5 @@ bin/konduit.sh
		ministerial-report-applications*.txt

		.cftoken

		maintenance_page/manifests/maintenance/deployment_maintenance.yml