diff --git a/charts/argo-cd/Chart.lock b/charts/argo-cd/Chart.lock new file mode 100644 index 00000000..646d7e56 --- /dev/null +++ b/charts/argo-cd/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: redis-ha + repository: https://dandydeveloper.github.io/charts/ + version: 4.10.1 +digest: sha256:e1e0526ad009ecc065df937b48c4e0e5877e5194242c7888b1dc4467775f2663 +generated: "2021-04-01T08:36:01.324672-07:00" diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 408fda4f..2320a609 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ -apiVersion: v1 -appVersion: 1.8.4 +apiVersion: v2 +appVersion: 2.0.0 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.17.5 +version: 3.0.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: @@ -14,3 +14,8 @@ maintainers: - name: alexmt - name: jessesuen - name: seanson +dependencies: + - name: redis-ha + version: 4.10.1 + repository: https://dandydeveloper.github.io/charts/ + condition: redis-ha.enabled diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 75a57d67..22806038 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -14,6 +14,10 @@ This chart currently installs the non-HA version of ArgoCD. ## Upgrading +### 3.0.0 and above + +Helm apiVersion switched to `v2`. Requires Helm `3.0.0` or above to install. [Read More](https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/) on how to migrate your release from Helm 2 to Helm 3. + ### 2.14.7 and above The `matchLabels` key in the ArgoCD Appliaction Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource. diff --git a/charts/argo-cd/requirements.lock b/charts/argo-cd/requirements.lock deleted file mode 100644 index 45d95b5b..00000000 --- a/charts/argo-cd/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: redis-ha - repository: https://dandydeveloper.github.io/charts/ - version: 4.10.4 -digest: sha256:e36321520ffd6f91962b0bcfeae947a86983d6b6d273eb616f08425e2b8ab9c2 -generated: "2021-03-03T10:13:21.0955491+01:00" diff --git a/charts/argo-cd/requirements.yaml b/charts/argo-cd/requirements.yaml deleted file mode 100644 index fad20e4a..00000000 --- a/charts/argo-cd/requirements.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependencies: -- name: redis-ha - version: 4.10.4 - repository: https://dandydeveloper.github.io/charts/ - condition: redis-ha.enabled diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml index cb40ba54..45a2e09e 100755 --- a/charts/argo-cd/templates/dex/deployment.yaml +++ b/charts/argo-cd/templates/dex/deployment.yaml @@ -44,8 +44,8 @@ spec: command: - cp - -n - - /usr/local/bin/argocd-util - - /shared + - /usr/local/bin/argocd + - /shared/argocd-dex volumeMounts: - mountPath: /shared name: static-files @@ -54,7 +54,7 @@ spec: image: {{ .Values.dex.image.repository }}:{{ .Values.dex.image.tag }} imagePullPolicy: {{ .Values.dex.image.imagePullPolicy }} command: - - /shared/argocd-util + - /shared/argocd-dex - rundex {{- if .Values.dex.containerSecurityContext }} securityContext: {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 2a6ce24f..a7e84181 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: argoproj/argocd - tag: v1.8.4 + tag: v2.0.0 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999