diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index f548d0df..f5892468 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.4.7 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 4.10.1 +version: 4.10.2 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,5 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - [Changed]: redis image was migrated from docker hub to public ecr for docker hub rate limit - - [Changed]: redis-exporter image was migrated from docker hub to public ecr for docker hub rate limit + - "[Fixed]: Drop all `~` keys from redis-ha because they cause error on kustomize and cannot document via helm-docs" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 590d372d..e563d053 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -696,13 +696,8 @@ The main options are listed here: |-----|------|---------|-------------| | redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment | | redis-ha.exporter.enabled | bool | `true` | If `true`, the prometheus exporter sidecar is enabled | -| redis-ha.exporter.image | string | `nil` (follows subchart default) | Exporter image | -| redis-ha.exporter.tag | string | `nil` (follows subchart default) | Exporter tag | | redis-ha.haproxy.enabled | bool | `true` | Enabled HAProxy LoadBalancing/Proxy | -| redis-ha.haproxy.image.repository | string | `nil` (follows subchart default) | HAProxy Image Repository | -| 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 | `"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) | @@ -712,6 +707,11 @@ The main options are listed here: | redis-ha.topologySpreadConstraints.maxSkew | string | `""` (defaults to `1`) | Max skew of pods tolerated | | redis-ha.topologySpreadConstraints.topologyKey | string | `""` (defaults to `topology.kubernetes.io/zone`) | Topology key for spread | | redis-ha.topologySpreadConstraints.whenUnsatisfiable | string | `""` (defaults to `ScheduleAnyway`) | Enforcement policy, hard or soft | +| redis-ha.exporter.image | string | `nil` (follows subchart default) | Exporter image | +| redis-ha.exporter.tag | string | `nil` (follows subchart default) | Exporter tag | +| redis-ha.haproxy.image.repository | string | `nil` (follows subchart default) | HAProxy Image Repository | +| redis-ha.haproxy.image.tag | string | `nil` (follows subchart default) | HAProxy Image Tag | +| redis-ha.image.repository | string | `nil` (follows subchart default) | Redis image repository | ### Option 3 - External Redis diff --git a/charts/argo-cd/README.md.gotmpl b/charts/argo-cd/README.md.gotmpl index 93fb78ce..99523737 100644 --- a/charts/argo-cd/README.md.gotmpl +++ b/charts/argo-cd/README.md.gotmpl @@ -288,6 +288,11 @@ The main options are listed here: | {{ .Key }} | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} | {{- end }} {{- end }} +| redis-ha.exporter.image | string | `nil` (follows subchart default) | Exporter image | +| redis-ha.exporter.tag | string | `nil` (follows subchart default) | Exporter tag | +| redis-ha.haproxy.image.repository | string | `nil` (follows subchart default) | HAProxy Image Repository | +| redis-ha.haproxy.image.tag | string | `nil` (follows subchart default) | HAProxy Image Tag | +| redis-ha.image.repository | string | `nil` (follows subchart default) | Redis image repository | ### Option 3 - External Redis diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 7bf92d94..67ed8e5b 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -784,12 +784,6 @@ redis-ha: exporter: # -- If `true`, the prometheus exporter sidecar is enabled enabled: true - # -- Exporter image - # @default -- `nil` (follows subchart default) - image: ~ - # -- Exporter tag - # @default -- `nil` (follows subchart default) - tag: ~ persistentVolume: # -- Configures persistency on Redis nodes enabled: false @@ -805,20 +799,10 @@ redis-ha: haproxy: # -- Enabled HAProxy LoadBalancing/Proxy enabled: true - image: - # -- HAProxy Image Repository - # @default -- `nil` (follows subchart default) - repository: ~ - # -- HAProxy Image Tag - # @default -- `nil` (follows subchart default) - tag: ~ metrics: # -- HAProxy enable prometheus metric scraping enabled: true image: - # -- Redis image repository - # @default -- `nil` (follows subchart default) - repository: ~ # -- Redis tag tag: 7.0.0-alpine