From 736b82433918304b086aaa4401f84f366eecd8b9 Mon Sep 17 00:00:00 2001
From: Aikawa <yu.croco@gmail.com>
Date: Fri, 15 Sep 2023 19:47:59 +0900
Subject: [PATCH] fix(argo-cd): Align redis-ha's affinity type to upstream due
to warnings (#2270)
Signed-off-by: yu-croco <yu.croco@gmail.com>
---
charts/argo-cd/Chart.yaml | 6 +++---
charts/argo-cd/README.md | 4 ++--
charts/argo-cd/values.yaml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index b56bf88f..49d2233c 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.8.4
kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
-version: 5.46.3
+version: 5.46.4
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
@@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- - kind: changed
- description: Upgrade Argo CD to v2.8.4
+ - kind: fixed
+ description: Align redis-ha's affinity type to upstream due to warnings
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index abb6be29..bb51d130 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -1000,13 +1000,13 @@ The main options are listed here:
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| redis-ha.additionalAffinities | object | `{}` | Additional affinities to add to the Redis server pods. |
-| redis-ha.affinity | object | `{}` | Assign custom [affinity] rules to the Redis pods. |
+| redis-ha.affinity | string | `""` | Assign custom [affinity] rules to the Redis pods. |
| redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment |
| redis-ha.exporter.enabled | bool | `false` | Enable Prometheus redis-exporter sidecar |
| redis-ha.exporter.image | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter |
| redis-ha.exporter.tag | string | `"1.53.0"` | Tag to use for the redis-exporter |
| redis-ha.haproxy.additionalAffinities | object | `{}` | Additional affinities to add to the haproxy pods. |
-| redis-ha.haproxy.affinity | object | `{}` | Assign custom [affinity] rules to the haproxy pods. |
+| redis-ha.haproxy.affinity | string | `""` | Assign custom [affinity] rules to the haproxy pods. |
| redis-ha.haproxy.enabled | bool | `true` | Enabled HAProxy LoadBalancing/Proxy |
| redis-ha.haproxy.hardAntiAffinity | bool | `true` | Whether the haproxy pods should be forced to run on separate nodes. |
| redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping |
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 22dcfcc6..fb078ac6 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -1415,7 +1415,7 @@ redis-ha:
# -- Additional affinities to add to the haproxy pods.
additionalAffinities: {}
# -- Assign custom [affinity] rules to the haproxy pods.
- affinity: {}
+ affinity: |
# -- [Tolerations] for use with node taints for haproxy pods.
tolerations: []
@@ -1426,7 +1426,7 @@ redis-ha:
additionalAffinities: {}
# -- Assign custom [affinity] rules to the Redis pods.
- affinity: {}
+ affinity: |
# -- [Tolerations] for use with node taints for Redis pods.
tolerations: []