From 818cf41bc409a4c84c7aa0bfe026cb9c877adbeb Mon Sep 17 00:00:00 2001 From: Marko Bevc Date: Tue, 1 Jun 2021 21:25:34 +0100 Subject: [PATCH 1/6] chore: Nominate mbevc1 as an approver (#767) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Oliver Bähler Co-authored-by: Marco Kilchhofer --- CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index dbba7a58..016e7842 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -7,7 +7,7 @@ /charts/argo-workflows/ @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler # Argo CD -/charts/argo-cd @seanson @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler +/charts/argo-cd @seanson @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler @mbevc1 # Argo Events /charts/argo-events @jbehling @VaibhavPage @oliverbaehler @@ -16,4 +16,4 @@ /charts/argo-rollouts @oliverbaehler # Argo CD Notifications -/charts/argocd-notifications @alexmt @andyfeller @oliverbaehler +/charts/argocd-notifications @alexmt @andyfeller @oliverbaehler @mbevc1 From 44aa7ed71028d1dda5f7fe82f3515250bd9c70f7 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Wed, 2 Jun 2021 19:54:48 +0200 Subject: [PATCH 2/6] docs(argo-cd): Dex ServiceMonitor labels, namespace and selector (#726) * Add: serviceMonitor labels and selector Signed-off-by: Nicolas Lamirault * Update: bump chart version Signed-off-by: Nicolas Lamirault * Apply suggestions from code review Signed-off-by: Marco Kilchhofer Co-authored-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/values.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 74db87f5..465ad6e0 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.3 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.6.5 +version: 3.6.6 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/values.yaml b/charts/argo-cd/values.yaml index 63e6d75d..fdd50b36 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -214,6 +214,10 @@ dex: serviceMonitor: enabled: false interval: 30s + # selector: + # prometheus: kube-prometheus + # namespace: monitoring + # additionalLabels: {} image: repository: ghcr.io/dexidp/dex From 03140b36fcef6e0268b72fc73345edd9c642e85f Mon Sep 17 00:00:00 2001 From: Sergey Shaykhullin <46970457+sergeyshaykhullin@users.noreply.github.com> Date: Thu, 3 Jun 2021 13:07:47 +0300 Subject: [PATCH 3/6] feat(argocd-notifications): Add metrics service labels and annotations (#783) * feat(argocd-notifications): Add metrics service labels and annotations Signed-off-by: Sergey Shaykhullin * Update charts/argocd-notifications/templates/service-metrics.yaml Co-authored-by: Marco Kilchhofer Signed-off-by: Sergey Shaykhullin * Update charts/argocd-notifications/templates/service-metrics.yaml Co-authored-by: Marco Kilchhofer Signed-off-by: Sergey Shaykhullin * Update _helpers.tpl Signed-off-by: Sergey Shaykhullin * Update _helpers.tpl Signed-off-by: Sergey Shaykhullin * Delete templated.yaml Signed-off-by: Sergey Shaykhullin Co-authored-by: Marco Kilchhofer --- charts/argocd-notifications/Chart.yaml | 2 +- charts/argocd-notifications/templates/service-metrics.yaml | 7 +++++++ charts/argocd-notifications/values.yaml | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 9be1b26b..cf33a5d9 100644 --- a/charts/argocd-notifications/Chart.yaml +++ b/charts/argocd-notifications/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.1.1 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD. name: argocd-notifications type: application -version: 1.3.2 +version: 1.4.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/argocd-notifications/templates/service-metrics.yaml b/charts/argocd-notifications/templates/service-metrics.yaml index 5645a4d3..aea5d90e 100644 --- a/charts/argocd-notifications/templates/service-metrics.yaml +++ b/charts/argocd-notifications/templates/service-metrics.yaml @@ -5,6 +5,13 @@ metadata: name: {{ include "argocd-notifications.name" . }}-metrics labels: {{- include "argocd-notifications.metrics.labels" . | nindent 4 }} + {{- with .Values.metrics.service.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.metrics.service.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: {{- include "argocd-notifications.selectorLabels" . | nindent 4 }} diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml index f258401f..ff5ca14d 100644 --- a/charts/argocd-notifications/values.yaml +++ b/charts/argocd-notifications/values.yaml @@ -52,6 +52,9 @@ extraArgs: [] metrics: enabled: false port: 9001 + service: + annotations: {} + labels: {} serviceMonitor: enabled: false additionalLabels: {} From 603f2aa8ef2488fdf0ed40181b8d96826e03bda9 Mon Sep 17 00:00:00 2001 From: Aikawa Date: Thu, 3 Jun 2021 20:08:12 +0900 Subject: [PATCH 4/6] docs(argo-workflows): Add missing value on values.yaml (#782) * chore(argo-workflows): Add missing value Signed-off-by: yu-croco * reflect review: make it shorter and clearer. Signed-off-by: yu-croco * Apply suggestions from code review Signed-off-by: Marco Kilchhofer * Apply suggestions from code review Signed-off-by: Marco Kilchhofer Co-authored-by: Marco Kilchhofer --- charts/argo-workflows/Chart.yaml | 2 +- charts/argo-workflows/values.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml index 6a33bfe4..cc7f7c86 100644 --- a/charts/argo-workflows/Chart.yaml +++ b/charts/argo-workflows/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argo-workflows description: A Helm chart for Argo Workflows type: application -version: 0.2.2 +version: 0.2.3 appVersion: "v3.0.2" icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml index e2ce2e71..7de0dfea 100644 --- a/charts/argo-workflows/values.yaml +++ b/charts/argo-workflows/values.yaml @@ -12,6 +12,14 @@ init: createAggregateRoles: true +## String to partially override "argo-workflows.fullname" template +## +nameOverride: + +## String to fully override "argo-workflows.fullname" template +## +fullnameOverride: + # Restrict Argo to only deploy into a single namespace by apply Roles and RoleBindings instead of the Cluster equivalents, # and start argo-cli with the --namespaced flag. Use it in clusters with strict access policy. singleNamespace: false From afe72167fb4f74021a5b47b05626d38404989fe4 Mon Sep 17 00:00:00 2001 From: Marco Kilchhofer Date: Thu, 3 Jun 2021 19:10:55 +0200 Subject: [PATCH 5/6] fix(argo-workflows): Observe 'controller.serviceAccount.create' (#787) * fix(argo-workflows): Observe 'controller.serviceAccount.create' Signed-off-by: Marco Kilchhofer * chore: Ignore ci/ directory in final package Signed-off-by: Marco Kilchhofer --- charts/argo-workflows/.helmignore | 1 + charts/argo-workflows/Chart.yaml | 2 +- .../templates/controller/workflow-controller-sa.yaml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/argo-workflows/.helmignore b/charts/argo-workflows/.helmignore index f0c13194..b4af6c20 100644 --- a/charts/argo-workflows/.helmignore +++ b/charts/argo-workflows/.helmignore @@ -19,3 +19,4 @@ .project .idea/ *.tmproj +ci/ diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml index cc7f7c86..078b42b2 100644 --- a/charts/argo-workflows/Chart.yaml +++ b/charts/argo-workflows/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argo-workflows description: A Helm chart for Argo Workflows type: application -version: 0.2.3 +version: 0.2.4 appVersion: "v3.0.2" icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml b/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml index e917bb41..f5e10857 100644 --- a/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml +++ b/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml @@ -1,3 +1,4 @@ +{{- if .Values.controller.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: @@ -6,3 +7,4 @@ metadata: annotations: {{- toYaml .| nindent 4 }} {{- end }} +{{- end }} From be8f33c8722c512d438d61166f6ee73213415240 Mon Sep 17 00:00:00 2001 From: Josh Hudson <382062+itmustbejj@users.noreply.github.com> Date: Thu, 3 Jun 2021 10:50:20 -0700 Subject: [PATCH 6/6] feat(argocd-applicationset): Add priorityClass for argocd-applicationset (#788) Signed-off-by: Josh Hudson <382062+itmustbejj@users.noreply.github.com> --- charts/argocd-applicationset/Chart.yaml | 2 +- charts/argocd-applicationset/templates/deployment.yaml | 3 +++ charts/argocd-applicationset/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argocd-applicationset/Chart.yaml b/charts/argocd-applicationset/Chart.yaml index 936734b0..2596addb 100644 --- a/charts/argocd-applicationset/Chart.yaml +++ b/charts/argocd-applicationset/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argocd-applicationset description: A Helm chart for installing ArgoCD ApplicationSet type: application -version: 0.1.5 +version: 0.1.6 appVersion: "v0.1.0" home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png diff --git a/charts/argocd-applicationset/templates/deployment.yaml b/charts/argocd-applicationset/templates/deployment.yaml index d2cd345c..4840bd65 100644 --- a/charts/argocd-applicationset/templates/deployment.yaml +++ b/charts/argocd-applicationset/templates/deployment.yaml @@ -98,3 +98,6 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.priorityClassName }} + priorityClassName: {{ . }} + {{- end }} diff --git a/charts/argocd-applicationset/values.yaml b/charts/argocd-applicationset/values.yaml index f7be897d..1be0c0ff 100644 --- a/charts/argocd-applicationset/values.yaml +++ b/charts/argocd-applicationset/values.yaml @@ -71,6 +71,8 @@ tolerations: [] affinity: {} +priorityClassName: "" + mountSSHKnownHostsVolume: true mountTLSCertsVolume: true mountGPGKeysVolume: false