diff --git a/deploy/ctrlplane/charts/webservice/templates/deployment.yaml b/deploy/ctrlplane/charts/webservice/templates/deployment.yaml index 9c0e5319..90154cae 100644 --- a/deploy/ctrlplane/charts/webservice/templates/deployment.yaml +++ b/deploy/ctrlplane/charts/webservice/templates/deployment.yaml @@ -36,7 +36,7 @@ spec: {{- include "ctrlplane.priorityClassName" . | nindent 6 }} {{- include "ctrlplane.podSecurityContext" .Values.pod.securityContext | nindent 6 }} containers: - - name: {{ .Chart.Name }} + - name: webservice image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" ports: - name: http diff --git a/deploy/ctrlplane/templates/ingress.yaml b/deploy/ctrlplane/templates/ingress.yaml index 82633d6f..b38ed7d6 100644 --- a/deploy/ctrlplane/templates/ingress.yaml +++ b/deploy/ctrlplane/templates/ingress.yaml @@ -13,6 +13,11 @@ metadata: {{- end }} spec: ingressClassName: {{ .Values.ingress.class }} + defaultBackend: + service: + name: {{ .Release.Name }}-webservice + port: + number: 3000 rules: - http: paths: diff --git a/packages/db/package.json b/packages/db/package.json index 3c8f8ecb..ca0ab29d 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -39,7 +39,6 @@ }, "dependencies": { "@t3-oss/env-core": "^0.10.1", - "@vercel/postgres": "^0.8.0", "drizzle-orm": "^0.30.10", "drizzle-zod": "^0.5.1", "pg": "^8.11.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cfb4fe94..4e3ee564 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -722,9 +722,6 @@ importers: '@t3-oss/env-core': specifier: ^0.10.1 version: 0.10.1(typescript@5.5.3)(zod@3.23.8) - '@vercel/postgres': - specifier: ^0.8.0 - version: 0.8.0 drizzle-orm: specifier: ^0.30.10 version: 0.30.10(@neondatabase/serverless@0.9.4)(@planetscale/database@1.18.0)(@types/pg@8.11.6)(@types/react@18.3.3)(@vercel/postgres@0.8.0)(mysql2@3.10.3)(pg@8.12.0)(postgres@3.4.4)(react@18.3.1) @@ -1013,7 +1010,7 @@ importers: version: 1.13.4(eslint@9.9.0(jiti@1.21.6)) eslint-plugin-import: specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.16.1(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.3))(eslint@9.9.0(jiti@1.21.6)) + version: 2.29.1(eslint@9.9.0(jiti@1.21.6)) eslint-plugin-jsx-a11y: specifier: ^6.8.0 version: 6.9.0(eslint@9.9.0(jiti@1.21.6)) @@ -8968,6 +8965,7 @@ snapshots: '@neondatabase/serverless@0.7.2': dependencies: '@types/pg': 8.6.6 + optional: true '@neondatabase/serverless@0.9.4': dependencies: @@ -11203,6 +11201,7 @@ snapshots: '@types/node': 20.14.11 pg-protocol: 1.6.1 pg-types: 2.2.0 + optional: true '@types/prop-types@15.7.12': {} @@ -11427,6 +11426,7 @@ snapshots: bufferutil: 4.0.8 utf-8-validate: 6.0.3 ws: 8.14.2(bufferutil@4.0.8)(utf-8-validate@6.0.3) + optional: true '@xobotyi/scrollbar-width@1.9.5': {} @@ -11734,6 +11734,7 @@ snapshots: bufferutil@4.0.8: dependencies: node-gyp-build: 4.8.1 + optional: true busboy@1.6.0: dependencies: @@ -12743,17 +12744,16 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@7.16.1(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.9.0(jiti@1.21.6)): + eslint-module-utils@2.8.1(eslint-import-resolver-node@0.3.9)(eslint@9.9.0(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 7.16.1(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.3) eslint: 9.9.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.1(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.3))(eslint@9.9.0(jiti@1.21.6)): + eslint-plugin-import@2.29.1(eslint@9.9.0(jiti@1.21.6)): dependencies: array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 @@ -12763,7 +12763,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.9.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.16.1(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.9.0(jiti@1.21.6)) + eslint-module-utils: 2.8.1(eslint-import-resolver-node@0.3.9)(eslint@9.9.0(jiti@1.21.6)) hasown: 2.0.2 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -12773,8 +12773,6 @@ snapshots: object.values: 1.2.0 semver: 6.3.1 tsconfig-paths: 3.15.0 - optionalDependencies: - '@typescript-eslint/parser': 7.16.1(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.3) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -14854,7 +14852,8 @@ snapshots: fetch-blob: 3.2.0 formdata-polyfill: 4.0.10 - node-gyp-build@4.8.1: {} + node-gyp-build@4.8.1: + optional: true node-plop@0.26.3: dependencies: @@ -16693,6 +16692,7 @@ snapshots: utf-8-validate@6.0.3: dependencies: node-gyp-build: 4.8.1 + optional: true utf-8-validate@6.0.4: dependencies: @@ -16883,6 +16883,7 @@ snapshots: optionalDependencies: bufferutil: 4.0.8 utf-8-validate: 6.0.3 + optional: true ws@8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4): optionalDependencies: