From 2358b152f9af125fcb608ead2d76fb81d18342fd Mon Sep 17 00:00:00 2001 From: smcavallo Date: Mon, 26 Jul 2021 21:32:56 -0400 Subject: [PATCH 1/4] feat(argo-cd): Bump default version to v2.0.5 (#844) Signed-off-by: smcavallo --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 2 +- charts/argo-cd/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 71320643..60bc092a 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 2.0.4 +appVersion: 2.0.5 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.10.0 +version: 3.10.1 home: https://github.com/argoproj/argo-helm icon: https://argoproj.github.io/argo-cd/assets/logo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 05623c59..4cd712b5 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -132,7 +132,7 @@ NAME: my-release |-----|------|---------| | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | -| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v2.0.4"` | +| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v2.0.5"` | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index b4d5a954..c6795bbc 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -8,7 +8,7 @@ kubeVersionOverride: "" global: image: repository: quay.io/argoproj/argocd - tag: v2.0.4 + tag: v2.0.5 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 From 3374813feb15674af4430c3ba33f58244fda6c4d Mon Sep 17 00:00:00 2001 From: Aditya Menon Date: Tue, 27 Jul 2021 13:07:07 +0200 Subject: [PATCH 2/4] fix(argo-cd): Deprecate the static assets flag passed to argocd-server (#846) Co-authored-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 3 ++- charts/argo-cd/README.md | 8 +++++++- charts/argo-cd/templates/argocd-server/deployment.yaml | 2 ++ charts/argo-cd/values.yaml | 4 ++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 60bc092a..b58fd1c2 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.5 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.10.1 +version: 3.10.2 home: https://github.com/argoproj/argo-helm icon: https://argoproj.github.io/argo-cd/assets/logo.png keywords: @@ -22,3 +22,4 @@ dependencies: annotations: artifacthub.io/changes: | - "[Added]: Support AWS ALB Ingress with gRPC" + - "[Deprecated]: Deprecate static assets flag passed to argocd-server" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 4cd712b5..08025c94 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -34,6 +34,11 @@ Changes in the `CustomResourceDefinition` resources shall be fixed easily by cop ## Upgrading +### 3.10.2 + +ArgoCD has recently deprecated the flag `--staticassets` and from chart version `3.10.2` has been disabled by default +It can be re-enabled by setting `server.staticAssets.enabled` to true + ### 3.8.1 This bugfix version potentially introduces a rename (and recreation) of one or more ServiceAccounts. It _only happens_ when you use one of these customization: @@ -287,6 +292,7 @@ NAME: my-release | server.config | [General Argo CD configuration](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#repositories) | See [values.yaml](values.yaml) | | server.containerPort | Server container port. | `8080` | | server.extraArgs | Additional arguments for the server. A list of flags. | `[]` | +| server.staticAssets.enabled | Disable deprecated flag --staticassets | `false` | | server.env | Environment variables for the server. | `[]` | | server.envFrom | `envFrom` to pass to the server. | `[]` (See [values.yaml](values.yaml)) | | server.image.repository | Repository to use for the server | `global.image.repository` | @@ -449,4 +455,4 @@ server: enabled: true isAWSALB: true -``` \ No newline at end of file +``` diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 68c98845..ff86f5ec 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -42,8 +42,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 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index c6795bbc..d930fcd8 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -431,6 +431,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: false + ## Environment variables to pass to argocd-server ## env: [] From 5ed8dccc99f9a84e3f40458df79d7c4eba81b371 Mon Sep 17 00:00:00 2001 From: smcavallo Date: Wed, 28 Jul 2021 10:36:56 -0400 Subject: [PATCH 3/4] argocd - update misc dependencies (#847) Signed-off-by: smcavallo --- charts/argo-cd/Chart.lock | 6 +++--- charts/argo-cd/Chart.yaml | 9 +++++---- charts/argo-cd/values.yaml | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/charts/argo-cd/Chart.lock b/charts/argo-cd/Chart.lock index 52941728..fe323d72 100644 --- a/charts/argo-cd/Chart.lock +++ b/charts/argo-cd/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: redis-ha repository: https://dandydeveloper.github.io/charts/ - version: 4.12.14 -digest: sha256:34275a4f4df92c570d07b0553da5d1fa200b6f057f7091746c853fd7399ee30a -generated: "2021-05-03T16:02:41.4356045-04:00" + version: 4.12.17 +digest: sha256:ad1833436031e3578165d48646c90323040fa1bc00d9235fe7ba7c67b20094ec +generated: "2021-07-27T16:35:27.2509236-04:00" diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index b58fd1c2..dd68aab2 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.5 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.10.2 +version: 3.11.0 home: https://github.com/argoproj/argo-helm icon: https://argoproj.github.io/argo-cd/assets/logo.png keywords: @@ -16,10 +16,11 @@ maintainers: - name: seanson dependencies: - name: redis-ha - version: 4.12.14 + version: 4.12.17 repository: https://dandydeveloper.github.io/charts/ condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Added]: Support AWS ALB Ingress with gRPC" - - "[Deprecated]: Deprecate static assets flag passed to argocd-server" + - "[Updated]: Updated redis-ha chart dependency 4.12.14 -> 4.12.17" + - "[Updated]: Updated dex image 2.27.0 -> 2.28.1" + - "[Updated]: Updated redis alpine image 6.2.2 -> 6.2.4" diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index d930fcd8..8d5a092c 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -229,7 +229,7 @@ dex: image: repository: ghcr.io/dexidp/dex - tag: v2.27.0 + tag: v2.28.1 imagePullPolicy: IfNotPresent initImage: repository: @@ -313,7 +313,7 @@ redis: image: repository: redis - tag: 6.2.2-alpine + tag: 6.2.4-alpine imagePullPolicy: IfNotPresent ## Additional command line arguments to pass to redis-server @@ -406,7 +406,7 @@ redis-ha: metrics: enabled: true image: - tag: 6.2.2-alpine + tag: 6.2.4-alpine ## Server server: From f20e070de1b1570987bc265de3a07c81d5156c49 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 28 Jul 2021 17:42:12 +0200 Subject: [PATCH 4/4] fix(argo-cd): re-enable not yet deprecated staticassets flag (#849) Signed-off-by: Lucas Bickel --- charts/argo-cd/Chart.yaml | 6 ++---- charts/argo-cd/values.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index dd68aab2..87e252a8 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 2.0.5 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 3.11.0 +version: 3.11.1 home: https://github.com/argoproj/argo-helm icon: https://argoproj.github.io/argo-cd/assets/logo.png keywords: @@ -21,6 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Updated]: Updated redis-ha chart dependency 4.12.14 -> 4.12.17" - - "[Updated]: Updated dex image 2.27.0 -> 2.28.1" - - "[Updated]: Updated redis alpine image 6.2.2 -> 6.2.4" + - "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it" diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 8d5a092c..06232342 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -433,7 +433,7 @@ server: # This flag is used to either remove or pass the CLI flag --staticassets /shared/app to the argocd-server app staticAssets: - enabled: false + enabled: true ## Environment variables to pass to argocd-server ##