From 103914446e778a625f0239c4ac797236d8255ee2 Mon Sep 17 00:00:00 2001 From: Eugene Lugovtsov <34510252+EugeneLugovtsov@users.noreply.github.com> Date: Sat, 11 Dec 2021 21:28:08 +0200 Subject: [PATCH] feat(argo-cd): Add support for argocd-extensions resources (#1053) * add support for extensions resource Signed-off-by: Yevhen Luhovtsov * fix documentation for extensions resource Signed-off-by: Yevhen Luhovtsov Co-authored-by: Yevhen Luhovtsov --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 1 + charts/argo-cd/templates/argocd-server/deployment.yaml | 2 ++ charts/argo-cd/values.yaml | 9 +++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index e794655a..cb37edb8 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.1.7 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.28.0 +version: 3.28.1 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Added]: add extensions support" + - "[Added]: add argocd-extensions resources support" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 0aae3295..caece20b 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -399,6 +399,7 @@ NAME: my-release | server.extensions.image.imagePullPolicy | string | `"IfNotPresent"` | Image pull policy for extensions | | server.extensions.image.repository | string | `"ghcr.io/argoproj-labs/argocd-extensions"` | Repository to use for extensions image | | server.extensions.image.tag | string | `"v0.1.0"` | Tag to use for extensions image | +| server.extensions.resources | object | `{}` | Resource limits and requests for the argocd-extensions container | | server.extraArgs | list | `[]` | Additional command line arguments to pass to Argo CD server | | server.extraContainers | list | `[]` | Additional containers to be added to the server pod | | server.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Argo CD server | diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 426093fa..64190910 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -143,6 +143,8 @@ spec: volumeMounts: - name: extensions mountPath: /tmp/extensions/ + resources: + {{- toYaml .Values.server.extensions.resources | nindent 10 }} {{- end }} {{- if .Values.server.nodeSelector }} nodeSelector: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 2cf1c61e..58e2d52c 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -1289,6 +1289,15 @@ server: # -- Image pull policy for extensions imagePullPolicy: IfNotPresent + # -- Resource limits and requests for the argocd-extensions container + resources: {} + # limits: + # cpu: 50m + # memory: 128Mi + # requests: + # cpu: 10m + # memory: 64Mi + # -- Extensions to be loaded into the server contents: [] # - name: argo-rollouts