Skip to content

feat(argo-cd): Allow configuring resource requests/limits for copyutil initContainer in repo-server pod #3507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmeridth merged 5 commits into from
Sep 27, 2025
Merged

feat(argo-cd): Allow configuring resource requests/limits for copyutil initContainer in repo-server pod #3507

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08bb16a
feat(argo-cd): Allow configuring resource requests/limits for copyuti…
puretension Sep 26, 2025
90a1d7c
chore: retrigger CI
puretension Sep 26, 2025
34885f4
fix(argo-cd): Fix yamllint error by avoiding duplicate initContainers…
puretension Sep 26, 2025
13ff6ae
docs(argo-cd): Update README.md with helm-docs
puretension Sep 26, 2025
b995e0e
feat(argo-cd): Apply reviewer suggestions for copyutil resources
puretension Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/argo-cd/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: v3.1.7
kubeVersion: ">=1.25.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 8.5.6
version: 8.5.7
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
Expand All @@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: fixed
description: Add missing environment variable for v3.1.7
- kind: added
description: Allow configuring resource requests/limits for copyutil initContainer in repo-server pod
1 change: 1 addition & 0 deletions charts/argo-cd/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,7 @@ NAME: my-release
| repoServer.containerPorts.metrics | int | `8084` | Metrics container port |
| repoServer.containerPorts.server | int | `8081` | Repo server container port |
| repoServer.containerSecurityContext | object | See [values.yaml] | Repo server container-level security context |
| repoServer.copyutil | object | `{"resources":{}}` | Resource limits and requests for the copyutil initContainer |
| repoServer.deploymentAnnotations | object | `{}` | Annotations to be added to repo server Deployment |
| repoServer.deploymentLabels | object | `{}` | Labels for the repo server Deployment |
| repoServer.deploymentStrategy | object | `{}` | Deployment strategy to be added to the repo server Deployment |
Expand Down
4 changes: 4 additions & 0 deletions charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,11 @@ spec:
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
name: copyutil
resources:
{{- if .Values.repoServer.copyutil.resources }}
{{- toYaml .Values.repoServer.copyutil.resources | nindent 10 }}
{{- else }}
{{- toYaml .Values.repoServer.resources | nindent 10 }}
{{- end }}
Copy link
Copy Markdown
Collaborator

@yu-croco yu-croco Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is much simpler ?

Suggested change
{{- if .Values.repoServer.copyutil.resources }}
{{- toYaml .Values.repoServer.copyutil.resources | nindent 10 }}
{{- else }}
{{- toYaml .Values.repoServer.resources | nindent 10 }}
{{- end }}
{{- toYaml (default .Values.repoServer.resources .Values.repoServer.copyutil.resources) | nindent 10 }}

Copy link
Copy Markdown
Contributor Author

@puretension puretension Sep 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @yu-croco! Thanks for the really quick review!

I've applied your suggestions:

  • Used default function instead of if-else for cleaner template
  • Improved comment clarity in values.yaml

Much cleaner approach! 👍

{{- with .Values.repoServer.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 10 }}
Expand Down
10 changes: 10 additions & 0 deletions charts/argo-cd/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,6 +2793,16 @@ repoServer:
# -- Init containers to add to the repo server pods
initContainers: []

# -- Resource limits and requests for the copyutil initContainer
copyutil:
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 50m
# memory: 64Mi
Copy link
Copy Markdown
Collaborator

@yu-croco yu-croco Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment should be rendered correctly.

Suggested change
# -- Resource limits and requests for the copyutil initContainer
copyutil:
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 50m
# memory: 64Mi
copyutil:
# -- Resource limits and requests for the repo server copyutil initContainer
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 50m
# memory: 64Mi


# -- Additional volumeMounts to the repo server main container
volumeMounts: []

Expand Down
⚡