Merge branch 'main' into de/argo-redis-prod

wmde · Nov 15, 2024 · b806b31 · b806b31
2 parents 0b6166b + 28066ac
commit b806b31
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/k8s/argocd/staging/app-of-apps.values.yaml b/k8s/argocd/staging/app-of-apps.values.yaml
diff --git a/k8s/helmfile/env/staging/argo-cd-base.values.yaml.gotmpl b/k8s/helmfile/env/staging/argo-cd-base.values.yaml.gotmpl
@@ -5,6 +5,14 @@ dex:
     requests:
       memory: 64Mi
 
+controller:
+  resources:
+   limits:
+     memory: 1024Mi
+   requests:
+     cpu: 250m
+     memory: 1024Mi
+
 configs:
   cm:
     ui.bannercontent: "STAGING"

diff --git a/skaffold/skaffold.yaml b/skaffold/skaffold.yaml
@@ -47,7 +47,7 @@ profiles:
               LOCALIZATION_CACHE_THREAD_COUNT: 4
               LOCALIZATION_CACHE_ADDITIONAL_PARAMS: "--lang=en,sv,de"
               INSTALL_PROFILING_DEPS: 1
-              INSTALL_XDEBUG: 0
+              INSTALL_XDEBUG: 1
       local:
         useDockerCLI: true
     deploy: