From 5add526d0c67c9b00d64d9a315fe3902e2a6f59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Prud=27homme?= Date: Wed, 29 Apr 2020 22:01:00 +0200 Subject: [PATCH 1/4] feat: upgrade Argo to v2.7.6 (#296) --- charts/argo/Chart.yaml | 4 ++-- charts/argo/templates/server-deployment.yaml | 1 + charts/argo/values.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index be222ee9..46e747a5 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "v2.6.1" +appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.7.6 +version: 0.8.0 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 bbf82dd1..1d716c35 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -31,6 +31,7 @@ spec: - name: argo-server args: - server + - --configmap={{ .Release.Name }}-{{ .Values.controller.name }}-configmap {{- if .Values.server.extraArgs }} {{- toYaml .Values.server.extraArgs | nindent 10 }} {{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 8346d84a..8cbf4542 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -4,7 +4,7 @@ images: server: argocli executor: argoexec pullPolicy: Always - tag: v2.6.1 + tag: v2.7.6 crdVersion: v1alpha1 installCRD: true From 1135b1ef18cbc6e4b29f2d91a40c6d2292b97c8d Mon Sep 17 00:00:00 2001 From: Pablo Osinaga Date: Wed, 29 Apr 2020 22:36:58 +0200 Subject: [PATCH 2/4] fix: Argo Server Secrets Permissions (#307) Grant permissions to workflow-controller and server roles to read database secrets --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-cluster-role.yaml | 11 +++++++++++ .../workflow-controller-clusterrole.yaml | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 46e747a5..a7e383f2 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.0 +version: 0.8.1 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-cluster-role.yaml b/charts/argo/templates/server-cluster-role.yaml index fbf8d044..0d8103f2 100644 --- a/charts/argo/templates/server-cluster-role.yaml +++ b/charts/argo/templates/server-cluster-role.yaml @@ -28,12 +28,23 @@ rules: - get - list - watch +{{- if .Values.controller.persistence }} - apiGroups: - "" resources: - secrets + resourceNames: + {{- if .Values.controller.persistence.postgresql }} + - {{ .Values.controller.persistence.postgresql.userNameSecret.name }} + - {{ .Values.controller.persistence.postgresql.passwordSecret.name }} + {{- end}} + {{- if .Values.controller.persistence.mysql }} + - {{ .Values.controller.persistence.mysql.userNameSecret.name }} + - {{ .Values.controller.persistence.mysql.passwordSecret.name }} + {{- end}} verbs: - get +{{- end}} - apiGroups: - argoproj.io resources: diff --git a/charts/argo/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml index 8df46229..2511c1a3 100644 --- a/charts/argo/templates/workflow-controller-clusterrole.yaml +++ b/charts/argo/templates/workflow-controller-clusterrole.yaml @@ -78,4 +78,22 @@ rules: verbs: - get - list +{{- if .Values.controller.persistence }} +- apiGroups: + - "" + resources: + - secrets + resourceNames: + {{- if .Values.controller.persistence.postgresql }} + - {{ .Values.controller.persistence.postgresql.userNameSecret.name }} + - {{ .Values.controller.persistence.postgresql.passwordSecret.name }} + {{- end}} + {{- if .Values.controller.persistence.mysql }} + - {{ .Values.controller.persistence.mysql.userNameSecret.name }} + - {{ .Values.controller.persistence.mysql.passwordSecret.name }} + {{- end}} + verbs: + - get +{{- end}} + From 46e08b1fe8c9f2233e37f8b16c15a68c8e902d15 Mon Sep 17 00:00:00 2001 From: Mark Haley Date: Wed, 29 Apr 2020 21:45:20 -0400 Subject: [PATCH 3/4] feat: Allow custom paths for server ingress (#317) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-ingress.yaml | 7 +++++++ charts/argo/values.yaml | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index a7e383f2..eac1f9e1 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.1 +version: 0.8.2 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-ingress.yaml b/charts/argo/templates/server-ingress.yaml index bee5a7f8..eb0f37e0 100644 --- a/charts/argo/templates/server-ingress.yaml +++ b/charts/argo/templates/server-ingress.yaml @@ -24,6 +24,13 @@ spec: - host: {{ . }} http: paths: + {{- if $.Values.server.ingress.paths }} + {{- range $.Values.server.ingress.paths }} + - backend: + serviceName: {{ .serviceName }} + servicePort: {{ .servicePort }} + {{- end }} + {{- end }} - backend: serviceName: {{ $serviceName }} servicePort: {{ $servicePort }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 8cbf4542..3c031df2 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -168,6 +168,11 @@ server: # hosts: # - argo.domain.com + ## Additional Paths for each host + # paths: + # - serviceName: "ssl-redirect" + # servicePort: "use-annotation" + ## TLS configuration. ## Secrets must be manually created in the namespace. ## From f2a3adc7f49236ea57819f22e00d9ee024bf1c8d Mon Sep 17 00:00:00 2001 From: ygapon-mio <60629171+ygapon-mio@users.noreply.github.com> Date: Wed, 29 Apr 2020 22:04:07 -0400 Subject: [PATCH 4/4] feat: add support for setting roleARN and useSDKCreds properties for S3 artifact repository (#329) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-controller-config-map.yaml | 6 ++++++ charts/argo/values.yaml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index eac1f9e1..3f86de62 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.2 +version: 0.8.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/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 305428de..ae73d117 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -39,6 +39,12 @@ data: {{- if .Values.artifactRepository.s3.region }} region: {{ .Values.artifactRepository.s3.region }} {{- end }} + {{- if .Values.artifactRepository.s3.roleARN }} + roleARN: {{ .Values.artifactRepository.s3.roleARN }} + {{- end }} + {{- if .Values.artifactRepository.s3.useSDKCreds }} + useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }} + {{- end }} {{- end}} {{- if .Values.controller.metricsConfig.enabled }} metricsConfig: diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 3c031df2..3bf74b3f 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -200,6 +200,8 @@ artifactRepository: # bucket: # endpoint: # region: + # roleARN: + # useSDKCreds: true # NOTE: These are setting attributes for the `minio` optional dependency minio: