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

Merge branch 'main' into feat-artifact-repo-ref

Browse source
This commit is contained in:
Aikawa 2023-07-04 22:29:16 +09:00 committed by GitHub
commit a55ab7ecea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-cd/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v2.7.6
kubeVersion: ">=1.23.0-0" kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 5.36.13 version: 5.36.15
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:
@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: added - kind: fixed
description: Support for setting server certificate usages description: Remove necessary `create` entry in `argocd-cmd-params-cm` ConfigMap

4
charts/argo-cd/templates/_common.tpl
View file

@ -128,9 +128,9 @@ Common deployment strategy definition
*/}} */}}
{{- define "argo-cd.strategy" -}} {{- define "argo-cd.strategy" -}}
{{- $preset := . -}} {{- $preset := . -}}
{{- if (eq $preset.type "Recreate") }} {{- if (eq (toString $preset.type) "Recreate") }}
type: Recreate type: Recreate
{{- else if (eq $preset.type "RollingUpdate") }} {{- else if (eq (toString $preset.type) "RollingUpdate") }}
type: RollingUpdate type: RollingUpdate
{{- with $preset.rollingUpdate }} {{- with $preset.rollingUpdate }}
rollingUpdate: rollingUpdate:

2
charts/argo-cd/templates/_helpers.tpl
View file

@ -207,7 +207,7 @@ applicationsetcontroller.enable.leader.election: {{ gt (.Values.applicationSet.r
Merge Argo Params Configuration with Preset Configuration Merge Argo Params Configuration with Preset Configuration
*/}} */}}
{{- define "argo-cd.config.params" -}} {{- define "argo-cd.config.params" -}}
{{- $config := omit .Values.configs.params "annotations" }} {{- $config := omit .Values.configs.params "create" "annotations" }}
{{- $preset := include "argo-cd.config.params.presets" . | fromYaml | default dict -}} {{- $preset := include "argo-cd.config.params.presets" . | fromYaml | default dict -}}
{{- range $key, $value := mergeOverwrite $preset $config }} {{- range $key, $value := mergeOverwrite $preset $config }}
{{ $key }}: {{ toString $value | toYaml }} {{ $key }}: {{ toString $value | toYaml }}