diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 21e0cdce..3726706e 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.4.14 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.5.20 +version: 5.5.21 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -22,5 +22,5 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Added]: API version override for PDB and Google Cloud." - - "[Changed]: Moved all API versions in dedicated helper." + - "[Fixed]: Init container for repo-server should use main container resources" + - "[Removed]: Section repoServer.copyutil that is no longer needed" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index e6f8b4fd..35b0b49d 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -490,7 +490,6 @@ 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/NOTES.txt b/charts/argo-cd/templates/NOTES.txt index bebdb822..81c64ce1 100644 --- a/charts/argo-cd/templates/NOTES.txt +++ b/charts/argo-cd/templates/NOTES.txt @@ -34,6 +34,9 @@ DEPRECATED option repoServer.logFormat - Use configs.params.repoServer.log.forma {{- if .Values.repoServer.logLevel }} DEPRECATED option repoServer.logLevel - Use configs.params.repoServer.log.level {{- end }} +{{- if .Values.repoServer.copyutil }} +REMOVED option repoSever.copyutil.resources - Use repoServer.resources +{{- end }} In order to access the server UI you have the following options: diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index a1f600dc..5a36842b 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -306,7 +306,7 @@ spec: image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }} imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }} name: copyutil - {{- with .Values.repoServer.copyutil.resources }} + {{- with .Values.repoServer.resources }} resources: {{- toYaml . | nindent 10 }} {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index bd9dd124..024a9ffe 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -1957,17 +1957,6 @@ 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