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

Update Chart.yaml

Browse source
This commit is contained in:
shshanmu 2021-08-02 19:19:38 +02:00 committed by GitHub
parent cfcedebba1
commit 521fbe0bff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,5 @@
apiVersion: v2 apiVersion: v2
<<<<<<< HEAD
appVersion: 2.0.5
=======
appVersion: 2.0.6 appVersion: 2.0.6
>>>>>>> d22212be3ebeb3d428f6817e0ee6befa46cf7ccc
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.11.1 version: 3.11.1
@ -25,8 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
<<<<<<< HEAD
- "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it"
=======
- "[Changed]: Openshift 4 specific Route command added in the NOTES.txt file" - "[Changed]: Openshift 4 specific Route command added in the NOTES.txt file"
>>>>>>> d22212be3ebeb3d428f6817e0ee6befa46cf7ccc