From 27f097c8724b210abb566f83f8bdde6cc6b57e23 Mon Sep 17 00:00:00 2001 From: FrozenHart Date: Mon, 25 May 2026 21:32:23 +0100 Subject: [PATCH 1/5] add: fine init for yamal deployment of the tts --- services/pulumi/niployments/index.ts | 1 - .../services/tts/common/backend.ts | 108 ------------------ .../services/tts/common/frontend.ts | 100 ---------------- .../pulumi/niployments/services/tts/index.ts | 2 - .../services/tts/production/index.ts | 102 ----------------- .../services/tts/production/middleware.ts | 48 -------- .../services/tts/production/namespace.ts | 8 -- .../services/tts/production/prefixer.ts | 3 - .../niployments/services/tts/staging/index.ts | 74 ------------ .../services/tts/staging/middleware.ts | 26 ----- .../services/tts/staging/namespace.ts | 8 -- .../services/tts/staging/prefixer.ts | 3 - services/tts/deploy.sh | 13 +++ services/tts/production/00-namespace.yaml | 5 + services/tts/production/01-deployment.yaml | 91 +++++++++++++++ services/tts/production/02-certificates.yaml | 12 ++ .../tts/production/03-ingress-routes.yaml | 65 +++++++++++ services/tts/staging/00-namespace.yaml | 5 + services/tts/staging/01-deployment.yaml | 91 +++++++++++++++ services/tts/staging/02-certificates.yaml | 12 ++ services/tts/staging/03-ingress-routes.yaml | 35 ++++++ 21 files changed, 329 insertions(+), 483 deletions(-) delete mode 100644 services/pulumi/niployments/services/tts/common/backend.ts delete mode 100644 services/pulumi/niployments/services/tts/common/frontend.ts delete mode 100644 services/pulumi/niployments/services/tts/index.ts delete mode 100644 services/pulumi/niployments/services/tts/production/index.ts delete mode 100644 services/pulumi/niployments/services/tts/production/middleware.ts delete mode 100644 services/pulumi/niployments/services/tts/production/namespace.ts delete mode 100644 services/pulumi/niployments/services/tts/production/prefixer.ts delete mode 100644 services/pulumi/niployments/services/tts/staging/index.ts delete mode 100644 services/pulumi/niployments/services/tts/staging/middleware.ts delete mode 100644 services/pulumi/niployments/services/tts/staging/namespace.ts delete mode 100644 services/pulumi/niployments/services/tts/staging/prefixer.ts create mode 100644 services/tts/deploy.sh create mode 100644 services/tts/production/00-namespace.yaml create mode 100644 services/tts/production/01-deployment.yaml create mode 100644 services/tts/production/02-certificates.yaml create mode 100644 services/tts/production/03-ingress-routes.yaml create mode 100644 services/tts/staging/00-namespace.yaml create mode 100644 services/tts/staging/01-deployment.yaml create mode 100644 services/tts/staging/02-certificates.yaml create mode 100644 services/tts/staging/03-ingress-routes.yaml diff --git a/services/pulumi/niployments/index.ts b/services/pulumi/niployments/index.ts index 191e9e3c..f661cfb4 100644 --- a/services/pulumi/niployments/index.ts +++ b/services/pulumi/niployments/index.ts @@ -1,6 +1,5 @@ // ementas is an example pulumi service // import "./services/ementas/index.js"; -import "./services/tts/index.js"; import "./resources/nfs-provisioner/charts.js"; import "./resources/keel/charts.js"; diff --git a/services/pulumi/niployments/services/tts/common/backend.ts b/services/pulumi/niployments/services/tts/common/backend.ts deleted file mode 100644 index df07edfc..00000000 --- a/services/pulumi/niployments/services/tts/common/backend.ts +++ /dev/null @@ -1,108 +0,0 @@ -import * as pulumi from "@pulumi/pulumi"; -import * as k8s from "@pulumi/kubernetes"; -import { Prefixer } from "#utils/prefixer.js"; - -export class TTSBackend extends pulumi.ComponentResource { - public readonly name: pulumi.Output; - public readonly port = pulumi.output(80); - - constructor( - name: string, - args: { - namespace: pulumi.Input; - branch: pulumi.Input<"main" | "develop">; - envSecretRef: pulumi.Input; - }, - opts?: pulumi.ComponentResourceOptions, - ) { - super("niployments:tts:TTSBackend", name, opts); - - const prefixer = new Prefixer(name); - - const backendLabels = { app: "tts-backend" }; - const backendPort = 8000; - - const deployment = new k8s.apps.v1.Deployment( - prefixer.deployment(), - { - metadata: { - namespace: args.namespace, - annotations: { - "keel.sh/policy": "force", - "keel.sh/match-tag": "true", - }, - }, - spec: { - replicas: 1, - selector: { - matchLabels: backendLabels, - }, - template: { - metadata: { - labels: backendLabels, - }, - spec: { - containers: [ - { - name: "tts-be", - image: pulumi.interpolate`registry.niaefeup.pt/niaefeup/tts-be:${args.branch}`, - imagePullPolicy: "Always", - resources: { - limits: { - memory: "128Mi", - cpu: "500m", - }, - }, - ports: [ - { - containerPort: backendPort, - }, - ], - envFrom: [ - { - secretRef: { - name: args.envSecretRef, - }, - }, - ], - }, - ], - imagePullSecrets: [ - { - name: "harbor-pull-secret", - }, - ], - }, - }, - }, - }, - { parent: this }, - ); - - const service = new k8s.core.v1.Service( - prefixer.service(), - { - metadata: { - namespace: args.namespace, - }, - spec: { - ports: [ - { - port: this.port, - targetPort: backendPort, - }, - ], - selector: backendLabels, - }, - }, - { parent: this, dependsOn: [deployment] }, - ); - - this.name = service.metadata.name; - - this.registerOutputs({ - serviceName: this.name, - servicePort: this.port, - }); - } -} diff --git a/services/pulumi/niployments/services/tts/common/frontend.ts b/services/pulumi/niployments/services/tts/common/frontend.ts deleted file mode 100644 index 79593305..00000000 --- a/services/pulumi/niployments/services/tts/common/frontend.ts +++ /dev/null @@ -1,100 +0,0 @@ -import * as pulumi from "@pulumi/pulumi"; -import * as k8s from "@pulumi/kubernetes"; -import { Prefixer } from "#utils/prefixer.js"; - -export class TTSFrontend extends pulumi.ComponentResource { - public readonly name: pulumi.Output; - public readonly port = pulumi.output(80); - - constructor( - name: string, - args: { - namespace: pulumi.Input; - branch: pulumi.Input<"main" | "develop">; - }, - opts?: pulumi.ComponentResourceOptions, - ) { - super("niployments:tts:TTSFrontend", name, opts); - - const prefixer = new Prefixer(name); - - const frontendLabels = { app: "tts-frontend" }; - const frontendPort = 80; - - const deployment = new k8s.apps.v1.Deployment( - prefixer.deployment(), - { - metadata: { - namespace: args.namespace, - annotations: { - "keel.sh/policy": "force", - "keel.sh/match-tag": "true", - }, - }, - spec: { - replicas: 1, - selector: { - matchLabels: frontendLabels, - }, - template: { - metadata: { - labels: frontendLabels, - }, - spec: { - containers: [ - { - name: "tts-fe", - image: pulumi.interpolate`registry.niaefeup.pt/niaefeup/tts-fe:${args.branch}`, - imagePullPolicy: "Always", - resources: { - limits: { - memory: "128Mi", - cpu: "500m", - }, - }, - ports: [ - { - containerPort: frontendPort, - }, - ], - }, - ], - imagePullSecrets: [ - { - name: "harbor-pull-secret", - }, - ], - }, - }, - }, - }, - { parent: this }, - ); - - const service = new k8s.core.v1.Service( - prefixer.service(), - { - metadata: { - namespace: args.namespace, - }, - spec: { - ports: [ - { - port: this.port, - targetPort: frontendPort, - }, - ], - selector: frontendLabels, - }, - }, - { parent: this, dependsOn: [deployment] }, - ); - - this.name = service.metadata.name; - - this.registerOutputs({ - serviceName: this.name, - servicePort: this.port, - }); - } -} diff --git a/services/pulumi/niployments/services/tts/index.ts b/services/pulumi/niployments/services/tts/index.ts deleted file mode 100644 index 19fd91b6..00000000 --- a/services/pulumi/niployments/services/tts/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -import "./production/index.js"; -import "./staging/index.js"; diff --git a/services/pulumi/niployments/services/tts/production/index.ts b/services/pulumi/niployments/services/tts/production/index.ts deleted file mode 100644 index 93c78d96..00000000 --- a/services/pulumi/niployments/services/tts/production/index.ts +++ /dev/null @@ -1,102 +0,0 @@ -import * as pulumi from "@pulumi/pulumi"; -import * as crds from "@pulumi/crds"; -import { TTSFrontend } from "../common/frontend.js"; -import { TTSBackend } from "../common/backend.js"; -import { redirectToPrimaryAddress, stripApiPrefix } from "./middleware.js"; -import { prefixer } from "./prefixer.js"; -import { namespace } from "./namespace.js"; - -const branch = "main"; -const primaryHost = "tts.niaefeup.pt"; - -const config = new pulumi.Config("tts-production"); - -const frontend = new TTSFrontend(prefixer.create("frontend"), { - namespace: namespace.metadata.name, - branch, -}); - -const frontendService = { name: frontend.name, port: frontend.port }; - -const backend = new TTSBackend(prefixer.create("backend"), { - namespace: namespace.metadata.name, - branch, - envSecretRef: config.require("envSecretRef"), -}); - -const backendService = { name: backend.name, port: backend.port }; - -const certificateSecretName = prefixer.create("certificate-secret"); -const certificate = new crds.cert_manager.v1.Certificate( - prefixer.certificate(), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - secretName: certificateSecretName, - issuerRef: { - name: "letsencrypt-production", - kind: "ClusterIssuer", - }, - dnsNames: [primaryHost], - }, - }, -); - -new crds.traefik.v1alpha1.IngressRoute( - prefixer.chain("primary").ingressRoute(), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - entryPoints: ["websecure"], - routes: [ - { - kind: "Rule", - match: `Host(\`${primaryHost}\`) && PathPrefix(\`/api\`)`, - services: [backendService], - middlewares: [stripApiPrefix], - }, - { - kind: "Rule", - match: `Host(\`${primaryHost}\`)`, - services: [frontendService], - }, - ], - tls: { - secretName: certificateSecretName, - }, - }, - }, - { dependsOn: [certificate] }, -); - -new crds.traefik.v1alpha1.IngressRoute( - prefixer.chain("secondary").ingressRoute(), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - entryPoints: ["websecure"], - routes: [ - { - kind: "Rule", - match: `Host(\`ni.fe.up.pt\`) && PathPrefix(\`/tts\`)`, - middlewares: [redirectToPrimaryAddress], - services: [ - { - kind: "TraefikService", - name: "noop@internal", - }, - ], - }, - ], - tls: { - secretName: "website-cert", - }, - }, - }, -); diff --git a/services/pulumi/niployments/services/tts/production/middleware.ts b/services/pulumi/niployments/services/tts/production/middleware.ts deleted file mode 100644 index c07f6cc5..00000000 --- a/services/pulumi/niployments/services/tts/production/middleware.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { namespace } from "./namespace.js"; -import { prefixer } from "./prefixer.js"; -import * as pulumi from "@pulumi/pulumi"; -import * as crds from "@pulumi/crds"; -import { ensureOutputIsDefined } from "#utils/pulumi.js"; - -const stripApiPrefixMiddleware = new crds.traefik.v1alpha1.Middleware( - prefixer.create("strip-api-prefix"), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - stripPrefix: { - prefixes: ["/api"], - forceSlash: false, - }, - }, - }, -); - -export const stripApiPrefix = { - name: pulumi.output( - ensureOutputIsDefined(stripApiPrefixMiddleware.metadata.name), - ), -}; - -const redirectToPrimaryAddressMiddleware = new crds.traefik.v1alpha1.Middleware( - prefixer.create("redirect-to-primary-address"), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - redirectRegex: { - regex: "^https://ni.fe.up.pt/tts/?(.*)", - replacement: "https://tts.niaefeup.pt/$1", - permanent: false, - }, - }, - }, -); - -export const redirectToPrimaryAddress = { - name: pulumi.output( - ensureOutputIsDefined(redirectToPrimaryAddressMiddleware.metadata.name), - ), -}; diff --git a/services/pulumi/niployments/services/tts/production/namespace.ts b/services/pulumi/niployments/services/tts/production/namespace.ts deleted file mode 100644 index 14e84bab..00000000 --- a/services/pulumi/niployments/services/tts/production/namespace.ts +++ /dev/null @@ -1,8 +0,0 @@ -import * as k8s from "@pulumi/kubernetes"; -import { prefixer } from "./prefixer.js"; - -export const namespace = new k8s.core.v1.Namespace(prefixer.namespace(), { - metadata: { - name: prefixer.base(), - }, -}); diff --git a/services/pulumi/niployments/services/tts/production/prefixer.ts b/services/pulumi/niployments/services/tts/production/prefixer.ts deleted file mode 100644 index d9c0e3d9..00000000 --- a/services/pulumi/niployments/services/tts/production/prefixer.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { Prefixer } from "#utils/prefixer.js"; - -export const prefixer = new Prefixer("tts"); diff --git a/services/pulumi/niployments/services/tts/staging/index.ts b/services/pulumi/niployments/services/tts/staging/index.ts deleted file mode 100644 index 3f0a9955..00000000 --- a/services/pulumi/niployments/services/tts/staging/index.ts +++ /dev/null @@ -1,74 +0,0 @@ -import * as pulumi from "@pulumi/pulumi"; -import * as crds from "@pulumi/crds"; -import { TTSFrontend } from "../common/frontend.js"; -import { TTSBackend } from "../common/backend.js"; -import { stripApiPrefix } from "./middleware.js"; -import { prefixer } from "./prefixer.js"; -import { namespace } from "./namespace.js"; - -const branch = "develop"; -const primaryHost = "tts-staging.niaefeup.pt"; - -const config = new pulumi.Config("tts-staging"); - -const frontend = new TTSFrontend(prefixer.create("frontend"), { - namespace: namespace.metadata.name, - branch, -}); - -const frontendService = { name: frontend.name, port: frontend.port }; - -const backend = new TTSBackend(prefixer.create("backend"), { - namespace: namespace.metadata.name, - branch, - envSecretRef: config.require("envSecretRef"), -}); - -const backendService = { name: backend.name, port: backend.port }; - -const certificateSecretName = prefixer.create("certificate-secret"); -const certificate = new crds.cert_manager.v1.Certificate( - prefixer.certificate(), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - secretName: certificateSecretName, - issuerRef: { - name: "letsencrypt-production", - kind: "ClusterIssuer", - }, - dnsNames: [primaryHost], - }, - }, -); - -new crds.traefik.v1alpha1.IngressRoute( - prefixer.ingressRoute(), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - entryPoints: ["websecure"], - routes: [ - { - kind: "Rule", - match: `Host(\`${primaryHost}\`) && PathPrefix(\`/api\`)`, - services: [backendService], - middlewares: [stripApiPrefix], - }, - { - kind: "Rule", - match: `Host(\`${primaryHost}\`)`, - services: [frontendService], - }, - ], - tls: { - secretName: certificateSecretName, - }, - }, - }, - { dependsOn: [certificate] }, -); diff --git a/services/pulumi/niployments/services/tts/staging/middleware.ts b/services/pulumi/niployments/services/tts/staging/middleware.ts deleted file mode 100644 index 65dd75d7..00000000 --- a/services/pulumi/niployments/services/tts/staging/middleware.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { namespace } from "./namespace.js"; -import { prefixer } from "./prefixer.js"; -import * as pulumi from "@pulumi/pulumi"; -import * as crds from "@pulumi/crds"; -import { ensureOutputIsDefined } from "#utils/pulumi.js"; - -const stripApiPrefixMiddleware = new crds.traefik.v1alpha1.Middleware( - prefixer.create("strip-api-prefix"), - { - metadata: { - namespace: namespace.metadata.name, - }, - spec: { - stripPrefix: { - prefixes: ["/api"], - forceSlash: false, - }, - }, - }, -); - -export const stripApiPrefix = { - name: pulumi.output( - ensureOutputIsDefined(stripApiPrefixMiddleware.metadata.name), - ), -}; diff --git a/services/pulumi/niployments/services/tts/staging/namespace.ts b/services/pulumi/niployments/services/tts/staging/namespace.ts deleted file mode 100644 index 14e84bab..00000000 --- a/services/pulumi/niployments/services/tts/staging/namespace.ts +++ /dev/null @@ -1,8 +0,0 @@ -import * as k8s from "@pulumi/kubernetes"; -import { prefixer } from "./prefixer.js"; - -export const namespace = new k8s.core.v1.Namespace(prefixer.namespace(), { - metadata: { - name: prefixer.base(), - }, -}); diff --git a/services/pulumi/niployments/services/tts/staging/prefixer.ts b/services/pulumi/niployments/services/tts/staging/prefixer.ts deleted file mode 100644 index cee550ea..00000000 --- a/services/pulumi/niployments/services/tts/staging/prefixer.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { Prefixer } from "#utils/prefixer.js"; - -export const prefixer = new Prefixer("tts-staging"); diff --git a/services/tts/deploy.sh b/services/tts/deploy.sh new file mode 100644 index 00000000..81e397a2 --- /dev/null +++ b/services/tts/deploy.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# Deploy TTS to Kubernetes cluster +kubectl apply -f $(dirname $0)/production/00-namespace.yaml +kubectl apply -f $(dirname $0)/production/01-deployment.yaml +kubectl apply -f $(dirname $0)/production/02-certificates.yaml +kubectl apply -f $(dirname $0)/production/03-ingress-routes.yaml + +# Deploy TTS to staging environment +kubectl apply -f $(dirname $0)/staging/00-namespace.yaml +kubectl apply -f $(dirname $0)/staging/01-deployment.yaml +kubectl apply -f $(dirname $0)/staging/02-certificates.yaml +kubectl apply -f $(dirname $0)/staging/03-ingress-routes.yaml diff --git a/services/tts/production/00-namespace.yaml b/services/tts/production/00-namespace.yaml new file mode 100644 index 00000000..c18c0dc8 --- /dev/null +++ b/services/tts/production/00-namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: tts diff --git a/services/tts/production/01-deployment.yaml b/services/tts/production/01-deployment.yaml new file mode 100644 index 00000000..2ea073f9 --- /dev/null +++ b/services/tts/production/01-deployment.yaml @@ -0,0 +1,91 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tts-frontend-deployment + namespace: tts + annotations: + keel.sh/policy: "force" + keel.sh/match-tag: "true" +spec: + replicas: 1 + selector: + matchLabels: + app: tts-frontend + template: + metadata: + labels: + app: tts-frontend + spec: + containers: + - name: tts-fe + image: registry.niaefeup.pt/niaefeup/tts-fe:main + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 80 + imagePullSecrets: + - name: harbor-pull-secret +--- +apiVersion: v1 +kind: Service +metadata: + name: tts-frontend-service + namespace: tts +spec: + selector: + app: tts-frontend + ports: + - port: 80 + targetPort: 80 + type: "ClusterIP" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tts-backend-deployment + namespace: tts + annotations: + keel.sh/policy: "force" + keel.sh/match-tag: "true" +spec: + replicas: 1 + selector: + matchLabels: + app: tts-backend + template: + metadata: + labels: + app: tts-backend + spec: + containers: + - name: tts-be + image: registry.niaefeup.pt/niaefeup/tts-be:main + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 8000 + envFrom: + - secretRef: + name: + imagePullSecrets: + - name: harbor-pull-secret +--- +apiVersion: v1 +kind: Service +metadata: + name: tts-backend-service + namespace: tts +spec: + selector: + app: tts-backend + ports: + - port: 80 + targetPort: 8000 + type: "ClusterIP" diff --git a/services/tts/production/02-certificates.yaml b/services/tts/production/02-certificates.yaml new file mode 100644 index 00000000..3dc6c331 --- /dev/null +++ b/services/tts/production/02-certificates.yaml @@ -0,0 +1,12 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: tts-certificate + namespace: tts +spec: + secretName: tts-certificate-secret + issuerRef: + name: letsencrypt-production + kind: ClusterIssuer + dnsNames: + - tts.niaefeup.pt diff --git a/services/tts/production/03-ingress-routes.yaml b/services/tts/production/03-ingress-routes.yaml new file mode 100644 index 00000000..14ef68df --- /dev/null +++ b/services/tts/production/03-ingress-routes.yaml @@ -0,0 +1,65 @@ +--- +apiVersion: traefik.io/v1alpha1 +kind: Middleware +metadata: + name: tts-strip-api-prefix + namespace: tts +spec: + stripPrefix: + prefixes: + - /api + forceSlash: false +--- +apiVersion: traefik.io/v1alpha1 +kind: Middleware +metadata: + name: tts-redirect-to-primary + namespace: tts +spec: + redirectRegex: + regex: "^https://ni.fe.up.pt/tts/?(.*)" + replacement: "https://tts.niaefeup.pt/$1" + permanent: false +--- +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: tts-primary-ingress-route + namespace: tts +spec: + entryPoints: + - websecure + routes: + - match: Host(`tts.niaefeup.pt`) && PathPrefix(`/api`) + kind: Rule + services: + - name: tts-backend-service + port: 80 + middlewares: + - name: tts-strip-api-prefix + - match: Host(`tts.niaefeup.pt`) + kind: Rule + services: + - name: tts-frontend-service + port: 80 + tls: + secretName: tts-certificate-secret +--- +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: tts-secondary-ingress-route + namespace: tts +spec: + entryPoints: + - websecure + routes: + - match: Host(`ni.fe.up.pt`) && PathPrefix(`/tts`) + kind: Rule + middlewares: + - name: tts-redirect-to-primary + services: + - kind: TraefikService + name: noop@internal + tls: + secretName: website-cert diff --git a/services/tts/staging/00-namespace.yaml b/services/tts/staging/00-namespace.yaml new file mode 100644 index 00000000..6f3fbf89 --- /dev/null +++ b/services/tts/staging/00-namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: tts-staging diff --git a/services/tts/staging/01-deployment.yaml b/services/tts/staging/01-deployment.yaml new file mode 100644 index 00000000..cfda1539 --- /dev/null +++ b/services/tts/staging/01-deployment.yaml @@ -0,0 +1,91 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tts-staging-frontend-deployment + namespace: tts-staging + annotations: + keel.sh/policy: "force" + keel.sh/match-tag: "true" +spec: + replicas: 1 + selector: + matchLabels: + app: tts-frontend + template: + metadata: + labels: + app: tts-frontend + spec: + containers: + - name: tts-fe + image: registry.niaefeup.pt/niaefeup/tts-fe:develop + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 80 + imagePullSecrets: + - name: harbor-pull-secret +--- +apiVersion: v1 +kind: Service +metadata: + name: tts-staging-frontend-service + namespace: tts-staging +spec: + selector: + app: tts-frontend + ports: + - port: 80 + targetPort: 80 + type: "ClusterIP" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tts-staging-backend-deployment + namespace: tts-staging + annotations: + keel.sh/policy: "force" + keel.sh/match-tag: "true" +spec: + replicas: 1 + selector: + matchLabels: + app: tts-backend + template: + metadata: + labels: + app: tts-backend + spec: + containers: + - name: tts-be + image: registry.niaefeup.pt/niaefeup/tts-be:develop + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 8000 + envFrom: + - secretRef: + name: + imagePullSecrets: + - name: harbor-pull-secret +--- +apiVersion: v1 +kind: Service +metadata: + name: tts-staging-backend-service + namespace: tts-staging +spec: + selector: + app: tts-backend + ports: + - port: 80 + targetPort: 8000 + type: "ClusterIP" diff --git a/services/tts/staging/02-certificates.yaml b/services/tts/staging/02-certificates.yaml new file mode 100644 index 00000000..513940be --- /dev/null +++ b/services/tts/staging/02-certificates.yaml @@ -0,0 +1,12 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: tts-staging-certificate + namespace: tts-staging +spec: + secretName: tts-staging-certificate-secret + issuerRef: + name: letsencrypt-production + kind: ClusterIssuer + dnsNames: + - tts-staging.niaefeup.pt diff --git a/services/tts/staging/03-ingress-routes.yaml b/services/tts/staging/03-ingress-routes.yaml new file mode 100644 index 00000000..dee9da23 --- /dev/null +++ b/services/tts/staging/03-ingress-routes.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: traefik.io/v1alpha1 +kind: Middleware +metadata: + name: tts-staging-strip-api-prefix + namespace: tts-staging +spec: + stripPrefix: + prefixes: + - /api + forceSlash: false +--- +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: tts-staging-ingress-route + namespace: tts-staging +spec: + entryPoints: + - websecure + routes: + - match: Host(`tts-staging.niaefeup.pt`) && PathPrefix(`/api`) + kind: Rule + services: + - name: tts-staging-backend-service + port: 80 + middlewares: + - name: tts-staging-strip-api-prefix + - match: Host(`tts-staging.niaefeup.pt`) + kind: Rule + services: + - name: tts-staging-frontend-service + port: 80 + tls: + secretName: tts-staging-certificate-secret From 9fc57f81670362e507696207577823003544c156 Mon Sep 17 00:00:00 2001 From: FrozenHart Date: Wed, 10 Jun 2026 13:58:42 +0100 Subject: [PATCH 2/5] UPDATE: separated the deploy script one for staging and the other for prod --- services/tts/deploy-production.sh | 6 ++++++ services/tts/deploy-staging.sh | 6 ++++++ services/tts/deploy.sh | 13 ------------- 3 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 services/tts/deploy-production.sh create mode 100644 services/tts/deploy-staging.sh delete mode 100644 services/tts/deploy.sh diff --git a/services/tts/deploy-production.sh b/services/tts/deploy-production.sh new file mode 100644 index 00000000..8552be32 --- /dev/null +++ b/services/tts/deploy-production.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +kubectl apply -f $(dirname $0)/production/00-namespace.yaml +kubectl apply -f $(dirname $0)/production/01-deployment.yaml +kubectl apply -f $(dirname $0)/production/02-certificates.yaml +kubectl apply -f $(dirname $0)/production/03-ingress-routes.yaml diff --git a/services/tts/deploy-staging.sh b/services/tts/deploy-staging.sh new file mode 100644 index 00000000..d491377f --- /dev/null +++ b/services/tts/deploy-staging.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +kubectl apply -f $(dirname $0)/staging/00-namespace.yaml +kubectl apply -f $(dirname $0)/staging/01-deployment.yaml +kubectl apply -f $(dirname $0)/staging/02-certificates.yaml +kubectl apply -f $(dirname $0)/staging/03-ingress-routes.yaml diff --git a/services/tts/deploy.sh b/services/tts/deploy.sh deleted file mode 100644 index 81e397a2..00000000 --- a/services/tts/deploy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# Deploy TTS to Kubernetes cluster -kubectl apply -f $(dirname $0)/production/00-namespace.yaml -kubectl apply -f $(dirname $0)/production/01-deployment.yaml -kubectl apply -f $(dirname $0)/production/02-certificates.yaml -kubectl apply -f $(dirname $0)/production/03-ingress-routes.yaml - -# Deploy TTS to staging environment -kubectl apply -f $(dirname $0)/staging/00-namespace.yaml -kubectl apply -f $(dirname $0)/staging/01-deployment.yaml -kubectl apply -f $(dirname $0)/staging/02-certificates.yaml -kubectl apply -f $(dirname $0)/staging/03-ingress-routes.yaml From 08805f109a90de3695d2c6db9f11ed1b68057c70 Mon Sep 17 00:00:00 2001 From: FrozenHart Date: Wed, 10 Jun 2026 14:02:39 +0100 Subject: [PATCH 3/5] runed pritier and eslint --- services/tts/production/01-deployment.yaml | 54 +++++++++---------- .../tts/production/03-ingress-routes.yaml | 2 +- services/tts/staging/01-deployment.yaml | 54 +++++++++---------- services/tts/staging/03-ingress-routes.yaml | 2 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/services/tts/production/01-deployment.yaml b/services/tts/production/01-deployment.yaml index 2ea073f9..5a6fc6e5 100644 --- a/services/tts/production/01-deployment.yaml +++ b/services/tts/production/01-deployment.yaml @@ -18,17 +18,17 @@ spec: app: tts-frontend spec: containers: - - name: tts-fe - image: registry.niaefeup.pt/niaefeup/tts-fe:main - imagePullPolicy: Always - resources: - limits: - memory: "128Mi" - cpu: "500m" - ports: - - containerPort: 80 + - name: tts-fe + image: registry.niaefeup.pt/niaefeup/tts-fe:main + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 80 imagePullSecrets: - - name: harbor-pull-secret + - name: harbor-pull-secret --- apiVersion: v1 kind: Service @@ -39,8 +39,8 @@ spec: selector: app: tts-frontend ports: - - port: 80 - targetPort: 80 + - port: 80 + targetPort: 80 type: "ClusterIP" --- apiVersion: apps/v1 @@ -62,20 +62,20 @@ spec: app: tts-backend spec: containers: - - name: tts-be - image: registry.niaefeup.pt/niaefeup/tts-be:main - imagePullPolicy: Always - resources: - limits: - memory: "128Mi" - cpu: "500m" - ports: - - containerPort: 8000 - envFrom: - - secretRef: - name: + - name: tts-be + image: registry.niaefeup.pt/niaefeup/tts-be:main + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 8000 + envFrom: + - secretRef: + name: imagePullSecrets: - - name: harbor-pull-secret + - name: harbor-pull-secret --- apiVersion: v1 kind: Service @@ -86,6 +86,6 @@ spec: selector: app: tts-backend ports: - - port: 80 - targetPort: 8000 + - port: 80 + targetPort: 8000 type: "ClusterIP" diff --git a/services/tts/production/03-ingress-routes.yaml b/services/tts/production/03-ingress-routes.yaml index 14ef68df..c63b2b28 100644 --- a/services/tts/production/03-ingress-routes.yaml +++ b/services/tts/production/03-ingress-routes.yaml @@ -7,7 +7,7 @@ metadata: spec: stripPrefix: prefixes: - - /api + - /api forceSlash: false --- apiVersion: traefik.io/v1alpha1 diff --git a/services/tts/staging/01-deployment.yaml b/services/tts/staging/01-deployment.yaml index cfda1539..6dbedee3 100644 --- a/services/tts/staging/01-deployment.yaml +++ b/services/tts/staging/01-deployment.yaml @@ -18,17 +18,17 @@ spec: app: tts-frontend spec: containers: - - name: tts-fe - image: registry.niaefeup.pt/niaefeup/tts-fe:develop - imagePullPolicy: Always - resources: - limits: - memory: "128Mi" - cpu: "500m" - ports: - - containerPort: 80 + - name: tts-fe + image: registry.niaefeup.pt/niaefeup/tts-fe:develop + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 80 imagePullSecrets: - - name: harbor-pull-secret + - name: harbor-pull-secret --- apiVersion: v1 kind: Service @@ -39,8 +39,8 @@ spec: selector: app: tts-frontend ports: - - port: 80 - targetPort: 80 + - port: 80 + targetPort: 80 type: "ClusterIP" --- apiVersion: apps/v1 @@ -62,20 +62,20 @@ spec: app: tts-backend spec: containers: - - name: tts-be - image: registry.niaefeup.pt/niaefeup/tts-be:develop - imagePullPolicy: Always - resources: - limits: - memory: "128Mi" - cpu: "500m" - ports: - - containerPort: 8000 - envFrom: - - secretRef: - name: + - name: tts-be + image: registry.niaefeup.pt/niaefeup/tts-be:develop + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 8000 + envFrom: + - secretRef: + name: imagePullSecrets: - - name: harbor-pull-secret + - name: harbor-pull-secret --- apiVersion: v1 kind: Service @@ -86,6 +86,6 @@ spec: selector: app: tts-backend ports: - - port: 80 - targetPort: 8000 + - port: 80 + targetPort: 8000 type: "ClusterIP" diff --git a/services/tts/staging/03-ingress-routes.yaml b/services/tts/staging/03-ingress-routes.yaml index dee9da23..4c601281 100644 --- a/services/tts/staging/03-ingress-routes.yaml +++ b/services/tts/staging/03-ingress-routes.yaml @@ -7,7 +7,7 @@ metadata: spec: stripPrefix: prefixes: - - /api + - /api forceSlash: false --- apiVersion: traefik.io/v1alpha1 From 13c3653f33046ff1a5f8f08b6be1ef3d4a1c1b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lima?= Date: Fri, 9 Oct 2026 18:15:00 +0100 Subject: [PATCH 4/5] feat: create beta environment --- .../cluster-secret/01-harbor-pull-secret.yaml | 1 + .../databases/postgresql/cnpg-cluster.yaml | 6 ++ .../databases/postgresql/cnpg-secrets.yaml | 9 ++ services/tts/deploy-monorepo.sh | 6 ++ services/tts/monorepo/00-namespace.yaml | 5 + services/tts/monorepo/01-deployment.yaml | 91 +++++++++++++++++++ services/tts/monorepo/02-certificates.yaml | 12 +++ services/tts/monorepo/03-ingress-routes.yaml | 35 +++++++ 8 files changed, 165 insertions(+) create mode 100644 services/tts/deploy-monorepo.sh create mode 100644 services/tts/monorepo/00-namespace.yaml create mode 100644 services/tts/monorepo/01-deployment.yaml create mode 100644 services/tts/monorepo/02-certificates.yaml create mode 100644 services/tts/monorepo/03-ingress-routes.yaml diff --git a/services/cluster-secret/01-harbor-pull-secret.yaml b/services/cluster-secret/01-harbor-pull-secret.yaml index 985c0ce5..ae2d8c69 100644 --- a/services/cluster-secret/01-harbor-pull-secret.yaml +++ b/services/cluster-secret/01-harbor-pull-secret.yaml @@ -13,5 +13,6 @@ matchNamespace: - sinf-website - tts - tts-staging + - tts-beta data: .dockerconfigjson: diff --git a/services/databases/postgresql/cnpg-cluster.yaml b/services/databases/postgresql/cnpg-cluster.yaml index 205dd469..18818010 100644 --- a/services/databases/postgresql/cnpg-cluster.yaml +++ b/services/databases/postgresql/cnpg-cluster.yaml @@ -39,6 +39,12 @@ spec: login: true passwordSecret: name: tts-staging-secret + - name: tts-beta + ensure: present + createdb: false + login: true + passwordSecret: + name: tts-beta-secret - name: website-ae ensure: present createdb: false diff --git a/services/databases/postgresql/cnpg-secrets.yaml b/services/databases/postgresql/cnpg-secrets.yaml index 9f57c16d..5667d753 100644 --- a/services/databases/postgresql/cnpg-secrets.yaml +++ b/services/databases/postgresql/cnpg-secrets.yaml @@ -19,6 +19,15 @@ metadata: type: kubernetes.io/basic-auth --- apiVersion: v1 +stringData: + password: + username: tts-beta +kind: Secret +metadata: + name: tts-beta-secret +type: kubernetes.io/basic-auth +--- +apiVersion: v1 stringData: password: username: ni diff --git a/services/tts/deploy-monorepo.sh b/services/tts/deploy-monorepo.sh new file mode 100644 index 00000000..2b1e859b --- /dev/null +++ b/services/tts/deploy-monorepo.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +kubectl apply -f $(dirname $0)/beta/00-namespace.yaml +kubectl apply -f $(dirname $0)/beta/01-deployment.yaml +kubectl apply -f $(dirname $0)/beta/02-certificates.yaml +kubectl apply -f $(dirname $0)/beta/03-ingress-routes.yaml diff --git a/services/tts/monorepo/00-namespace.yaml b/services/tts/monorepo/00-namespace.yaml new file mode 100644 index 00000000..dc2cdc46 --- /dev/null +++ b/services/tts/monorepo/00-namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: tts-beta diff --git a/services/tts/monorepo/01-deployment.yaml b/services/tts/monorepo/01-deployment.yaml new file mode 100644 index 00000000..7b2c824e --- /dev/null +++ b/services/tts/monorepo/01-deployment.yaml @@ -0,0 +1,91 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tts-beta-frontend-deployment + namespace: tts-beta + annotations: + keel.sh/policy: "force" + keel.sh/match-tag: "true" +spec: + replicas: 1 + selector: + matchLabels: + app: tts-frontend + template: + metadata: + labels: + app: tts-frontend + spec: + containers: + - name: tts-fe + image: registry.niaefeup.pt/niaefeup/tts-fe:develop + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 80 + imagePullSecrets: + - name: harbor-pull-secret +--- +apiVersion: v1 +kind: Service +metadata: + name: tts-beta-frontend-service + namespace: tts-beta +spec: + selector: + app: tts-frontend + ports: + - port: 80 + targetPort: 80 + type: "ClusterIP" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tts-beta-backend-deployment + namespace: tts-beta + annotations: + keel.sh/policy: "force" + keel.sh/match-tag: "true" +spec: + replicas: 1 + selector: + matchLabels: + app: tts-backend + template: + metadata: + labels: + app: tts-backend + spec: + containers: + - name: tts-be + image: registry.niaefeup.pt/niaefeup/tts-be:beta + imagePullPolicy: Always + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 8000 + envFrom: + - secretRef: + name: + imagePullSecrets: + - name: harbor-pull-secret +--- +apiVersion: v1 +kind: Service +metadata: + name: tts-beta-backend-service + namespace: tts-beta +spec: + selector: + app: tts-backend + ports: + - port: 80 + targetPort: 8000 + type: "ClusterIP" diff --git a/services/tts/monorepo/02-certificates.yaml b/services/tts/monorepo/02-certificates.yaml new file mode 100644 index 00000000..1e2a63d8 --- /dev/null +++ b/services/tts/monorepo/02-certificates.yaml @@ -0,0 +1,12 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: tts-beta-certificate + namespace: tts-beta +spec: + secretName: tts-beta-certificate-secret + issuerRef: + name: letsencrypt-production + kind: ClusterIssuer + dnsNames: + - tts-beta.niaefeup.pt diff --git a/services/tts/monorepo/03-ingress-routes.yaml b/services/tts/monorepo/03-ingress-routes.yaml new file mode 100644 index 00000000..e44011fa --- /dev/null +++ b/services/tts/monorepo/03-ingress-routes.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: traefik.io/v1alpha1 +kind: Middleware +metadata: + name: tts-beta-strip-api-prefix + namespace: tts-beta +spec: + stripPrefix: + prefixes: + - /api + forceSlash: false +--- +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: tts-beta-ingress-route + namespace: tts-beta +spec: + entryPoints: + - websecure + routes: + - match: Host(`tts-beta.niaefeup.pt`) && PathPrefix(`/api`) + kind: Rule + services: + - name: tts-beta-backend-service + port: 80 + middlewares: + - name: tts-beta-strip-api-prefix + - match: Host(`tts-beta.niaefeup.pt`) + kind: Rule + services: + - name: tts-beta-frontend-service + port: 80 + tls: + secretName: tts-beta-certificate-secret From f3b6d512486df3c74539b6a618f15095d5cb6b6b Mon Sep 17 00:00:00 2001 From: FrozenHart Date: Mon, 2 Nov 2026 18:41:56 +0000 Subject: [PATCH 5/5] fix: updated tts beta deployment forlder to match deploy.sh and updated the front end deployed in the beta --- services/tts/{monorepo => beta}/00-namespace.yaml | 0 services/tts/{monorepo => beta}/01-deployment.yaml | 2 +- services/tts/{monorepo => beta}/02-certificates.yaml | 0 services/tts/{monorepo => beta}/03-ingress-routes.yaml | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename services/tts/{monorepo => beta}/00-namespace.yaml (100%) rename services/tts/{monorepo => beta}/01-deployment.yaml (96%) rename services/tts/{monorepo => beta}/02-certificates.yaml (100%) rename services/tts/{monorepo => beta}/03-ingress-routes.yaml (100%) diff --git a/services/tts/monorepo/00-namespace.yaml b/services/tts/beta/00-namespace.yaml similarity index 100% rename from services/tts/monorepo/00-namespace.yaml rename to services/tts/beta/00-namespace.yaml diff --git a/services/tts/monorepo/01-deployment.yaml b/services/tts/beta/01-deployment.yaml similarity index 96% rename from services/tts/monorepo/01-deployment.yaml rename to services/tts/beta/01-deployment.yaml index 7b2c824e..be452b62 100644 --- a/services/tts/monorepo/01-deployment.yaml +++ b/services/tts/beta/01-deployment.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: tts-fe - image: registry.niaefeup.pt/niaefeup/tts-fe:develop + image: registry.niaefeup.pt/niaefeup/tts-fe:beta imagePullPolicy: Always resources: limits: diff --git a/services/tts/monorepo/02-certificates.yaml b/services/tts/beta/02-certificates.yaml similarity index 100% rename from services/tts/monorepo/02-certificates.yaml rename to services/tts/beta/02-certificates.yaml diff --git a/services/tts/monorepo/03-ingress-routes.yaml b/services/tts/beta/03-ingress-routes.yaml similarity index 100% rename from services/tts/monorepo/03-ingress-routes.yaml rename to services/tts/beta/03-ingress-routes.yaml