From 9e2c134225e37b78598696d69b0bcdfde3590246 Mon Sep 17 00:00:00 2001 From: John Behling Date: Thu, 24 Oct 2019 16:56:50 -0500 Subject: [PATCH 1/4] [argo-events] Use serviceAccount variable for serviceAccount naming (#134) --- charts/argo-events/Chart.yaml | 2 +- charts/argo-events/templates/argo-events-cluster-roles.yaml | 4 ++-- charts/argo-events/templates/argo-events-sa.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index cdb6dde0..4d7f9aa4 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 0.5.0 +version: 0.5.1 keywords: - argo-events - sensor-controller diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/charts/argo-events/templates/argo-events-cluster-roles.yaml index d5f119ec..c7a47254 100644 --- a/charts/argo-events/templates/argo-events-cluster-roles.yaml +++ b/charts/argo-events/templates/argo-events-cluster-roles.yaml @@ -8,12 +8,12 @@ roleRef: name: argo-events-role subjects: - kind: ServiceAccount - name: argo-events-sa + name: {{ .Values.serviceAccount }} namespace: {{ .Release.Namespace }} {{- if .Values.additionalSaNamespaces }} {{- range $namespace := .Values.additionalSaNamespaces }} - kind: ServiceAccount - name: argo-events-sa + name: {{ .Values.serviceAccount }} namespace: {{ $namespace }} {{- end }} {{- end }} diff --git a/charts/argo-events/templates/argo-events-sa.yaml b/charts/argo-events/templates/argo-events-sa.yaml index 5855b0c7..04a39f51 100644 --- a/charts/argo-events/templates/argo-events-sa.yaml +++ b/charts/argo-events/templates/argo-events-sa.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: argo-events-sa + name: {{ .Values.serviceAccount }} namespace: {{ .Release.Namespace }} {{- if .Values.additionalSaNamespaces }} {{- range $namespace := .Values.additionalSaNamespaces }} @@ -11,7 +11,7 @@ metadata: apiVersion: v1 kind: ServiceAccount metadata: - name: argo-events-sa + name: {{ .Values.serviceAccount }} namespace: {{ $namespace }} {{- end }} {{- end }} \ No newline at end of file From c7bad6816eddd3adf3024321376d3413f132a0ec Mon Sep 17 00:00:00 2001 From: Sean Johnson Date: Tue, 29 Oct 2019 03:38:19 +1100 Subject: [PATCH 2/4] Bump argocd chart to 1.2.4 (#139) --- 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 1f21a8ae..cf7caac9 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "1.2.3" +appVersion: "1.2.4" description: A Helm chart for Argo-CD name: argo-cd -version: 0.7.1 +version: 0.7.2 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 52bd4afb..2a1d7a02 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -26,7 +26,7 @@ $ helm install --name my-release argo/argo-cd | applicationController.containerPort | int | `8082` | Container port for application controller server and metrics | | applicationController.image.pullPolicy | string | `"Always"` | Docker image pull policy | | applicationController.image.repository | string | `"argoproj/argocd"` | Docker image repo | -| applicationController.image.tag | string | `"v1.2.3"` | Docker image tag | +| applicationController.image.tag | string | `"v1.2.4"` | Docker image tag | | applicationController.servicePort | int | `8082` | Service port for applicaiton controller server | | applicationController.volumeMounts | list | `[]` | Additional volume mounts | | applicationController.volumes | list | `[]` | Additional volumes | diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 32e131a4..8b64ab8d 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3,7 +3,7 @@ applicationController: servicePort: 8082 image: repository: argoproj/argocd - tag: v1.2.3 + tag: v1.2.4 pullPolicy: Always volumeMounts: [] volumes: [] @@ -16,7 +16,7 @@ server: serviceAnnotations: {} image: repository: argoproj/argocd - tag: v1.2.3 + tag: v1.2.4 pullPolicy: Always serviceType: ClusterIP extraArgs: [] @@ -34,7 +34,7 @@ repoServer: servicePort: 8081 image: repository: argoproj/argocd - tag: v1.2.3 + tag: v1.2.4 pullPolicy: Always volumeMounts: [] volumes: [] @@ -64,7 +64,7 @@ dexServer: pullPolicy: Always initImage: repository: argoproj/argocd - tag: v1.2.3 + tag: v1.2.4 pullPolicy: Always volumeMounts: [] volumes: [] From 9de9cd19187783649381a96c09184b41dba81a50 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Mon, 28 Oct 2019 10:50:50 -0700 Subject: [PATCH 3/4] Create CODEOWNERS (#136) --- CODEOWNERS | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000..28539881 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,10 @@ +# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners + +# Argo CD +/charts/argo-cd @seanson + +# Argo Events +/charts/argo-events @jbehling + +# Argo Workflows +/charts/argo @benjaminws From e3dc69482f86f7e13f04b2150a064051a703b09e Mon Sep 17 00:00:00 2001 From: Pablo Osinaga Date: Tue, 29 Oct 2019 00:45:55 +0100 Subject: [PATCH 4/4] Fix argo CRD deployment (#140) * Fix argo CRD deployment - Update if clause of workflow-crd.yaml - Update if clause of workflow-template-crd.yaml * Update argo chart version --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-crd.yaml | 2 +- charts/argo/templates/workflow-template-crd.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 2c23f5a5..e8bc5a0c 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v1 appVersion: "v2.4.2" description: A Helm chart for Argo Workflows name: argo -version: 0.6.1 +version: 0.6.2 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png diff --git a/charts/argo/templates/workflow-crd.yaml b/charts/argo/templates/workflow-crd.yaml index 75aa6154..bada1925 100644 --- a/charts/argo/templates/workflow-crd.yaml +++ b/charts/argo/templates/workflow-crd.yaml @@ -1,4 +1,4 @@ -{{- if .installCRD }} +{{- if .Values.installCRD }} apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/charts/argo/templates/workflow-template-crd.yaml b/charts/argo/templates/workflow-template-crd.yaml index 0ecc8cd6..55c940d5 100644 --- a/charts/argo/templates/workflow-template-crd.yaml +++ b/charts/argo/templates/workflow-template-crd.yaml @@ -1,4 +1,4 @@ -{{- if .installCRD }} +{{- if .Values.installCRD }} apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: