From 0181f86f5fe1931c0b55ce4a22c6fadfda759199 Mon Sep 17 00:00:00 2001 From: Wolfgang Nagele Date: Mon, 22 Jun 2020 19:27:06 +0200 Subject: [PATCH 1/2] fix: Add support for SSO in Argo (#383) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-deployment.yaml | 8 ++++++++ charts/argo/templates/workflow-controller-config-map.yaml | 3 +++ charts/argo/values.yaml | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 022e953d..28e783dc 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.8.0 description: A Helm chart for Argo Workflows name: argo -version: 0.9.6 +version: 0.9.7 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 5f5ff726..52acbc79 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -63,6 +63,14 @@ spec: value: {{ .Values.server.baseHref | quote }} resources: {{- toYaml .Values.server.resources | nindent 12 }} + {{- with .Values.server.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12}} + {{- end }} + {{- with .Values.server.volumes }} + volumes: + {{- toYaml . | nindent 8}} + {{- end }} {{- with .Values.server.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 38bcba23..b6d56e64 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -67,3 +67,6 @@ data: {{- if .Values.controller.workflowDefaults }} workflowDefaults: {{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }} + {{- with .Values.controller.sso }} + sso: +{{ toYaml . | indent 6 }}{{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index a5492cb6..2525b7bd 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -54,6 +54,7 @@ controller: # name: argo-postgres-config # key: password workflowDefaults: {} # Only valid for 2.7+ + sso: {} # Only valid for 2.9+ # spec: # ttlStrategy: # secondsAfterCompletion: 84600 @@ -164,6 +165,10 @@ server: # Extra arguments to provide to the Argo server binary. extraArgs: [] + ## Additional volumes to the server main container. + volumeMounts: [] + volumes: [] + ## Ingress configuration. ## ref: https://kubernetes.io/docs/user-guide/ingress/ ## From 209d69558e1c9a9954b2cb378ee2665a8ea45ed8 Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Mon, 22 Jun 2020 10:44:50 -0700 Subject: [PATCH 2/2] feat(argo): Adds SSO configuration for Argo Server. (#381) --- charts/argo/Chart.yaml | 2 +- .../workflow-controller-config-map.yaml | 6 +++--- charts/argo/values.yaml | 18 +++++++++++++++++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 28e783dc..de0c3833 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.8.0 description: A Helm chart for Argo Workflows name: argo -version: 0.9.7 +version: 0.9.8 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 b6d56e64..5dde9ff3 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -67,6 +67,6 @@ data: {{- if .Values.controller.workflowDefaults }} workflowDefaults: {{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }} - {{- with .Values.controller.sso }} - sso: -{{ toYaml . | indent 6 }}{{- end }} + {{- with .Values.server.sso }} + sso: {{- toYaml . | nindent 6 }} + {{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 2525b7bd..0dc5dd47 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -54,7 +54,6 @@ controller: # name: argo-postgres-config # key: password workflowDefaults: {} # Only valid for 2.7+ - sso: {} # Only valid for 2.9+ # spec: # ttlStrategy: # secondsAfterCompletion: 84600 @@ -202,6 +201,23 @@ server: clusterWorkflowTemplates: # Give the server permissions to edit ClusterWorkflowTemplates. enableEditing: true + sso: + ## SSO configuration when SSO is specified as a server auth mode. + ## All the values are requied. SSO is activated by adding --auth-mode=sso + ## to the server command line. + # + ## The root URL of the OIDC identity provider. + # issuer: https://accounts.google.com + ## Name of a secret and a key in it to retrieve the app OIDC client ID from. + # clientId: + # name: argo-server-sso + # key: client-id + ## Name of a secret and a key in it to retrieve the app OIDC client secret from. + # clientSecret: + # name: argo-server-sso + # key: client-secret + ## The OIDC redirect URL. Should be in the form /oauth2/callback. + # redirectUrl: https://argo/oauth2/callback # Influences the creation of the ConfigMap for the workflow-controller itself. useDefaultArtifactRepo: false