Skip to content

Commit

Permalink
vendor upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
dominikzogg committed Sep 16, 2023
1 parent f376656 commit 73422f5
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
19 changes: 14 additions & 5 deletions pulumi/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const nodeFactory = ({
memory: '100Mi',
},
limits: {
memory: '200Mi',
memory: '150Mi',
},
},
});
Expand Down Expand Up @@ -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 });
Expand Down Expand Up @@ -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}`;
10 changes: 5 additions & 5 deletions pulumi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
8 changes: 4 additions & 4 deletions pulumi/src/k8s.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand Down Expand Up @@ -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',
},
Expand Down Expand Up @@ -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',
},
Expand Down Expand Up @@ -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',
},
Expand Down

0 comments on commit 73422f5

Please sign in to comment.