From 66194fd35f68c1592fe0f67f796adac0d14d383d Mon Sep 17 00:00:00 2001 From: Sven Haardiek Date: Wed, 19 Jan 2022 20:25:58 +0100 Subject: [PATCH] Add resources to copyutil initContainer (#1093) Signed-off-by: Sven Haardiek Co-authored-by: Marko Bevc --- charts/argo-cd/Chart.yaml | 5 ++--- charts/argo-cd/README.md | 1 + .../templates/argocd-repo-server/deployment.yaml | 2 ++ charts/argo-cd/values.yaml | 11 +++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index d4873d92..55a8b9e4 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.2.2 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.30.0 +version: 3.30.1 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,5 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Added]: Add support for Google ManagedCertificate on GKE - - "[Added]: Add support for Google FrontendConfig on GKE + - "[Added]: Add configurable resources to copyutil initContainer" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index f340e2a3..4187abbc 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -316,6 +316,7 @@ NAME: my-release | repoServer.clusterRoleRules.rules | list | `[]` | List of custom rules for the Repo server's Cluster Role resource | | repoServer.containerPort | int | `8081` | Configures the repo server port | | repoServer.containerSecurityContext | object | `{}` | Repo server container-level security context | +| repoServer.copyutil.resources | object | `{}` | Resource limits and requests for the copyutil initContainer | | repoServer.env | list | `[]` | Environment variables to pass to repo server | | repoServer.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to repo server | | repoServer.extraArgs | list | `[]` | Additional command line arguments to pass to repo server | diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 85e09fd4..a18f21b6 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -191,6 +191,8 @@ spec: - /var/run/argocd/argocd-cmp-server image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }} name: copyutil + resources: + {{- toYaml .Values.repoServer.copyutil.resources | nindent 10 }} volumeMounts: - mountPath: /var/run/argocd name: var-files diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 8042e141..5b08cc06 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -1535,6 +1535,17 @@ repoServer: # - list # - watch + # Init container to copy argocd binary + copyutil: + # -- Resource limits and requests for the copyutil initContainer + resources: {} + # limits: + # cpu: 50m + # memory: 64Mi + # requests: + # cpu: 10m + # memory: 32Mi + # -- Init containers to add to the repo server pods initContainers: [] # - name: download-tools