Skip to content

Commit

Permalink
feat(argo-cd): update + general fixes and improvements (#867)
Browse files Browse the repository at this point in the history
* feat(argo-cd): update + general fixes and improvements

Signed-off-by: David van der Spek <[email protected]>

* chore: bump version

Signed-off-by: David van der Spek <[email protected]>

* fix: bump crds

Signed-off-by: David van der Spek <[email protected]>

---------

Signed-off-by: David van der Spek <[email protected]>
  • Loading branch information
davidspek authored Dec 11, 2023
1 parent f5fa843 commit 94e588d
Show file tree
Hide file tree
Showing 12 changed files with 12,392 additions and 1,391 deletions.
8 changes: 4 additions & 4 deletions argo-cd/helm/argo-cd/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ dependencies:
version: 0.1.1
- name: argo-cd
repository: https://argoproj.github.io/argo-helm
version: 5.29.1
version: 5.51.6
- name: argocd-image-updater
repository: https://argoproj.github.io/argo-helm
version: 0.8.1
digest: sha256:5c6bfc3cdf2b1991b4037b6a3bf7618ec55224ae3f382c966b32fda4beab95cb
generated: "2023-04-27T17:51:29.905696-04:00"
version: 0.9.1
digest: sha256:c73e498f2645acbbf9cdc1f1ad15cdd309e62e8fe3a8c76e5dcc044550b3e4f3
generated: "2023-12-11T12:44:59.177822+01:00"
8 changes: 4 additions & 4 deletions argo-cd/helm/argo-cd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ apiVersion: v2
name: argo-cd
description: A Helm chart for Kubernetes
type: application
version: 0.1.44
appVersion: v2.6.7
version: 0.2.0
appVersion: v2.9.3
dependencies:
- name: config-overlays
version: 0.1.1
repository: https://pluralsh.github.io/module-library
- name: argo-cd
version: 5.29.1
version: 5.51.6
repository: https://argoproj.github.io/argo-helm
- name: argocd-image-updater
version: 0.8.1
version: 0.9.1
repository: https://argoproj.github.io/argo-helm
condition: argocd-image-updater.enabled
Binary file removed argo-cd/helm/argo-cd/charts/argo-cd-5.29.1.tgz
Binary file not shown.
Binary file added argo-cd/helm/argo-cd/charts/argo-cd-5.51.6.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
3,166 changes: 2,936 additions & 230 deletions argo-cd/helm/argo-cd/crds/crd-application.yaml

Large diffs are not rendered by default.

10,572 changes: 9,431 additions & 1,141 deletions argo-cd/helm/argo-cd/crds/crd-applicationset.yaml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions argo-cd/helm/argo-cd/crds/crd-extension.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.1
labels:
app.kubernetes.io/name: argocdextensions.argoproj.io
app.kubernetes.io/part-of: argocd
Expand Down
12 changes: 7 additions & 5 deletions argo-cd/helm/argo-cd/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
global:
image:
repository: dkr.plural.sh/argo-cd/argoproj/argocd
tag: v2.6.7
tag: v2.9.3
podAnnotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"

Expand All @@ -13,16 +13,18 @@ argo-cd:
username: ""
port: 6379
configs:
cm:
exec.enabled: true
params:
redis.db: 2
## Controller
controller:
resources:
requests:
cpu: 100m
memory: 256Mi
memory: 512Mi
limits:
memory: 384Mi
memory: 1Gi
## Server metrics controller configuration
metrics:
enabled: true
Expand Down Expand Up @@ -65,7 +67,7 @@ argo-cd:
enabled: true
image:
repository: dkr.plural.sh/argo-cd/dexidp/dex
tag: v2.35.3
tag: v2.37.0
imagePullPolicy: IfNotPresent
resources: {}
# limits:
Expand Down Expand Up @@ -162,7 +164,7 @@ argocd-image-updater:
image:
repository: dkr.plural.sh/argo-cd/argoprojlabs/argocd-image-updater
pullPolicy: IfNotPresent
tag: v0.11.3
tag: v0.12.2
config:
applicationsAPIKind: "kubernetes"
argocd:
Expand Down
2 changes: 1 addition & 1 deletion argo-cd/helm/argo-cd/values.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ argo-cd:
hosts:
- {{ $hostname }}
tls:
- secretName: argocd-server-tls
- secretName: argocd-ingress-server-tls
hosts:
- {{ $hostname }}
{{- if .OIDC }}
Expand Down
13 changes: 7 additions & 6 deletions argo-cd/vendor_images.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
docker.io:
images:
argoprojlabs/argocd-image-updater: []
quay.io:
images-by-tag-regex:
argoproj/argocd: ^v?[0-9]+\.[0-9]+?\.[0-9]+$
# the below regex can be used to limit the regex range so that only versions >= v2.8.0 are matched
argoproj/argocd: (?:^v?2\.(?:[8-9]|[1-9][0-9]{1,})\.[0-9]+$)|(?:^v?(?:[3-9]|[1-9][0-9]{1,})\.[0-9]+?\.[0-9]+$)
# the below regex can be used to limit the regex range so that only versions >= 0.12.0 are matched
argoprojlabs/argocd-image-updater: (?:^v?0\.(?:1[2-9]|[2-9][0-9]|[1-9][0-9]{2,})\.[0-9]+$)|(?:^v?(?:[1-9]|[1-9][0-9]{1,})\.[0-9]+?\.[0-9]+$)
ghcr.io:
images:
dexidp/dex: []
images-by-tag-regex:
# the below regex can be used to limit the regex range so that only versions >= v2.37.0 are matched
dexidp/dex: (?:^v?2\.(?:3[7-9]|[4-9][0-9]|[1-9][0-9]{2,})\.[0-9]+$)|(?:^v?(?:[3-9]|[1-9][0-9]{1,})\.[0-9]+?\.[0-9]+$)

0 comments on commit 94e588d

Please sign in to comment.