From 2dec8e44f712a04315020446dbede21670003652 Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Mon, 6 Apr 2020 09:13:40 -0700 Subject: [PATCH 1/2] feat: Add support for extra arguments to Argo Server (#271) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-deployment.yaml | 3 +++ charts/argo/values.yaml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 7aabd888..33604dcb 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.6.1" description: A Helm chart for Argo Workflows name: argo -version: 0.7.2 +version: 0.7.3 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml index 182c6edb..bbf82dd1 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -31,6 +31,9 @@ spec: - name: argo-server args: - server + {{- if .Values.server.extraArgs }} + {{- toYaml .Values.server.extraArgs | nindent 10 }} + {{- end }} image: "{{ .Values.images.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}" imagePullPolicy: {{ .Values.images.pullPolicy }} {{- if .Values.server.podPortName }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index bdc7d697..e1bb1376 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -143,6 +143,9 @@ server: tolerations: [] affinity: {} + # Extra arguments to provide to the Argo server binary. + extraArgs: [] + ## Ingress configuration. ## ref: https://kubernetes.io/docs/user-guide/ingress/ ## From f89527b21b1c7bd8c1edb6d3de2d8e383affe3c0 Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Tue, 7 Apr 2020 15:39:29 +0200 Subject: [PATCH 2/2] chore: bump Argo CD Docker image tag to v1.5.1 (#293) --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 2 +- charts/argo-cd/values.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 23b3695c..3e61a38b 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.4.2" +appVersion: "1.5.1" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.0.3 +version: 2.1.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 3a6123c9..591d9314 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -57,7 +57,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i |-----|------|---------| | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | -| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.2"` | +| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.5.1"` | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |  | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |  | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 0f810c1a..07bbfb7e 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: argoproj/argocd - tag: v1.4.2 + tag: v1.5.1 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 @@ -28,7 +28,7 @@ controller: image: repository: # argoproj/argocd - tag: # v1.4.2 + tag: # v1.5.1 imagePullPolicy: # IfNotPresent ## Argo controller commandline flags @@ -301,7 +301,7 @@ server: image: repository: # argoproj/argocd - tag: # v1.4.2 + tag: # v1.5.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-server @@ -556,7 +556,7 @@ repoServer: image: repository: # argoproj/argocd - tag: # v1.4.2 + tag: # v1.5.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-repo-server