Skip to content

Commit

Permalink
fix(argo-workflows): Accept multi auth mode for server (argoproj#2336)
Browse files Browse the repository at this point in the history
* fix(argo-workflows): Accept multi auth mode for server

Signed-off-by: yu-croco <yu.croco@gmail.com>

* chore(argo-workflows): improve description of authMode

Signed-off-by: yu-croco <yu.croco@gmail.com>

* chore(argo-workflows): keep the older value valid for now as compatibility.

Signed-off-by: yu-croco <yu.croco@gmail.com>

---------

Signed-off-by: yu-croco <yu.croco@gmail.com>
Signed-off-by: Kripu Khadka <khadkakripu4@gmail.com>
  • Loading branch information
yu-croco authored and Kripu77 committed Nov 16, 2023
1 parent 0889692 commit 83a909c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
6 changes: 3 additions & 3 deletions charts/argo-workflows/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: v3.5.1
name: argo-workflows
description: A Helm chart for Argo Workflows
type: application
version: 0.38.0
version: 0.39.0
icon: https://argoproj.github.io/argo-workflows/assets/logo.png
home: https://github.com/argoproj/argo-helm
sources:
Expand All @@ -16,5 +16,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Upgrade Argo Workflows to v3.5.1
- kind: fixed
description: Accept multi auth mode for server.
3 changes: 2 additions & 1 deletion charts/argo-workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ Fields to note:
| server.GKEmanagedCertificate.domains | list | `["argoworkflows.example.com"]` | Domains for the Google Managed Certificate |
| server.GKEmanagedCertificate.enabled | bool | `false` | Enable ManagedCertificate custom resource for Google Kubernetes Engine. |
| server.affinity | object | `{}` | Assign custom [affinity] rules |
| server.authMode | string | `""` | Auth Mode is available from `server` , `client` or `sso`. If you chose `sso` , please configure `.Values.server.sso` as well. |
| server.authMode | string | `""` | Deprecated; use server.authModes instead. |
| server.authModes | list | `[]` | A list of supported authentication modes. Available values are `server`, `client`, or `sso`. If you provide sso, please configure `.Values.server.sso` as well. |
| server.autoscaling.behavior | object | `{}` | Configures the scaling behavior of the target in both Up and Down directions. This is only available on HPA apiVersion `autoscaling/v2beta2` and newer |
| server.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the Argo Server |
| server.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the Argo Server [HPA] |
Expand Down
4 changes: 4 additions & 0 deletions charts/argo-workflows/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{{- if .Values.server.authMode }}
DEPRECATED option server.authMode - Use server.authModes
{{- end }}

1. Get Argo Server external IP/domain by running:

kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ template "argo-workflows.server.fullname" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/argo-workflows/templates/server/server-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ spec:
{{- if .Values.server.authMode }}
- "--auth-mode={{ .Values.server.authMode }}"
{{- end }}
{{- range .Values.server.authModes }}
- "--auth-mode={{ . }}"
{{- end }}
- "--secure={{ .Values.server.secure }}"
{{- if .Values.singleNamespace }}
- "--namespaced"
Expand Down
7 changes: 5 additions & 2 deletions charts/argo-workflows/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,13 @@ server:
# - name: FOO
# value: "bar"

# -- Auth Mode is available from `server` , `client` or `sso`. If you chose `sso` , please configure `.Values.server.sso` as well.
## Ref: https://argoproj.github.io/argo-workflows/argo-server-auth-mode/
# -- Deprecated; use server.authModes instead.
authMode: ""

# -- A list of supported authentication modes. Available values are `server`, `client`, or `sso`. If you provide sso, please configure `.Values.server.sso` as well.
## Ref: https://argoproj.github.io/argo-workflows/argo-server-auth-mode/
authModes: []

# -- Extra arguments to provide to the Argo server binary.
## Ref: https://argoproj.github.io/argo-workflows/argo-server/#options
extraArgs: []
Expand Down

0 comments on commit 83a909c

Please sign in to comment.