Merge: resolve conflict keeping imagePullSecrets and correct image tags

manifests/tasko/values.yaml

@@ -9,13 +9,11 @@ backend:
   image:
     repository: harbor.dvirlabs.com/my-apps/tasko-backend
     pullPolicy: IfNotPresent
-    tag: "latest"
-  
+    tag: "master-cf7f3ee"
   service:
     type: ClusterIP
     port: 8000
     targetPort: 8000
-  
   resources:
     requests:
       cpu: 100m
@@ -23,22 +21,18 @@ backend:
     limits:
       cpu: 500m
       memory: 512Mi
-  
   env:
     PYTHONUNBUFFERED: "1"
     ENVIRONMENT: "production"
     GOOGLE_REDIRECT_URI: "https://api-tasko.dvirlabs.com/auth/google/callback"
     FRONTEND_URL: "https://tasko.dvirlabs.com"
-  
   # OAuth Configuration (stored as secrets)
   oauth:
     google:
       clientId: "672182384838-vob26vd0qhmf0g9mru4u4sibkqre0rfa.apps.googleusercontent.com"
       clientSecret: "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"
-  
   # Session secret for signing cookies (generate with: python -c "import secrets; print(secrets.token_hex(32))")
   sessionSecret: "7f8a9b6c5d4e3f2a1b0c9d8e7f6a5b4c3d2e1f0a9b8c7d6e5f4a3b2c1d0e9f8a"
-
   ingress:
     enabled: true
     className: "traefik"
@@ -55,7 +49,6 @@ backend:
       - secretName: api-tasko-tls
         hosts:
           - api-tasko.dvirlabs.com
-
 # Frontend configuration
 frontend:
   name: frontend
@@ -63,16 +56,13 @@ frontend:
   image:
     repository: harbor.dvirlabs.com/my-apps/tasko-frontend
     pullPolicy: IfNotPresent
-    tag: "latest"
-  
+    tag: "master-cf7f3ee"
   service:
     type: ClusterIP
     port: 80
     targetPort: 80
-  
   env:
     VITE_API_URL: "https://api-tasko.dvirlabs.com"
-  
   resources:
     requests:
       cpu: 50m
@@ -80,7 +70,6 @@ frontend:
     limits:
       cpu: 200m
       memory: 256Mi
-
   ingress:
     enabled: true
     className: "traefik"
@@ -97,7 +86,6 @@ frontend:
       - secretName: tasko-tls
         hosts:
           - tasko.dvirlabs.com
-
 # PostgreSQL configuration
 postgres:
   name: db
@@ -105,22 +93,18 @@ postgres:
     repository: postgres
     tag: "16-alpine"
     pullPolicy: IfNotPresent
-  
   user: tasko_user
   password: tasko_password
   database: tasko_db
   port: 5432
-  
   service:
     type: ClusterIP
     port: 5432
     targetPort: 5432
-  
   persistence:
     enabled: true
     accessMode: ReadWriteOnce
     size: 8Gi
-  
   resources:
     requests:
       cpu: 100m
@@ -128,7 +112,6 @@ postgres:
     limits:
       cpu: 500m
       memory: 512Mi
-
 # Ingress configuration
 ingress:
   enabled: false # Individual frontend/backend ingress resources handle routing instead
@@ -145,7 +128,6 @@ ingress:
     - secretName: tasko-tls
       hosts:
         - tasko.dvirlabs.com
-
 # Service Account configuration
 serviceAccount:
   create: true