fix(argo-cd): Revert initContainers copyUtil param (#1063)

* fix(argo-cd): Revert initContainers copyUtil param

Signed-off-by: Marko Bevc <marko@scalefactory.com>

* Use correct keyword in annotations

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marko Bevc 2021-12-18 22:08:57 +00:00 committed by GitHub
parent 0dc0b845a3
commit e6a0802f4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 10 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.2.1 appVersion: v2.2.1
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.29.2 version: 3.29.3
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords: keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Fix]: repo-server: merge initContainer to one section" - "[Fixed]: repo-server: revert initContainer copyutil param"

View file

@ -316,7 +316,6 @@ NAME: my-release
| repoServer.clusterRoleRules.rules | list | `[]` | List of custom rules for the Repo server's Cluster Role resource | | 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.containerPort | int | `8081` | Configures the repo server port |
| repoServer.containerSecurityContext | object | `{}` | Repo server container-level security context | | repoServer.containerSecurityContext | object | `{}` | Repo server container-level security context |
| repoServer.enableCopyutilInitContainer | bool | `true` | Enable the copyutil init container |
| repoServer.env | list | `[]` | Environment variables to pass to repo server | | repoServer.env | list | `[]` | Environment variables to pass to repo server |
| repoServer.envFrom | list | `[]` (See [values.yaml]) | envFrom 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 | | repoServer.extraArgs | list | `[]` | Additional command line arguments to pass to repo server |

View file

@ -183,9 +183,7 @@ spec:
name: var-files name: var-files
- emptyDir: {} - emptyDir: {}
name: plugins name: plugins
{{- if or .Values.repoServer.initContainers .Values.repoServer.enableCopyutilInitContainer }}
initContainers: initContainers:
{{- if .Values.repoServer.enableCopyutilInitContainer }}
- command: - command:
- cp - cp
- -n - -n
@ -196,11 +194,9 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /var/run/argocd - mountPath: /var/run/argocd
name: var-files name: var-files
{{- end }}
{{- if .Values.repoServer.initContainers }} {{- if .Values.repoServer.initContainers }}
{{- toYaml .Values.repoServer.initContainers | nindent 6 }} {{- toYaml .Values.repoServer.initContainers | nindent 6 }}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.repoServer.priorityClassName }} {{- if .Values.repoServer.priorityClassName }}
priorityClassName: {{ .Values.repoServer.priorityClassName }} priorityClassName: {{ .Values.repoServer.priorityClassName }}
{{- end }} {{- end }}

View file

@ -1530,9 +1530,6 @@ repoServer:
# name: custom-tools # name: custom-tools
# subPath: helm # subPath: helm
# -- Enable the copyutil init container
enableCopyutilInitContainer: true
## Argo Configs ## Argo Configs
configs: configs:
# -- Provide one or multiple [external cluster credentials] # -- Provide one or multiple [external cluster credentials]