From 114994d1f1045a2fd651f5c9893c2e37614870d1 Mon Sep 17 00:00:00 2001 From: timn Date: Tue, 14 Jul 2026 23:13:45 +0200 Subject: [PATCH 1/2] fix: proxy genai service for swagger for kubernetes deployment --- helm/bytebite/templates/api-gateway-deployment.yaml | 5 ++++- helm/bytebite/templates/client-deployment.yaml | 2 +- helm/bytebite/templates/genai-deployment.yaml | 2 +- helm/bytebite/templates/grocery-db-deployment.yaml | 2 +- helm/bytebite/templates/grocery-service-deployment.yaml | 2 +- helm/bytebite/templates/user-db-deployment.yaml | 2 +- helm/bytebite/templates/user-service-deployment.yaml | 2 +- helm/bytebite/values.yaml | 4 ++-- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/helm/bytebite/templates/api-gateway-deployment.yaml b/helm/bytebite/templates/api-gateway-deployment.yaml index 134abfe..33f7658 100644 --- a/helm/bytebite/templates/api-gateway-deployment.yaml +++ b/helm/bytebite/templates/api-gateway-deployment.yaml @@ -19,7 +19,7 @@ spec: imagePullPolicy: {{ .Values.apiGateway.image.pullPolicy }} resources: limits: - cpu: "500m" + cpu: "300m" memory: "512Mi" requests: cpu: "200m" @@ -31,6 +31,9 @@ spec: value: "http://grocery-service:{{ .Values.groceryService.service.port }}" - name: USER_SERVICE_BASE_URL value: "http://user-service:{{ .Values.userService.service.port }}" + # Only used to proxy gen-ai's OpenAPI spec into the gateway's Swagger UI. + - name: GENAI_SERVICE_BASE_URL + value: "http://genai-service:{{ .Values.genai.service.port }}" {{- if .Values.jwt.secret }} # Shared JWT secret (verifies tokens). Must match user-service. Only # injected when set; otherwise the app's built-in default applies. diff --git a/helm/bytebite/templates/client-deployment.yaml b/helm/bytebite/templates/client-deployment.yaml index 08dea9c..53fce8a 100644 --- a/helm/bytebite/templates/client-deployment.yaml +++ b/helm/bytebite/templates/client-deployment.yaml @@ -19,7 +19,7 @@ spec: imagePullPolicy: {{ .Values.client.image.pullPolicy }} resources: limits: - cpu: "500m" + cpu: "100m" memory: "256Mi" requests: cpu: "50m" diff --git a/helm/bytebite/templates/genai-deployment.yaml b/helm/bytebite/templates/genai-deployment.yaml index aa81954..3629052 100644 --- a/helm/bytebite/templates/genai-deployment.yaml +++ b/helm/bytebite/templates/genai-deployment.yaml @@ -19,7 +19,7 @@ spec: imagePullPolicy: {{ .Values.genai.image.pullPolicy }} resources: limits: - cpu: "500m" + cpu: "250m" memory: "512Mi" requests: cpu: "100m" diff --git a/helm/bytebite/templates/grocery-db-deployment.yaml b/helm/bytebite/templates/grocery-db-deployment.yaml index 9e2097b..1ba265d 100644 --- a/helm/bytebite/templates/grocery-db-deployment.yaml +++ b/helm/bytebite/templates/grocery-db-deployment.yaml @@ -23,7 +23,7 @@ spec: imagePullPolicy: {{ .Values.groceryDb.image.pullPolicy }} resources: limits: - cpu: "250m" + cpu: "200m" memory: "256Mi" requests: cpu: "100m" diff --git a/helm/bytebite/templates/grocery-service-deployment.yaml b/helm/bytebite/templates/grocery-service-deployment.yaml index 2099d0c..cd48656 100644 --- a/helm/bytebite/templates/grocery-service-deployment.yaml +++ b/helm/bytebite/templates/grocery-service-deployment.yaml @@ -19,7 +19,7 @@ spec: imagePullPolicy: {{ .Values.groceryService.image.pullPolicy }} resources: limits: - cpu: "500m" + cpu: "300m" memory: "512Mi" requests: cpu: "200m" diff --git a/helm/bytebite/templates/user-db-deployment.yaml b/helm/bytebite/templates/user-db-deployment.yaml index 5824b49..16f84a4 100644 --- a/helm/bytebite/templates/user-db-deployment.yaml +++ b/helm/bytebite/templates/user-db-deployment.yaml @@ -23,7 +23,7 @@ spec: imagePullPolicy: {{ .Values.userDb.image.pullPolicy }} resources: limits: - cpu: "250m" + cpu: "200m" memory: "256Mi" requests: cpu: "100m" diff --git a/helm/bytebite/templates/user-service-deployment.yaml b/helm/bytebite/templates/user-service-deployment.yaml index 674b646..6c7e8aa 100644 --- a/helm/bytebite/templates/user-service-deployment.yaml +++ b/helm/bytebite/templates/user-service-deployment.yaml @@ -19,7 +19,7 @@ spec: imagePullPolicy: {{ .Values.userService.image.pullPolicy }} resources: limits: - cpu: "500m" + cpu: "300m" memory: "512Mi" requests: cpu: "200m" diff --git a/helm/bytebite/values.yaml b/helm/bytebite/values.yaml index 299c279..9c72eec 100644 --- a/helm/bytebite/values.yaml +++ b/helm/bytebite/values.yaml @@ -102,7 +102,7 @@ monitoring: pullPolicy: IfNotPresent resources: limits: - cpu: "300m" + cpu: "200m" memory: "512Mi" requests: cpu: "100m" @@ -121,7 +121,7 @@ monitoring: pullPolicy: IfNotPresent resources: limits: - cpu: "300m" + cpu: "150m" memory: "256Mi" requests: cpu: "100m" From 6c255af421f87b79b40af023cdf3224c401ffcc7 Mon Sep 17 00:00:00 2001 From: timn Date: Thu, 16 Jul 2026 16:28:07 +0200 Subject: [PATCH 2/2] feat: switch azure account --- infra/terraform/.terraform.lock.hcl | 3 +++ infra/terraform/README.md | 2 +- infra/terraform/versions.tf | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/infra/terraform/.terraform.lock.hcl b/infra/terraform/.terraform.lock.hcl index 52896c3..47a7fb3 100644 --- a/infra/terraform/.terraform.lock.hcl +++ b/infra/terraform/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/hashicorp/azurerm" { constraints = "~> 3.0" hashes = [ "h1:3c9iOEtBMnHrpJLlhbQ0sCZPWhE/2dvEPcL8KkXAh7w=", + "h1:Y9J+emydHX7LpJYKdF9Zmng0zcRR86Awm/t28LNzb68=", "zh:0c513676836e3c50d004ece7d2624a8aff6faac14b833b96feeac2e4bc2c1c12", "zh:50ea01ada95bae2f187db9e926e463f45d860767a85ebc59160414e00e76c35d", "zh:52c2a9edacc06b3f72153f5ef6daca0761c6292158815961fe37f60bc576a3d7", @@ -26,6 +27,7 @@ provider "registry.terraform.io/hashicorp/local" { constraints = "~> 2.0" hashes = [ "h1:9rBZCMNpxKwMlRbWH2QpwD3kqUCAejdOZQ/aiiDObXQ=", + "h1:px3Hpv/tL288wzu5knHywTTBcrydLnnGEiF/NIQBaRs=", "zh:0baa4566cf77f1ff52f4293d1c8536202dd23edc197c3196413a28343c3ac3a0", "zh:16b5559c3c07088ddad11a9bb9e9c0799999363c2958e9a5be2bcbbf2cd9ca64", "zh:197c79015a10d1cce904a8ea722cbc750c42aeae2da53f44a6a0751d9fd1aa90", @@ -46,6 +48,7 @@ provider "registry.terraform.io/hashicorp/tls" { version = "4.3.0" constraints = "~> 4.0" hashes = [ + "h1:7QWrBlzkkFAFyDl9UsfC0tdfNFquFx03miHwZcta33Q=", "h1:j/BqLS2N2AScZyotd9nZpHdieJ7e5S8y+A+ZfIu8kL8=", "zh:0ab58d6f8991d436c7d2dbd89ed814709b949b07ac5a54ee53b0aec1fa772a8b", "zh:60b347abcb56f45d97c56f14d895069cd15a83993f199777f571b79fea3642ee", diff --git a/infra/terraform/README.md b/infra/terraform/README.md index b834e85..71bf17c 100644 --- a/infra/terraform/README.md +++ b/infra/terraform/README.md @@ -21,7 +21,7 @@ let Ansible connect. cloud-init is therefore minimal (it just ensures Python 3 i `../ansible/` folder (`inventory.ini`, `ssh_key.pem`) on `apply`. Both are gitignored. State is stored **remotely** in Azure Storage (`azurerm` backend in `versions.tf`: -`teamstatebytebite` / `tfstate` container), so CI and team members share one locked state. +`bytebitetim` / `tfstate` container), so CI and team members share one locked state. ## Prerequisites diff --git a/infra/terraform/versions.tf b/infra/terraform/versions.tf index a564f07..dd6558d 100644 --- a/infra/terraform/versions.tf +++ b/infra/terraform/versions.tf @@ -17,8 +17,8 @@ terraform { } backend "azurerm" { - resource_group_name = "terraform_bitebyte" - storage_account_name = "teamstatebytebite" + resource_group_name = "terraform_bytebite" + storage_account_name = "bytebitetim" container_name = "tfstate" key = "terraform.tfstate" }