Merge branch 'feature/nexus-upgrade' of github.com:mojaloop/iac-modul…

…es into feature/env-migrate
mojaloop · Jan 21, 2025 · 79e2895 · 79e2895
2 parents 62c3b2e + 6c94392
commit 79e2895
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/gitops/applications/base/nexus/nexus-values.yaml b/gitops/applications/base/nexus/nexus-values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: sonatype/nexus3
   # Overrides the image tag whose default is {{ .Chart.AppVersion }}
-  tag: "3.56.0"
+  tag: ${ARGOCD_ENV_nexus_image_version}
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -109,17 +109,13 @@ persistence:
 
 extraVolumeMounts: []
 
-resources: {}
-# We usually recommend not to specify default resources and to leave this as a conscious
-# choice for the user. This also increases chances charts run on environments with little
-# resources, such as Minikube. If you do want to specify resources, uncomment the following
-# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-#   limits:
-#     cpu: 100m
-#     memory: 128Mi
-#   requests:
-#     cpu: 100m
-#     memory: 128Mi
+resources: 
+  limits:
+    cpu: ${ARGOCD_ENV_nexus_cpu_limit}
+    memory: ${ARGOCD_ENV_nexus_memory_limit}
+  requests:
+    cpu: ${ARGOCD_ENV_nexus_cpu_request}
+    memory: ${ARGOCD_ENV_nexus_memory_request}
 
 chownDataDir: true
 

diff --git a/gitops/argo-apps/base/nexus.yaml b/gitops/argo-apps/base/nexus.yaml
@@ -58,4 +58,19 @@ spec:
           value: "${ARGOCD_ENV_nexus_nexus_dns_subdomain}"
 
         - name: "nexus_storage_size"
-          value: "${ARGOCD_ENV_nexus_nexus_storage_size}"          
+          value: "${ARGOCD_ENV_nexus_nexus_storage_size}" 
+
+        - name: "nexus_cpu_limit"
+          value: "${ARGOCD_ENV_nexus_nexus_cpu_limit}"
+
+        - name: "nexus_memory_limit"
+          value: "${ARGOCD_ENV_nexus_nexus_memory_limit}"
+
+        - name: "nexus_cpu_request"
+          value: "${ARGOCD_ENV_nexus_nexus_cpu_request}"
+
+        - name: "nexus_memory_request"
+          value: "${ARGOCD_ENV_nexus_nexus_memory_request}" 
+
+        - name: "nexus_image_version"
+          value: "${ARGOCD_ENV_nexus_nexus_image_version}"
diff --git a/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl b/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl
@@ -165,8 +165,13 @@ argocd_override:
       sub_apps:
         nexus:
           helm_version: "${nexus_helm_version}"
+          image_version: "${nexus_image_version}"
           public_ingress_access_domain: "${nexus_public_access}"
           storage_size: "${nexus_storage_size}"
+          cpu_limit: "${nexus_cpu_limit}"
+          memory_limit: "${nexus_memory_limit}"
+          cpu_request: "${nexus_cpu_request}"
+          memory_request: "${nexus_memory_request}"          
         post_config:
           ansible_collection_tag: "${nexus_ansible_collection_tag}"
 

diff --git a/terraform/ccnew/default-config/common-vars.yaml b/terraform/ccnew/default-config/common-vars.yaml
@@ -46,8 +46,15 @@ argocd_public_access: false
 vault_public_access: false
 netbird_public_access: true
 netbird_log_level: info
+
+nexus_image_version: 3.75.1
 nexus_public_access: false
 nexus_storage_size: 30Gi
+nexus_cpu_limit: "4000m"   #https://help.sonatype.com/en/sonatype-nexus-repository-system-requirements.html#UUID-fc21e0ee-c297-0311-0105-1383dfc28a38_bridgehead-idm23446974390921 increase if required
+nexus_memory_limit: "8Gi"
+nexus_cpu_request: "2000m"
+nexus_memory_request: "4Gi"
+
 zitadel_public_access: true
 consul_storage_size: "3Gi"
 consul_replica_count: 1