From 275d697e01bb9b5f2b4189cd24cab4f0b498aa12 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 15 Apr 2024 11:42:30 +0100 Subject: Move forms to new namespace --- .../namespaces/default/forms/backend/README.md | 20 ----------------- .../namespaces/default/forms/backend/ingress.yaml | 24 -------------------- .../namespaces/default/forms/backend/secrets.yaml | Bin 832 -> 0 bytes .../namespaces/default/forms/backend/service.yaml | 11 --------- .../namespaces/forms/forms-backend/README.md | 20 +++++++++++++++++ .../namespaces/forms/forms-backend/ingress.yaml | 25 +++++++++++++++++++++ .../namespaces/forms/forms-backend/secrets.yaml | Bin 0 -> 851 bytes .../namespaces/forms/forms-backend/service.yaml | 12 ++++++++++ 8 files changed, 57 insertions(+), 55 deletions(-) delete mode 100644 kubernetes/namespaces/default/forms/backend/README.md delete mode 100644 kubernetes/namespaces/default/forms/backend/ingress.yaml delete mode 100644 kubernetes/namespaces/default/forms/backend/secrets.yaml delete mode 100644 kubernetes/namespaces/default/forms/backend/service.yaml create mode 100644 kubernetes/namespaces/forms/forms-backend/README.md create mode 100644 kubernetes/namespaces/forms/forms-backend/ingress.yaml create mode 100644 kubernetes/namespaces/forms/forms-backend/secrets.yaml create mode 100644 kubernetes/namespaces/forms/forms-backend/service.yaml (limited to 'kubernetes/namespaces') diff --git a/kubernetes/namespaces/default/forms/backend/README.md b/kubernetes/namespaces/default/forms/backend/README.md deleted file mode 100644 index 06fed13..0000000 --- a/kubernetes/namespaces/default/forms/backend/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Forms Backend - -Forms backend is our surveyance system for putting out forms in our community. - -This directory contains the necessary routing manifests, the deployment is located in the [python-discord/forms-backend](https://github.com/python-discord/forms-backend) repository. - -This deployment expects a number of secrets and environment variables to exist in a secret called `forms-backend-env`. - -| Environment | Description | -|----------------------|-----------------------------------------------------------------| -| DATABASE_URL | A MongoDB database url | -| DISCORD_BOT_TOKEN | The bot token to connect to Discord's API with | -| DOCS_PASSWORD | The password required to access the auto-generated API docs | -| HCAPTCHA_API_SECRET | The API key to HCAPTCHA's API | -| OAUTH2_CLIENT_ID | The Discord app OAuth2 client id | -| OAUTH2_CLIENT_SECRET | The Discord app OAuth2 client secret | -| PRODUCTION | Whether the app is in production true/false | -| SECRET_KEY | The key to sign all JWTs with | -| SNEKBOX_URL | The URL to the senkbox service to use for code form submissions | -| FORMS_BACKEND_DSN | The sentry DSN to send sentry events to | diff --git a/kubernetes/namespaces/default/forms/backend/ingress.yaml b/kubernetes/namespaces/default/forms/backend/ingress.yaml deleted file mode 100644 index 1967ab4..0000000 --- a/kubernetes/namespaces/default/forms/backend/ingress.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" - nginx.ingress.kubernetes.io/auth-tls-secret: "kube-system/mtls-client-crt-bundle" - nginx.ingress.kubernetes.io/auth-tls-error-page: "https://www.youtube.com/watch?v=dQw4w9WgXcQ" - name: forms-backend -spec: - tls: - - hosts: - - "*.pythondiscord.com" - secretName: pythondiscord.com-tls - rules: - - host: forms-api.pythondiscord.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: forms-backend - port: - number: 80 diff --git a/kubernetes/namespaces/default/forms/backend/secrets.yaml b/kubernetes/namespaces/default/forms/backend/secrets.yaml deleted file mode 100644 index 8977e99..0000000 Binary files a/kubernetes/namespaces/default/forms/backend/secrets.yaml and /dev/null differ diff --git a/kubernetes/namespaces/default/forms/backend/service.yaml b/kubernetes/namespaces/default/forms/backend/service.yaml deleted file mode 100644 index 6e11796..0000000 --- a/kubernetes/namespaces/default/forms/backend/service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: forms-backend -spec: - selector: - app: forms-backend - ports: - - protocol: TCP - port: 80 - targetPort: 8000 diff --git a/kubernetes/namespaces/forms/forms-backend/README.md b/kubernetes/namespaces/forms/forms-backend/README.md new file mode 100644 index 0000000..06fed13 --- /dev/null +++ b/kubernetes/namespaces/forms/forms-backend/README.md @@ -0,0 +1,20 @@ +# Forms Backend + +Forms backend is our surveyance system for putting out forms in our community. + +This directory contains the necessary routing manifests, the deployment is located in the [python-discord/forms-backend](https://github.com/python-discord/forms-backend) repository. + +This deployment expects a number of secrets and environment variables to exist in a secret called `forms-backend-env`. + +| Environment | Description | +|----------------------|-----------------------------------------------------------------| +| DATABASE_URL | A MongoDB database url | +| DISCORD_BOT_TOKEN | The bot token to connect to Discord's API with | +| DOCS_PASSWORD | The password required to access the auto-generated API docs | +| HCAPTCHA_API_SECRET | The API key to HCAPTCHA's API | +| OAUTH2_CLIENT_ID | The Discord app OAuth2 client id | +| OAUTH2_CLIENT_SECRET | The Discord app OAuth2 client secret | +| PRODUCTION | Whether the app is in production true/false | +| SECRET_KEY | The key to sign all JWTs with | +| SNEKBOX_URL | The URL to the senkbox service to use for code form submissions | +| FORMS_BACKEND_DSN | The sentry DSN to send sentry events to | diff --git a/kubernetes/namespaces/forms/forms-backend/ingress.yaml b/kubernetes/namespaces/forms/forms-backend/ingress.yaml new file mode 100644 index 0000000..0fc9fb5 --- /dev/null +++ b/kubernetes/namespaces/forms/forms-backend/ingress.yaml @@ -0,0 +1,25 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" + nginx.ingress.kubernetes.io/auth-tls-secret: "kube-system/mtls-client-crt-bundle" + nginx.ingress.kubernetes.io/auth-tls-error-page: "https://www.youtube.com/watch?v=dQw4w9WgXcQ" + name: forms-backend + namespace: forms +spec: + tls: + - hosts: + - "*.pythondiscord.com" + secretName: pythondiscord.com-tls + rules: + - host: forms-api.pythondiscord.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: forms-backend + port: + number: 80 diff --git a/kubernetes/namespaces/forms/forms-backend/secrets.yaml b/kubernetes/namespaces/forms/forms-backend/secrets.yaml new file mode 100644 index 0000000..da828d3 Binary files /dev/null and b/kubernetes/namespaces/forms/forms-backend/secrets.yaml differ diff --git a/kubernetes/namespaces/forms/forms-backend/service.yaml b/kubernetes/namespaces/forms/forms-backend/service.yaml new file mode 100644 index 0000000..7e8dd0c --- /dev/null +++ b/kubernetes/namespaces/forms/forms-backend/service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: forms-backend + namespace: forms +spec: + selector: + app: forms-backend + ports: + - protocol: TCP + port: 80 + targetPort: 8000 -- cgit v1.2.3