diff --git a/README.md b/README.md index 7afe1ad..53c3ac9 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,8 @@ An api skeleton using mongodb for [chubbyts-framework][8]. * [commander][18]: ^11.0.0 * [mongodb][19]: ^6.1.0 * [openapi3-ts][20]: ^4.1.2 - * [pino][21]: ^8.15.0 - * [uuid][22]: ^9.0.0 + * [pino][21]: ^8.15.1 + * [uuid][22]: ^9.0.1 * [zod][23]: ^3.22.2 ## Environment diff --git a/package.json b/package.json index 4189951..faf9e6a 100644 --- a/package.json +++ b/package.json @@ -79,8 +79,8 @@ "commander": "^11.0.0", "mongodb": "^6.1.0", "openapi3-ts": "^4.1.2", - "pino": "^8.15.0", - "uuid": "^9.0.0", + "pino": "^8.15.1", + "uuid": "^9.0.1", "zod": "^3.22.2" }, "devDependencies": { @@ -89,17 +89,17 @@ "@stryker-mutator/core": "^7.1.1", "@stryker-mutator/jest-runner": "^7.1.1", "@swc/cli": "^0.1.62", - "@swc/core": "^1.3.80", + "@swc/core": "^1.3.85", "@swc/jest": "^0.2.29", - "@types/jest": "^29.5.4", - "@types/node": "^20.5.7", - "@types/uuid": "^9.0.2", + "@types/jest": "^29.5.5", + "@types/node": "^20.6.2", + "@types/uuid": "^9.0.4", "concurrently": "^8.2.1", "cross-fetch": "^4.0.0", - "jest": "^29.6.4", + "jest": "^29.7.0", "mongodb-memory-server": "^8.15.1", "nodemon": "^3.0.1", - "prettier": "^3.0.2", + "prettier": "^3.0.3", "typescript": "^5.2.2" } } diff --git a/pulumi/index.ts b/pulumi/index.ts index 28687eb..03da7c1 100644 --- a/pulumi/index.ts +++ b/pulumi/index.ts @@ -94,7 +94,7 @@ const nodeFactory = ({ memory: '100Mi', }, limits: { - memory: '200Mi', + memory: '150Mi', }, }, }); @@ -122,6 +122,14 @@ const swaggerUiFactory = ({ k8sProvider }: SwaggerUiFactoryProps): void => { port: 8080, path: '/swagger', replicas: 1, + resources: { + requests: { + memory: '50Mi', + }, + limits: { + memory: '50Mi', + }, + }, }); createK8sInternalHttpService({ k8sProvider, labels, port: 8080 }); @@ -250,7 +258,8 @@ const helmCertManager = installK8sHelmCertManager({ k8sProvider }); createK8sCertManager({ k8sProvider, helmCertManager, email: config.require('certManagerEmail') }); export const containerRegistryId = containerRegistry.id; -export const dns = pulumi.interpolate`Make sure to add A-Record for ${ingress.status.loadBalancer.ingress[0].hostname - } pointing to the IP provided by the related load balancer: https://cloud.digitalocean.com/networking/load_balancers. Make sure to add CNAME's for ${ingress.spec.tls.apply( - (tls) => tls.flatMap(({ hosts }) => hosts).join(', '), - )} pointing to ${ingress.status.loadBalancer.ingress[0].hostname}`; +export const dns = pulumi.interpolate`Make sure to add A-Record for ${ + ingress.status.loadBalancer.ingress[0].hostname +} pointing to the IP provided by the related load balancer: https://cloud.digitalocean.com/networking/load_balancers. Make sure to add CNAME's for ${ingress.spec.tls.apply( + (tls) => tls.flatMap(({ hosts }) => hosts).join(', '), +)} pointing to ${ingress.status.loadBalancer.ingress[0].hostname}`; diff --git a/pulumi/package.json b/pulumi/package.json index a8f4408..520a236 100644 --- a/pulumi/package.json +++ b/pulumi/package.json @@ -11,13 +11,13 @@ }, "dependencies": { "@pulumi/digitalocean": "^4.21.0", - "@pulumi/docker": "^4.3.2", - "@pulumi/kubernetes": "^4.1.1", - "@pulumi/pulumi": "^3.79.0" + "@pulumi/docker": "^4.4.1", + "@pulumi/kubernetes": "^4.2.0", + "@pulumi/pulumi": "^3.83.0" }, "devDependencies": { - "@types/node": "^20.5.7", - "prettier": "^3.0.2", + "@types/node": "^20.6.2", + "prettier": "^3.0.3", "typescript": "^5.2.2" } } diff --git a/pulumi/src/k8s.ts b/pulumi/src/k8s.ts index 86377b1..1d43183 100644 --- a/pulumi/src/k8s.ts +++ b/pulumi/src/k8s.ts @@ -12,7 +12,7 @@ type CreateK8sClusterProps = { export const createK8sCluster = ({ region, vpc, - size = digitalocean.DropletSlug.DropletS2VCPU2GB, + size = digitalocean.DropletSlug.DropletS2VCPU4GB, nodeCount, }: CreateK8sClusterProps): digitalocean.KubernetesCluster => { return new digitalocean.KubernetesCluster('k8s-cluster', { @@ -412,7 +412,7 @@ export const installK8sHelmMetricsServer = ({ k8sProvider }: InstallK8sHelmMetri 'helm-metrics-server', { chart: 'metrics-server', - version: '3.10.0', + version: '3.11.0', repositoryOpts: { repo: 'https://kubernetes-sigs.github.io/metrics-server', }, @@ -445,7 +445,7 @@ export const installK8sHelmIngressNginxController = ({ 'helm-ingress-nginx', { chart: 'ingress-nginx', - version: '4.7.1', + version: '4.7.2', repositoryOpts: { repo: 'https://kubernetes.github.io/ingress-nginx', }, @@ -501,7 +501,7 @@ export const installK8sHelmCertManager = ({ k8sProvider }: InstallK8sHelmCertMan 'helm-cert-manager', { chart: 'cert-manager', - version: '1.12.2', + version: '1.13.0', repositoryOpts: { repo: 'https://charts.jetstack.io', },