From e922754337b5656d83c249df3201367eedb84c06 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 7 May 2026 09:01:50 +0300 Subject: [PATCH] Update brand-master chart --- .../templates/db-statefulset.yaml | 2 +- charts/brand-master-chart/values.yaml | 12 +- manifests/brand-master/values.yaml | 148 ++++++++++++------ 3 files changed, 113 insertions(+), 49 deletions(-) diff --git a/charts/brand-master-chart/templates/db-statefulset.yaml b/charts/brand-master-chart/templates/db-statefulset.yaml index bac4ae7..77be2a8 100644 --- a/charts/brand-master-chart/templates/db-statefulset.yaml +++ b/charts/brand-master-chart/templates/db-statefulset.yaml @@ -22,7 +22,7 @@ spec: fsGroup: 999 initContainers: - name: fix-permissions - image: harbor.dvirlabs.com/base-images/busybox:1.35 + image: harbor.dvirlabs.com/dockerhub/busybox:latest command: - sh - -c diff --git a/charts/brand-master-chart/values.yaml b/charts/brand-master-chart/values.yaml index d9b3a40..b97cf95 100644 --- a/charts/brand-master-chart/values.yaml +++ b/charts/brand-master-chart/values.yaml @@ -28,6 +28,16 @@ backend: PYTHONUNBUFFERED: "1" BACKEND_URL: "https://api-brand-master.dvirlabs.com" FRONTEND_URL: "https://brand-master.dvirlabs.com" + # Admin user credentials (change in production!) + ADMIN_EMAIL: "admin@brand-master.com" + ADMIN_PASSWORD: "admin123" # CHANGE THIS! + ADMIN_FULL_NAME: "System Administrator" + # Email configuration for password reset (optional) + SMTP_HOST: "smtp.gmail.com" + SMTP_PORT: "587" + SMTP_USERNAME: "" + SMTP_PASSWORD: "" + SMTP_FROM: "noreply@brand-master.com" # JWT Secret Key (IMPORTANT: Change this in production!) jwtSecretKey: "your-secret-key-change-this-in-production" @@ -105,7 +115,7 @@ frontend: postgres: name: db image: - repository: harbor.dvirlabs.com/base-images/postgres + repository: harbor.dvirlabs.com/dockerhub/postgres tag: "16-alpine" pullPolicy: IfNotPresent diff --git a/manifests/brand-master/values.yaml b/manifests/brand-master/values.yaml index cb35ce7..b97cf95 100644 --- a/manifests/brand-master/values.yaml +++ b/manifests/brand-master/values.yaml @@ -1,43 +1,57 @@ -nameOverride: "" -fullnameOverride: "" -commonLabels: {} -commonAnnotations: {} global: - imagePullSecrets: - - name: harbor-regcred + namespace: my-apps + imagePullSecrets: [] + +# Backend configuration backend: + name: backend + replicaCount: 1 image: repository: harbor.dvirlabs.com/my-apps/brand-master-backend - tag: master-282e279 pullPolicy: IfNotPresent - replicaCount: 1 - resources: - limits: - cpu: 1000m - memory: 1Gi - requests: - cpu: 200m - memory: 256Mi - env: - PYTHONUNBUFFERED: "1" - BACKEND_URL: "https://api-brand-master.dvirlabs.com" - FRONTEND_URL: "https://brand-master.dvirlabs.com" - jwtSecretKey: "your-secret-key-change-this-in-production" - jwtAlgorithm: "HS256" - jwtExpireMinutes: "30" - persistence: - enabled: true - storageClass: "nfs-client" - size: 15Gi - mountPath: /app/uploads + tag: "latest" + service: type: ClusterIP port: 8000 targetPort: 8000 - healthCheck: - path: /health - initialDelaySeconds: 10 - periodSeconds: 30 + + resources: + requests: + cpu: 200m + memory: 256Mi + limits: + cpu: 1000m + memory: 1Gi + + env: + PYTHONUNBUFFERED: "1" + BACKEND_URL: "https://api-brand-master.dvirlabs.com" + FRONTEND_URL: "https://brand-master.dvirlabs.com" + # Admin user credentials (change in production!) + ADMIN_EMAIL: "admin@brand-master.com" + ADMIN_PASSWORD: "admin123" # CHANGE THIS! + ADMIN_FULL_NAME: "System Administrator" + # Email configuration for password reset (optional) + SMTP_HOST: "smtp.gmail.com" + SMTP_PORT: "587" + SMTP_USERNAME: "" + SMTP_PASSWORD: "" + SMTP_FROM: "noreply@brand-master.com" + + # JWT Secret Key (IMPORTANT: Change this in production!) + jwtSecretKey: "your-secret-key-change-this-in-production" + jwtAlgorithm: "HS256" + jwtExpireMinutes: "30" + + # Persistent storage for product images + persistence: + enabled: true + storageClass: "nfs-client" + accessMode: ReadWriteOnce + size: 15Gi + mountPath: /app/uploads + ingress: enabled: true className: "traefik" @@ -54,29 +68,32 @@ backend: - secretName: api-brand-master-tls hosts: - api-brand-master.dvirlabs.com + +# Frontend configuration frontend: + name: frontend + replicaCount: 1 image: repository: harbor.dvirlabs.com/my-apps/brand-master-frontend - tag: master-d0d9084 pullPolicy: IfNotPresent - replicaCount: 1 - resources: - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 50m - memory: 64Mi - env: - VITE_API_URL: "https://api-brand-master.dvirlabs.com" + tag: "latest" + service: type: ClusterIP port: 80 targetPort: 80 - healthCheck: - path: / - initialDelaySeconds: 5 - periodSeconds: 30 + + env: + VITE_API_URL: "https://api-brand-master.dvirlabs.com" + + resources: + requests: + cpu: 50m + memory: 64Mi + limits: + cpu: 200m + memory: 256Mi + ingress: enabled: true className: "traefik" @@ -93,25 +110,31 @@ frontend: - secretName: brand-master-tls hosts: - brand-master.dvirlabs.com + +# PostgreSQL configuration postgres: name: db image: - repository: harbor.dvirlabs.com/base-images/postgres + repository: harbor.dvirlabs.com/dockerhub/postgres tag: "16-alpine" pullPolicy: IfNotPresent + user: brand_master_user password: brand_master_password database: brand_master_db port: 5432 + service: type: ClusterIP port: 5432 targetPort: 5432 + persistence: enabled: true accessMode: ReadWriteOnce storageClass: "nfs-client" size: 10Gi + resources: requests: cpu: 100m @@ -119,3 +142,34 @@ postgres: limits: cpu: 1000m memory: 1Gi + +# Service Account +serviceAccount: + create: true + annotations: {} + name: "" + +# Pod annotations +podAnnotations: {} + +# Pod security context +podSecurityContext: {} + # fsGroup: 2000 + +# Container security context +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +# Node selector +nodeSelector: {} + +# Tolerations +tolerations: [] + +# Affinity +affinity: {}