Skip to content

Commit

Permalink
feat(argo-cd): Upgrade argo-cd image to 2.1.1 (#903)
Browse files Browse the repository at this point in the history
* reenable static assets for argo-cd server

Signed-off-by: Geisler, James D <geislerjamesd@gmail.com>

* add fix to changelog

Signed-off-by: Geisler, James D <geislerjamesd@gmail.com>

* feat(argo-cd): Upgrade argo-cd image to 2.1.1

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

* Bump chart version

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

* Bump fix version

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

Co-authored-by: Geisler, James D <geislerjamesd@gmail.com>
  • Loading branch information
pdrastil and jdgeisler authored Aug 26, 2021
1 parent e099ab3 commit 1b7d63f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
7 changes: 4 additions & 3 deletions charts/argo-cd/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 2.1.0
appVersion: 2.1.1
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 3.17.1
version: 3.17.2
home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-cd/assets/logo.png
keywords:
Expand All @@ -21,4 +21,5 @@ dependencies:
condition: redis-ha.enabled
annotations:
artifacthub.io/changes: |
- "[Fixed]: Add missing parameter 'server.extraContainers' to README.md"
- "[Changed]: Upgrade argo-cd image to 2.1.1"
- "[Fixed]: Reenabling static assets for the argo-cd server"
4 changes: 4 additions & 0 deletions charts/argo-cd/templates/argocd-server/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ spec:
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.server.image.imagePullPolicy }}
command:
- argocd-server
{{ if .Values.server.staticAssets.enabled }}
- --staticassets
- /shared/app
{{ end }}
- --repo-server
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
{{- if .Values.dex.enabled }}
Expand Down
6 changes: 5 additions & 1 deletion charts/argo-cd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ kubeVersionOverride: ""
global:
image:
repository: quay.io/argoproj/argocd
tag: v2.1.0
tag: v2.1.1
imagePullPolicy: IfNotPresent
## Annotations applied to all pods
podAnnotations: {}
Expand Down Expand Up @@ -462,6 +462,10 @@ server:
extraArgs: []
# - --insecure

# This flag is used to either remove or pass the CLI flag --staticassets /shared/app to the argocd-server app
staticAssets:
enabled: true

## Environment variables to pass to argocd-server
##
env: []
Expand Down

0 comments on commit 1b7d63f

Please sign in to comment.