Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(argo-cd): Update to Argo CD v2.4.0 #1325

Merged
merged 9 commits into from
Jun 14, 2022
Merged

feat(argo-cd): Update to Argo CD v2.4.0 #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c36c341
feat(argo-cd): Upgrade redis to 7.0.0
sathieu Apr 28, 2022
421fd18
feat(argo-cd): Use upstream applicationset binary
pdrastil May 7, 2022
d416352
feat(argo-cd): Update Argo CD to v2.4.0
Jun 13, 2022
a4a955f
Specify logs RBAC enforcement config in server
Jun 13, 2022
82ee8e3
Remove ksonnet and helm 2 support from Application and ApplicationSet…
Jun 13, 2022
4ccace0
Specify logs RBAC enforcement config in argocd-cm
Jun 13, 2022
bbf2e13
Merge branch 'feature/image' into argo-cd-2.4.0
mkilchhofer Jun 14, 2022
8d7a84c
Merge branch 'redis_7' into argo-cd-2.4.0
mkilchhofer Jun 14, 2022
823005d
Add entrypoint.sh on applicationset deployment
mkilchhofer Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions charts/argo-cd/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: v2.3.4
appVersion: v2.4.0
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 4.8.3
version: 4.9.0
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords:
Expand All @@ -21,4 +21,8 @@ dependencies:
condition: redis-ha.enabled
annotations:
artifacthub.io/changes: |
- "[Added]: Support annotations in argocd-configs secrets"
- "[Changed]: Update Argo CD to v2.4.0"
- "[Added]: Specify logs RBAC enforcement config in server"
- "[Changed]: Remove ksonnet and helm 2 support from Application and applicationSet CRDs"
- "[Changed]: Use applicationset binary on the upstream image"
- "[Changed]: Upgrade redis to 7.0.0"
12 changes: 8 additions & 4 deletions charts/argo-cd/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ kubectl apply -k https://github.com/argoproj/argo-cd.git/manifests/crds?ref=<app
kubectl apply -k https://github.com/argoproj/argo-cd.git/manifests/crds?ref=v2.3.3
```

### 4.6.0

This version starts to use upstream image with applicationset binary. Start command was changed from `applicationset-controller` to `argocd-applicationset-controller`

### 4.3.*

With this minor version, the notification notifier's `service.slack` is no longer configured by default.
Expand Down Expand Up @@ -635,7 +639,7 @@ NAME: my-release
| redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod |
| redis.image.imagePullPolicy | string | `"IfNotPresent"` | Redis imagePullPolicy |
| redis.image.repository | string | `"redis"` | Redis repository |
| redis.image.tag | string | `"6.2.6-alpine"` | Redis tag |
| redis.image.tag | string | `"7.0.0-alpine"` | Redis tag |
| redis.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry |
| redis.initContainers | list | `[]` | Init containers to add to the redis pod |
| redis.metrics.containerPort | int | `9121` | Port to use for redis-exporter sidecar |
Expand Down Expand Up @@ -698,7 +702,7 @@ The main options are listed here:
| redis-ha.haproxy.image.tag | string | `nil` (follows subchart default) | HAProxy Image Tag |
| redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping |
| redis-ha.image.repository | string | `nil` (follows subchart default) | Redis image repository |
| redis-ha.image.tag | string | `"6.2.6-alpine"` | Redis tag |
| redis-ha.image.tag | string | `"7.0.0-alpine"` | Redis tag |
| redis-ha.persistentVolume.enabled | bool | `false` | Configures persistency on Redis nodes |
| redis-ha.redis.config | object | See [values.yaml] | Any valid redis config options in this section will be applied to each server (see `redis-ha` chart) |
| redis-ha.redis.config.save | string | `'""'` | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled |
Expand Down Expand Up @@ -739,8 +743,8 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
| applicationSet.extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) |
| applicationSet.extraVolumes | list | `[]` | List of extra volumes to add |
| applicationSet.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the application set controller |
| applicationSet.image.repository | string | `"quay.io/argoproj/argocd-applicationset"` | Repository to use for the application set controller |
| applicationSet.image.tag | string | `"v0.4.1"` | Tag to use for the application set controller |
| applicationSet.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the application set controller |
| applicationSet.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the application set controller |
| applicationSet.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. |
| applicationSet.metrics.enabled | bool | `false` | Deploy metrics service |
| applicationSet.metrics.service.annotations | object | `{}` | Metrics service annotations |
Expand Down
4 changes: 4 additions & 0 deletions charts/argo-cd/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ kubectl apply -k https://github.com/argoproj/argo-cd.git/manifests/crds?ref=<app
kubectl apply -k https://github.com/argoproj/argo-cd.git/manifests/crds?ref=v2.3.3
```

### 4.6.0

This version starts to use upstream image with applicationset binary. Start command was changed from `applicationset-controller` to `argocd-applicationset-controller`

### 4.3.*

With this minor version, the notification notifier's `service.slack` is no longer configured by default.
Expand Down
169 changes: 7 additions & 162 deletions charts/argo-cd/crds/crd-application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,35 +282,9 @@ spec:
type: string
version:
description: Version is the Helm version to use for templating
(either "2" or "3")
("3")
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
properties:
environment:
description: Environment is a ksonnet application environment
name
type: string
parameters:
description: Parameters are a list of ksonnet component
parameter override values
items:
description: KsonnetParameter is a ksonnet component
parameter
properties:
component:
type: string
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
type: object
kustomize:
description: Kustomize holds kustomize specific options
properties:
Expand Down Expand Up @@ -655,34 +629,9 @@ spec:
type: string
version:
description: Version is the Helm version to use for templating
(either "2" or "3")
("3")
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
properties:
environment:
description: Environment is a ksonnet application environment
name
type: string
parameters:
description: Parameters are a list of ksonnet component parameter
override values
items:
description: KsonnetParameter is a ksonnet component parameter
properties:
component:
type: string
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
type: object
kustomize:
description: Kustomize holds kustomize specific options
properties:
Expand Down Expand Up @@ -1034,34 +983,8 @@ spec:
type: string
version:
description: Version is the Helm version to use for
templating (either "2" or "3")
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
properties:
environment:
description: Environment is a ksonnet application environment
name
templating ("3")
type: string
parameters:
description: Parameters are a list of ksonnet component
parameter override values
items:
description: KsonnetParameter is a ksonnet component
parameter
properties:
component:
type: string
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
type: object
kustomize:
description: Kustomize holds kustomize specific options
Expand Down Expand Up @@ -1431,35 +1354,9 @@ spec:
type: string
version:
description: Version is the Helm version to use
for templating (either "2" or "3")
for templating ("3")
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
properties:
environment:
description: Environment is a ksonnet application
environment name
type: string
parameters:
description: Parameters are a list of ksonnet
component parameter override values
items:
description: KsonnetParameter is a ksonnet component
parameter
properties:
component:
type: string
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
type: object
kustomize:
description: Kustomize holds kustomize specific options
properties:
Expand Down Expand Up @@ -1802,34 +1699,8 @@ spec:
type: string
version:
description: Version is the Helm version to use for
templating (either "2" or "3")
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
properties:
environment:
description: Environment is a ksonnet application
environment name
templating ("3")
type: string
parameters:
description: Parameters are a list of ksonnet component
parameter override values
items:
description: KsonnetParameter is a ksonnet component
parameter
properties:
component:
type: string
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
type: object
kustomize:
description: Kustomize holds kustomize specific options
Expand Down Expand Up @@ -2162,34 +2033,8 @@ spec:
type: string
version:
description: Version is the Helm version to use for
templating (either "2" or "3")
type: string
type: object
ksonnet:
description: Ksonnet holds ksonnet specific options
properties:
environment:
description: Environment is a ksonnet application
environment name
templating ("3")
type: string
parameters:
description: Parameters are a list of ksonnet component
parameter override values
items:
description: KsonnetParameter is a ksonnet component
parameter
properties:
component:
type: string
name:
type: string
value:
type: string
required:
- name
- value
type: object
type: array
type: object
kustomize:
description: Kustomize holds kustomize specific options
Expand Down Expand Up @@ -2302,4 +2147,4 @@ spec:
type: object
served: true
storage: true
subresources: {}
subresources: {}
Loading