diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index e4cb814c..1f21a8ae 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v1 appVersion: "1.2.3" description: A Helm chart for Argo-CD name: argo-cd -version: 0.6.1 +version: 0.7.1 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 4db2516a..52bd4afb 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -75,6 +75,8 @@ $ helm install --name my-release argo/argo-cd | repoServer.servicePort | int | `8081` | Service port for repo server | | repoServer.volumeMounts | list | `[]` | Additional volume mounts | | repoServer.volumes | list | `[]` | Additional volumes | +| repoServer.initContainers | list | `[]` | Initialisation containers, see [values.yaml](./values.yaml) for syntax for Helm v2.12.3 | +| repoServer.imagePullSecrets | list | `[]` | List of image pull secrets, see [values.yaml](./values.yaml) for syntax for a secret called "docker-auth-secret" | | server.annotations | object | `{}` | Annotations for the server deployment | | server.containerPort | int | `8080` | Container port for server | | server.extraArgs | list | `[]` | Add additional arguments | diff --git a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml index 2dcc1a79..51c28d62 100644 --- a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml @@ -59,3 +59,11 @@ spec: {{- if .Values.repoServer.volumes }} {{ toYaml .Values.repoServer.volumes | nindent 6 | trim }} {{- end }} + {{- if .Values.repoServer.initContainers }} + initContainers: + {{ toYaml .Values.repoServer.initContainers | nindent 6 | trim }} + {{- end }} + {{- if .Values.repoServer.imagePullSecrets }} + imagePullSecrets: + {{ toYaml .Values.repoServer.imagePullSecrets | nindent 6 | trim }} + {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml index a25f2b8c..1a94ecba 100644 --- a/charts/argo-cd/templates/argocd-server-deployment.yaml +++ b/charts/argo-cd/templates/argocd-server-deployment.yaml @@ -74,3 +74,4 @@ spec: {{- if .Values.server.volumes }} {{ toYaml .Values.server.volumes | nindent 6 | trim }} {{- end }} + diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index bbdd8ec6..32e131a4 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -38,6 +38,20 @@ repoServer: pullPolicy: Always volumeMounts: [] volumes: [] + # - name: custom-tools + # emptyDir: {} + initContainers: [] + # - name: download-tools + # image: alpine:3.8 + # command: [sh, -c] + # args: + # - wget -qO- https://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz | tar -xvzf - && + # mv linux-amd64/helm /custom-tools/ + # volumeMounts: + # - mountPath: /custom-tools + # name: custom-tools + imagePullSecrets: [] + # - name: docker-auth-secret dexServer: containerPortHttp: 5556