diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 006a12bf..3f86de62 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: v2.7.2 +appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.7.6 +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/server-cluster-role.yaml b/charts/argo/templates/server-cluster-role.yaml index 2b66f62d..c99a94c9 100644 --- a/charts/argo/templates/server-cluster-role.yaml +++ b/charts/argo/templates/server-cluster-role.yaml @@ -32,12 +32,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/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml index 44393714..8abe0faf 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -30,6 +30,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/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/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml index 702ddbe8..909a6388 100644 --- a/charts/argo/templates/workflow-controller-clusterrole.yaml +++ b/charts/argo/templates/workflow-controller-clusterrole.yaml @@ -82,4 +82,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}} + diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 075a118e..068b381c 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -44,6 +44,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 4b157369..6f4ce999 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -4,7 +4,7 @@ images: server: argocli executor: argoexec pullPolicy: Always - tag: v2.7.2 + tag: v2.7.6 crdVersion: v1alpha1 installCRD: true @@ -176,6 +176,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. ## @@ -203,6 +208,8 @@ artifactRepository: # bucket: # endpoint: # region: + # roleARN: + # useSDKCreds: true # NOTE: These are setting attributes for the `minio` optional dependency minio: