DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-workflows): Drop .Values.useDefaultArtifactRepo flag to simplify usage (#2002)

Browse source 
Fixes #1140

- [x] remove `.Values.useDefaultArtifactRepo` to ensure if items populated they get into the configmap.
- [x] change structure of `.Values.customArtifactRepository` to only include the custom information

Signed-off-by: jmeridth <jmeridth@gmail.com>
This commit is contained in:
Jason Meridth 2023-05-05 09:30:53 -05:00 committed by GitHub
parent 513df3df8f
commit 2197c8e040
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-workflows/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v3.4.7
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.25.2 version: 0.26.0
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
sources: sources:
@ -14,4 +14,4 @@ maintainers:
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fix - kind: fix
description: Add missing argo-workflows.apiVersion.autoscaling helper function used for HPA configuration description: Drop .Values.useDefaultArtifactRepo flag to simplify usage

3
charts/argo-workflows/README.md
View file

@ -308,8 +308,7 @@ Fields to note:
| artifactRepository.azure | object | `{}` (See [values.yaml]) | Store artifact in Azure Blob Storage | | artifactRepository.azure | object | `{}` (See [values.yaml]) | Store artifact in Azure Blob Storage |
| artifactRepository.gcs | object | `{}` (See [values.yaml]) | Store artifact in a GCS object store | | artifactRepository.gcs | object | `{}` (See [values.yaml]) | Store artifact in a GCS object store |
| artifactRepository.s3 | object | See [values.yaml] | Store artifact in a S3-compliant object store | | artifactRepository.s3 | object | See [values.yaml] | Store artifact in a S3-compliant object store |
| customArtifactRepository | object | `{}` | The section of custom artifact repository. Will be added to the config in case useDefaultArtifactRepo is set to false | | customArtifactRepository | object | `{}` | The section of custom artifact repository. Utilize a custom artifact repository that is not one of the current base ones (s3, gcs, azure) |
| useDefaultArtifactRepo | bool | `false` | Influences the creation of the ConfigMap for the workflow-controller itself. |
| useStaticCredentials | bool | `true` | Use static credentials for S3 (eg. when not using AWS IRSA) | | useStaticCredentials | bool | `true` | Use static credentials for S3 (eg. when not using AWS IRSA) |
## Breaking changes from the deprecated `argo` chart ## Breaking changes from the deprecated `argo` chart

7
charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
View file

@ -55,7 +55,6 @@ data:
securityContext: {{- toYaml . | nindent 8 }} securityContext: {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.useDefaultArtifactRepo }}
artifactRepository: artifactRepository:
{{- if .Values.artifactRepository.archiveLogs }} {{- if .Values.artifactRepository.archiveLogs }}
archiveLogs: {{ .Values.artifactRepository.archiveLogs }} archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
@ -96,10 +95,8 @@ data:
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- else }} {{- if .Values.customArtifactRepository }}
{{- if .Values.customArtifactRepository }} {{- toYaml .Values.customArtifactRepository | nindent 6 }}
artifactRepository: {{- toYaml .Values.customArtifactRepository | nindent 6 }}
{{- end }}
{{- end }} {{- end }}
{{- if .Values.controller.metricsConfig.enabled }} {{- if .Values.controller.metricsConfig.enabled }}
metricsConfig: metricsConfig:

22
charts/argo-workflows/values.yaml
View file

@ -639,8 +639,6 @@ extraObjects: []
# secretName: argo-server-sso-secrets-store # secretName: argo-server-sso-secrets-store
# type: Opaque # type: Opaque
# -- Influences the creation of the ConfigMap for the workflow-controller itself.
useDefaultArtifactRepo: false
# -- Use static credentials for S3 (eg. when not using AWS IRSA) # -- Use static credentials for S3 (eg. when not using AWS IRSA)
useStaticCredentials: true useStaticCredentials: true
artifactRepository: artifactRepository:
@ -702,18 +700,16 @@ artifactRepository:
# key: account-access-key # key: account-access-key
# -- The section of custom artifact repository. # -- The section of custom artifact repository.
# Will be added to the config in case useDefaultArtifactRepo is set to false # Utilize a custom artifact repository that is not one of the current base ones (s3, gcs, azure)
customArtifactRepository: {} customArtifactRepository: {}
# customArtifactRepository: # artifactory:
# archiveLogs: true # repoUrl: https://artifactory.example.com/raw
# artifactory: # usernameSecret:
# repoUrl: https://artifactory.example.com/raw # name: artifactory-creds
# usernameSecret: # key: username
# name: artifactory-creds # passwordSecret:
# key: username # name: artifactory-creds
# passwordSecret: # key: password
# name: artifactory-creds
# key: password
emissary: emissary:
# -- The command/args for each image on workflow, needed when the command is not specified and the emissary executor is used. # -- The command/args for each image on workflow, needed when the command is not specified and the emissary executor is used.