From 548a8c5c1d8b64c1038ccc6be51eefd3e320f0c8 Mon Sep 17 00:00:00 2001 From: Sergiy Gavrylenko Date: Wed, 5 May 2021 11:08:19 +0300 Subject: [PATCH 1/8] add context variable for templating purpose Signed-off-by: Sergiy Gavrylenko Signed-off-by: Sergiy Gavrylenko --- charts/argocd-notifications/templates/configmap.yaml | 3 +++ charts/argocd-notifications/values.yaml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/charts/argocd-notifications/templates/configmap.yaml b/charts/argocd-notifications/templates/configmap.yaml index 442234bcf..f9e069660 100644 --- a/charts/argocd-notifications/templates/configmap.yaml +++ b/charts/argocd-notifications/templates/configmap.yaml @@ -8,6 +8,9 @@ metadata: data: context: | argocdUrl: {{ .Values.argocdUrl | quote }} + {{- with .Values.context }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.notifiers }} {{- toYaml . | nindent 2 }} {{- end }} diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml index ace4c84e6..bfe746c37 100644 --- a/charts/argocd-notifications/values.yaml +++ b/charts/argocd-notifications/values.yaml @@ -19,6 +19,11 @@ nodeSelector: {} updateStrategy: type: Recreate +context: + # Add custom values into context + # region: east + # environmentName: staging + secret: # Whether helm chart creates controller secret create: true From e4038baeb16e3b1765f331eb638ee0b995e09c3c Mon Sep 17 00:00:00 2001 From: Sergiy Gavrylenko Date: Wed, 5 May 2021 11:16:07 +0300 Subject: [PATCH 2/8] update version of argocd-notification chart Signed-off-by: Sergiy Gavrylenko Signed-off-by: Sergiy Gavrylenko --- charts/argocd-notifications/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 12c03d530..777025e3c 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.2.0 +version: 1.2.1 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: From e9c15627e22839526b362642bd8e5d35f8cc1a7a Mon Sep 17 00:00:00 2001 From: jandersen-plaid <52045989+jandersen-plaid@users.noreply.github.com> Date: Wed, 5 May 2021 18:59:18 -0400 Subject: [PATCH 3/8] fix: spec.preserveUnknownFields must be set to false to allow upgrades from v1beta1 (#709) Signed-off-by: Jack Andersen Signed-off-by: Sergiy Gavrylenko --- charts/argo-rollouts/Chart.yaml | 2 +- charts/argo-rollouts/templates/crds/analysis-run-crd.yaml | 1 + charts/argo-rollouts/templates/crds/analysis-template-crd.yaml | 1 + .../templates/crds/cluster-analysis-template-crd.yaml | 1 + charts/argo-rollouts/templates/crds/experiment-crd.yaml | 1 + charts/argo-rollouts/templates/crds/rollout-crd.yaml | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index bf8cd3b3d..992698377 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.10.2" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 0.5.0 +version: 0.5.1 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml index 0ddf3ca36..b70b6f0bb 100644 --- a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - ar singular: analysisrun + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: diff --git a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml index 0854fc4c0..4712ae2db 100644 --- a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - at singular: analysistemplate + preserveUnknownFields: false scope: Namespaced versions: - name: v1alpha1 diff --git a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml index dd9d89cde..72832f030 100644 --- a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - cat singular: clusteranalysistemplate + preserveUnknownFields: false scope: Cluster versions: - name: v1alpha1 diff --git a/charts/argo-rollouts/templates/crds/experiment-crd.yaml b/charts/argo-rollouts/templates/crds/experiment-crd.yaml index 6fec00abf..1fa5b261f 100644 --- a/charts/argo-rollouts/templates/crds/experiment-crd.yaml +++ b/charts/argo-rollouts/templates/crds/experiment-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - exp singular: experiment + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: diff --git a/charts/argo-rollouts/templates/crds/rollout-crd.yaml b/charts/argo-rollouts/templates/crds/rollout-crd.yaml index 01eaccaca..888ca5999 100644 --- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml +++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml @@ -17,6 +17,7 @@ spec: shortNames: - ro singular: rollout + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: From 6b3cfe900211133ddce3301e483846f7cfd18222 Mon Sep 17 00:00:00 2001 From: cskh Date: Fri, 7 May 2021 13:29:36 -0400 Subject: [PATCH 4/8] feat: add resources to argo-rollouts deployment (#711) - add destinationrule to clusterrolebinding Signed-off-by: Hui Kang Co-authored-by: Hui Kang Signed-off-by: Sergiy Gavrylenko --- charts/argo-rollouts/Chart.yaml | 2 +- charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml | 1 + charts/argo-rollouts/templates/argo-rollouts-deployment.yaml | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index 992698377..84752bf32 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.10.2" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 0.5.1 +version: 0.5.2 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml index b9595710f..c3fb9f0c7 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml @@ -130,6 +130,7 @@ rules: - networking.istio.io resources: - virtualservices + - destinationrules verbs: - watch - get diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml index dd04516a8..1c4342bf5 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml @@ -38,6 +38,10 @@ spec: imagePullPolicy: {{ .Values.controller.image.pullPolicy }} name: {{ .Values.controller.name }} resources: +{{- toYaml .Values.controller.resources | nindent 10 }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + resources: {{- toYaml .Values.controller.resources | nindent 10 }} {{- if .Values.controller.nodeSelector }} nodeSelector: From 30a4dcd3636313fd7535d2be0ff4dcd8a06d17a4 Mon Sep 17 00:00:00 2001 From: Alec Rajeev Date: Sun, 9 May 2021 15:55:53 -0400 Subject: [PATCH 5/8] chore(argo-events): update argo-events to 1.3.3 (#720) Signed-off-by: Alec Rajeev Signed-off-by: Sergiy Gavrylenko --- charts/argo-events/Chart.yaml | 4 ++-- charts/argo-events/values.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index c9f2ae120..5def36c74 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 1.3.3 +version: 1.4.0 keywords: - argo-events - sensor-controller @@ -12,6 +12,6 @@ sources: maintainers: - name: VaibhavPage - name: whynowy -appVersion: 1.2.3 +appVersion: 1.3.1 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index b786e2606..a54ec0107 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -45,7 +45,7 @@ singleNamespace: true sensorController: name: sensor-controller image: sensor-controller - tag: v1.2.3 + tag: v1.3.1 replicaCount: 1 sensorImage: sensor podAnnotations: {} @@ -58,7 +58,7 @@ sensorController: eventsourceController: name: eventsource-controller image: eventsource-controller - tag: v1.2.3 + tag: v1.3.1 replicaCount: 1 eventsourceImage: eventsource podAnnotations: {} @@ -71,7 +71,7 @@ eventsourceController: eventbusController: name: eventbus-controller image: eventbus-controller - tag: v1.2.3 + tag: v1.3.1 replicaCount: 1 podAnnotations: {} nodeSelector: {} From f69d800436e8720eb3a6f398b31aa2129956899f Mon Sep 17 00:00:00 2001 From: aniekgul Date: Sun, 9 May 2021 16:05:51 -0400 Subject: [PATCH 6/8] chore(argo-cd): upgrade redis-ha version to 4.12.14 (#710) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aniek Gul Co-authored-by: Oliver Bähler Signed-off-by: Sergiy Gavrylenko --- charts/argo-cd/Chart.lock | 6 +++--- charts/argo-cd/Chart.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.lock b/charts/argo-cd/Chart.lock index 497aa2971..52941728d 100644 --- a/charts/argo-cd/Chart.lock +++ b/charts/argo-cd/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: redis-ha repository: https://dandydeveloper.github.io/charts/ - version: 4.10.4 -digest: sha256:e36321520ffd6f91962b0bcfeae947a86983d6b6d273eb616f08425e2b8ab9c2 -generated: "2021-04-14T13:41:16.151666-07:00" + version: 4.12.14 +digest: sha256:34275a4f4df92c570d07b0553da5d1fa200b6f057f7091746c853fd7399ee30a +generated: "2021-05-03T16:02:41.4356045-04:00" diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 766578efe..584ef6e2f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.2.2 +version: 3.2.3 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: @@ -16,6 +16,6 @@ maintainers: - name: seanson dependencies: - name: redis-ha - version: 4.10.4 + version: 4.12.14 repository: https://dandydeveloper.github.io/charts/ condition: redis-ha.enabled From e11cc3bb0563bf61cfacd2163a11345a5b75dd68 Mon Sep 17 00:00:00 2001 From: sgavrylenko <13081190+sgavrylenko@users.noreply.github.com> Date: Mon, 10 May 2021 21:22:05 +0300 Subject: [PATCH 7/8] Update charts/argocd-notifications/Chart.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Oliver Bähler Signed-off-by: Sergiy Gavrylenko --- charts/argocd-notifications/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 777025e3c..8a1e04d8b 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.2.1 +version: 1.3.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: From bba336e6f9b9ea16ca3354b41910d051dcb253e0 Mon Sep 17 00:00:00 2001 From: sgavrylenko <13081190+sgavrylenko@users.noreply.github.com> Date: Mon, 10 May 2021 21:22:19 +0300 Subject: [PATCH 8/8] Update charts/argocd-notifications/templates/configmap.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Oliver Bähler Signed-off-by: Sergiy Gavrylenko --- charts/argocd-notifications/templates/configmap.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/argocd-notifications/templates/configmap.yaml b/charts/argocd-notifications/templates/configmap.yaml index f9e069660..37f95b533 100644 --- a/charts/argocd-notifications/templates/configmap.yaml +++ b/charts/argocd-notifications/templates/configmap.yaml @@ -8,9 +8,9 @@ metadata: data: context: | argocdUrl: {{ .Values.argocdUrl | quote }} - {{- with .Values.context }} - {{- toYaml . | nindent 4 }} - {{- end }} + {{- with .Values.context }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.notifiers }} {{- toYaml . | nindent 2 }} {{- end }} @@ -24,4 +24,4 @@ data: {{- with .Values.triggers }} {{- toYaml . | nindent 2 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }}