Skip to content

Commit b995e0e

Browse files
puretensionyu-croco
andcommitted
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 <yu.croco@gmail.com> Signed-off-by: puretension <rlrlfhtm5@gmail.com>
1 parent 13ff6ae commit b995e0e

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

charts/argo-cd/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +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 | object | `{"resources":{}}` | Resource limits and requests for the copyutil initContainer |
987+
| repoServer.copyutil.resources | object | `{}` | Resource limits and requests for the repo server copyutil initContainer |
988988
| repoServer.deploymentAnnotations | object | `{}` | Annotations to be added to repo server Deployment |
989989
| repoServer.deploymentLabels | object | `{}` | Labels for the repo server Deployment |
990990
| 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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,7 @@ spec:
412412
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
413413
name: copyutil
414414
resources:
415-
{{- if .Values.repoServer.copyutil.resources }}
416-
{{- toYaml .Values.repoServer.copyutil.resources | nindent 10 }}
417-
{{- else }}
418-
{{- toYaml .Values.repoServer.resources | nindent 10 }}
419-
{{- end }}
415+
{{- toYaml (default .Values.repoServer.resources .Values.repoServer.copyutil.resources) | nindent 10 }}
420416
{{- with .Values.repoServer.containerSecurityContext }}
421417
securityContext:
422418
{{- toYaml . | nindent 10 }}

charts/argo-cd/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2793,8 +2793,8 @@ repoServer:
27932793
# -- Init containers to add to the repo server pods
27942794
initContainers: []
27952795

2796-
# -- Resource limits and requests for the copyutil initContainer
27972796
copyutil:
2797+
# -- Resource limits and requests for the repo server copyutil initContainer
27982798
resources: {}
27992799
# limits:
28002800
# cpu: 100m

0 commit comments

Comments
 (0)