From f846a8c7564a5aa17a777b52f8480bc5cd1f94eb Mon Sep 17 00:00:00 2001 From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com> Date: Tue, 21 Jan 2025 19:49:55 +0530 Subject: [PATCH 1/4] nexus upgrade --- .../applications/base/nexus/nexus-values.yaml | 20 ++++++++----------- gitops/argo-apps/base/nexus.yaml | 14 ++++++++++++- .../templates/argoapps.yaml.tpl | 4 ++++ .../ccnew/default-config/common-vars.yaml | 6 ++++++ 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/gitops/applications/base/nexus/nexus-values.yaml b/gitops/applications/base/nexus/nexus-values.yaml index 96bca652f..2f7c5ade8 100644 --- 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: "3.75.1" 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 index 731a2bb9f..733e3bb78 100644 --- a/gitops/argo-apps/base/nexus.yaml +++ b/gitops/argo-apps/base/nexus.yaml @@ -58,4 +58,16 @@ 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}" diff --git a/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl b/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl index da57df0fd..9643859df 100644 --- a/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl +++ b/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl @@ -167,6 +167,10 @@ argocd_override: helm_version: "${nexus_helm_version}" public_ingress_access_domain: "${nexus_public_access}" storage_size: "${nexus_storage_size}" + nexus_cpu_limit: "${nexus_cpu_limit}" + nexus_memory_limit: "${nexus_memory_limit}" + nexus_cpu_request: "${nexus_cpu_request}" + nexus_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 index 703aba099..b251ed22b 100644 --- a/terraform/ccnew/default-config/common-vars.yaml +++ b/terraform/ccnew/default-config/common-vars.yaml @@ -46,8 +46,14 @@ argocd_public_access: false vault_public_access: false netbird_public_access: true netbird_log_level: info + nexus_public_access: false nexus_storage_size: 30Gi +nexus_cpu_limit: "2000m" #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: "4Gi" +nexus_cpu_request: "4000m" +nexus_memory_request: "8Gi" + zitadel_public_access: true consul_storage_size: "3Gi" consul_replica_count: 1 From 6f2602d81544e9279e589c2074948a8d5d30d91b Mon Sep 17 00:00:00 2001 From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:30:30 +0530 Subject: [PATCH 2/4] args --- .../ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl b/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl index 9643859df..8413d955d 100644 --- a/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl +++ b/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl @@ -167,10 +167,10 @@ argocd_override: helm_version: "${nexus_helm_version}" public_ingress_access_domain: "${nexus_public_access}" storage_size: "${nexus_storage_size}" - nexus_cpu_limit: "${nexus_cpu_limit}" - nexus_memory_limit: "${nexus_memory_limit}" - nexus_cpu_request: "${nexus_cpu_request}" - nexus_memory_request: "${nexus_memory_request}" + 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}" From 188da3a955034cd0181cf45372d4f699b4be27d8 Mon Sep 17 00:00:00 2001 From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:43:45 +0530 Subject: [PATCH 3/4] limit --- terraform/ccnew/default-config/common-vars.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/ccnew/default-config/common-vars.yaml b/terraform/ccnew/default-config/common-vars.yaml index b251ed22b..1be083f72 100644 --- a/terraform/ccnew/default-config/common-vars.yaml +++ b/terraform/ccnew/default-config/common-vars.yaml @@ -49,10 +49,10 @@ netbird_log_level: info nexus_public_access: false nexus_storage_size: 30Gi -nexus_cpu_limit: "2000m" #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: "4Gi" -nexus_cpu_request: "4000m" -nexus_memory_request: "8Gi" +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" From 6c9439217309539726a3c334651027b97da8228f Mon Sep 17 00:00:00 2001 From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:42:41 +0530 Subject: [PATCH 4/4] nexus image version --- gitops/applications/base/nexus/nexus-values.yaml | 2 +- gitops/argo-apps/base/nexus.yaml | 5 ++++- .../ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl | 1 + terraform/ccnew/default-config/common-vars.yaml | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gitops/applications/base/nexus/nexus-values.yaml b/gitops/applications/base/nexus/nexus-values.yaml index 2f7c5ade8..5288c4c7b 100644 --- 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.75.1" + tag: ${ARGOCD_ENV_nexus_image_version} pullPolicy: IfNotPresent pullSecrets: [] diff --git a/gitops/argo-apps/base/nexus.yaml b/gitops/argo-apps/base/nexus.yaml index 733e3bb78..9a215906b 100644 --- a/gitops/argo-apps/base/nexus.yaml +++ b/gitops/argo-apps/base/nexus.yaml @@ -70,4 +70,7 @@ spec: value: "${ARGOCD_ENV_nexus_nexus_cpu_request}" - name: "nexus_memory_request" - value: "${ARGOCD_ENV_nexus_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 index 8413d955d..fad2ee8ad 100644 --- a/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl +++ b/terraform/ccnew/ansible-k8s-deploy/templates/argoapps.yaml.tpl @@ -165,6 +165,7 @@ 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}" diff --git a/terraform/ccnew/default-config/common-vars.yaml b/terraform/ccnew/default-config/common-vars.yaml index 1be083f72..4f5be5a38 100644 --- a/terraform/ccnew/default-config/common-vars.yaml +++ b/terraform/ccnew/default-config/common-vars.yaml @@ -47,6 +47,7 @@ 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