Skip to content

Commit a640fb3

Browse files
feat(argo-cd): Allow configuring resource requests/limits for copyutil initContainer in repo-server pod (#3507)
* feat(argo-cd): Allow configuring resource requests/limits for copyutil initContainer in repo-server pod - Add repoServer.initContainers.copyutil.resources configuration option - Update deployment template to use separate resources for copyutil initContainer - Fallback to repoServer.resources if copyutil resources not specified - Bump chart version to 8.5.7 Fixes #3504 Signed-off-by: puretension <[email protected]> * chore: retrigger CI Signed-off-by: puretension <[email protected]> * fix(argo-cd): Fix yamllint error by avoiding duplicate initContainers key - Move copyutil resources config to repoServer.copyutil.resources - Avoid duplication with existing initContainers array - Update deployment template accordingly Signed-off-by: puretension <[email protected]> * docs(argo-cd): Update README.md with helm-docs Signed-off-by: puretension <[email protected]> * feat(argo-cd): Apply reviewer suggestions for copyutil resources - Move comment to be more specific about repo server copyutil - Use default function instead of if-else for cleaner template - Update README.md with helm-docs Co-authored-by: Aikawa <[email protected]> Signed-off-by: puretension <[email protected]> --------- Signed-off-by: puretension <[email protected]> Co-authored-by: Aikawa <[email protected]>
1 parent 5f06a6d commit a640fb3

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v3.1.7
33
kubeVersion: ">=1.25.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 8.5.6
6+
version: 8.5.7
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -26,5 +26,5 @@ annotations:
2626
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
29-
- kind: fixed
30-
description: Add missing environment variable for v3.1.7
29+
- kind: added
30+
description: Allow configuring resource requests/limits for copyutil initContainer in repo-server pod

charts/argo-cd/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ NAME: my-release
984984
| repoServer.containerPorts.metrics | int | `8084` | Metrics container port |
985985
| repoServer.containerPorts.server | int | `8081` | Repo server container port |
986986
| repoServer.containerSecurityContext | object | See [values.yaml] | Repo server container-level security context |
987+
| repoServer.copyutil.resources | object | `{}` | Resource limits and requests for the repo server copyutil initContainer |
987988
| repoServer.deploymentAnnotations | object | `{}` | Annotations to be added to repo server Deployment |
988989
| repoServer.deploymentLabels | object | `{}` | Labels for the repo server Deployment |
989990
| repoServer.deploymentStrategy | object | `{}` | Deployment strategy to be added to the repo server Deployment |

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ spec:
412412
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
413413
name: copyutil
414414
resources:
415-
{{- toYaml .Values.repoServer.resources | nindent 10 }}
415+
{{- toYaml (default .Values.repoServer.resources .Values.repoServer.copyutil.resources) | nindent 10 }}
416416
{{- with .Values.repoServer.containerSecurityContext }}
417417
securityContext:
418418
{{- toYaml . | nindent 10 }}

charts/argo-cd/values.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2793,6 +2793,16 @@ repoServer:
27932793
# -- Init containers to add to the repo server pods
27942794
initContainers: []
27952795

2796+
copyutil:
2797+
# -- Resource limits and requests for the repo server copyutil initContainer
2798+
resources: {}
2799+
# limits:
2800+
# cpu: 100m
2801+
# memory: 128Mi
2802+
# requests:
2803+
# cpu: 50m
2804+
# memory: 64Mi
2805+
27962806
# -- Additional volumeMounts to the repo server main container
27972807
volumeMounts: []
27982808

0 commit comments

Comments
 (0)