diff --git a/services/pulumi/resources/mongodb/index.ts b/services/pulumi/resources/mongodb/index.ts index 52e5bb3..5f2ce17 100644 --- a/services/pulumi/resources/mongodb/index.ts +++ b/services/pulumi/resources/mongodb/index.ts @@ -6,7 +6,7 @@ import { replicateTo } from "../../utils/replicator"; import { CommitSignal, PendingValue } from "../../utils/pending"; import { DBUser, MongoDBCommunityControllerArgs } from "./types"; -export const namespace = new k8s.core.v1.Namespace("mongodb-namespace", { +const namespace = new k8s.core.v1.Namespace("mongodb-namespace", { metadata: { name: "mongodb", }, @@ -43,6 +43,7 @@ export class MongoDBCommunityController< > extends pulumi.ComponentResource { private name; private namespace; + public readonly dbs; private users; @@ -64,6 +65,7 @@ export class MongoDBCommunityController< this.name = name; this.namespace = args?.namespace ?? namespace.metadata.name; + this.dbs = args.dbs; this.users = users; diff --git a/services/pulumi/services/databases/mongodb/index.ts b/services/pulumi/services/databases/mongodb/index.ts index de2eec4..9c113d2 100644 --- a/services/pulumi/services/databases/mongodb/index.ts +++ b/services/pulumi/services/databases/mongodb/index.ts @@ -1,10 +1,8 @@ import * as pulumi from "@pulumi/pulumi"; import { MongoDBCommunityController } from "../../../resources/mongodb"; -const appsDatabases = ["admin", "nimentas"] as const; - export const apps = new MongoDBCommunityController("mongodb-apps", { - dbs: appsDatabases, + dbs: ["admin", "nimentas"], mdbc: { metadata: { name: "mongodb-apps", @@ -51,7 +49,7 @@ apps.addUser({ name: "ni", db: "admin", password: config.requireSecret("mongodb/admin-password"), - roles: appsDatabases.map((db) => ({ + roles: apps.dbs.map((db) => ({ name: "root", db, })), diff --git a/services/pulumi/services/ementas/deployments.ts b/services/pulumi/services/ementas/deployments.ts index 52d1b03..d106168 100644 --- a/services/pulumi/services/ementas/deployments.ts +++ b/services/pulumi/services/ementas/deployments.ts @@ -5,6 +5,7 @@ import { labels, containerPort } from "./values"; import { apps } from "../databases/mongodb"; const config = new pulumi.Config(); +const connectionStringSecretName = "ementas-mongodb-secret"; apps .addUser({ @@ -18,7 +19,7 @@ apps }, ], connectionStringSecretNamespace: namespace.metadata.name, - connectionStringSecretName: "ementas-mongodb-secret", + connectionStringSecretName, }); export const website = new k8s.apps.v1.Deployment("ementas-website", { @@ -38,7 +39,7 @@ export const website = new k8s.apps.v1.Deployment("ementas-website", { spec: { containers: [ { - name: "ementas-website", + name: "ementas-website-container", image: "registry.niaefeup.pt/niaefeup/nimentas-sasup:main", imagePullPolicy: "Always", resources: { @@ -57,7 +58,7 @@ export const website = new k8s.apps.v1.Deployment("ementas-website", { name: "DATABASE_URL", valueFrom: { secretKeyRef: { - name: "ementas-mongodb-secret", + name: connectionStringSecretName, key: "connectionString.standard", }, }, diff --git a/services/pulumi/services/ementas/values.ts b/services/pulumi/services/ementas/values.ts index f95436f..ef5ac90 100644 --- a/services/pulumi/services/ementas/values.ts +++ b/services/pulumi/services/ementas/values.ts @@ -1,4 +1,4 @@ export const host = "ementas.niaefeup.pt"; export const labels = { app: "ementas-website" }; -export const containerPort = 3000; \ No newline at end of file +export const containerPort = 3000; diff --git a/services/pulumi/sync-crds.sh b/services/pulumi/sync-crds.sh index 95f6ad6..ed04782 100755 --- a/services/pulumi/sync-crds.sh +++ b/services/pulumi/sync-crds.sh @@ -141,6 +141,4 @@ crd_paths="$(download_crds "$SPEC_FILE" "crds/.tmp/")" crd2pulumi -n ${crd_paths[@]} -# rm -rf crds/.tmp/ - echo "CRDs synced successfully"