From f317bbf74d89c56bd786323df02ae18ecffab689 Mon Sep 17 00:00:00 2001 From: "R. P. Taylor" <1686627+rptaylor@users.noreply.github.com> Date: Wed, 28 May 2025 19:15:08 -0700 Subject: [PATCH] feat(argo-cd): use dual-stack AWS ECR registry for redis (#3328) * use dual-stack AWS ECR registry for redis Signed-off-by: Ryan Taylor <1686627+rptaylor@users.noreply.github.com> * chore: Also change HAProxy Image Repo to dual-stack endpoint Signed-off-by: Marco Maurer --------- Signed-off-by: Ryan Taylor <1686627+rptaylor@users.noreply.github.com> Signed-off-by: Marco Maurer Co-authored-by: Marco Maurer --- .github/workflows/lint-and-test.yml | 2 +- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 5 +++-- charts/argo-cd/values.yaml | 7 +++++-- renovate.json | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 42e9374d..c7226e09 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -9,7 +9,7 @@ jobs: linter-artifacthub: runs-on: ubuntu-latest container: - image: public.ecr.aws/artifacthub/ah:v1.14.0 + image: ecr-public.aws.com/artifacthub/ah:v1.14.0 options: --user 1001 steps: - name: Checkout diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 23cb8d34..524c0490 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v3.0.4 kubeVersion: ">=1.25.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 8.0.11 +version: 8.0.12 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -27,4 +27,4 @@ annotations: url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - kind: changed - description: Bump argo-cd to v3.0.4 + description: use dual-stack AWS ECR registry for redis diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 91824a72..2eafaf7e 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -1324,7 +1324,7 @@ NOTE: Any values you put under `.Values.configs.cm` are passed to argocd-cm Conf | redis.extraArgs | list | `[]` | Additional command line arguments to pass to redis-server | | redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod | | redis.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Redis image pull policy | -| redis.image.repository | string | `"public.ecr.aws/docker/library/redis"` | Redis repository | +| redis.image.repository | string | `"ecr-public.aws.com/docker/library/redis"` | Redis repository | | redis.image.tag | string | `"7.2.8-alpine"` | Redis tag | | redis.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry | | redis.initContainers | list | `[]` | Init containers to add to the redis pod | @@ -1406,11 +1406,12 @@ The main options are listed here: | redis-ha.haproxy.containerSecurityContext | object | See [values.yaml] | HAProxy container-level security context | | 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.image.repository | string | `"ecr-public.aws.com/docker/library/haproxy"` | HAProxy Image Repository | | redis-ha.haproxy.labels | object | `{"app.kubernetes.io/name":"argocd-redis-ha-haproxy"}` | Custom labels for the haproxy pod. This is relevant for Argo CD CLI. | | redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping | | redis-ha.haproxy.tolerations | list | `[]` | [Tolerations] for use with node taints for haproxy pods. | | redis-ha.hardAntiAffinity | bool | `true` | Whether the Redis server pods should be forced to run on separate nodes. | -| redis-ha.image.repository | string | `"public.ecr.aws/docker/library/redis"` | Redis repository | +| redis-ha.image.repository | string | `"ecr-public.aws.com/docker/library/redis"` | Redis repository | | redis-ha.image.tag | string | `"7.2.8-alpine"` | Redis tag | | redis-ha.persistentVolume.enabled | bool | `false` | Configures persistence 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) | diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 86cd1c75..cb130f9b 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -1416,7 +1416,7 @@ redis: ## Redis image image: # -- Redis repository - repository: public.ecr.aws/docker/library/redis + repository: ecr-public.aws.com/docker/library/redis # -- Redis tag ## Do not upgrade to >= 7.4.0, otherwise you are no longer using an open source version of Redis tag: 7.2.8-alpine @@ -1703,7 +1703,7 @@ redis-ha: ## Redis image image: # -- Redis repository - repository: public.ecr.aws/docker/library/redis + repository: ecr-public.aws.com/docker/library/redis # -- Redis tag ## Do not upgrade to >= 7.4.0, otherwise you are no longer using an open source version of Redis tag: 7.2.8-alpine @@ -1735,6 +1735,9 @@ redis-ha: # -- Custom labels for the haproxy pod. This is relevant for Argo CD CLI. labels: app.kubernetes.io/name: argocd-redis-ha-haproxy + image: + # -- HAProxy Image Repository + repository: ecr-public.aws.com/docker/library/haproxy metrics: # -- HAProxy enable prometheus metric scraping enabled: true diff --git a/renovate.json b/renovate.json index f9e27aa9..e8bc3e1d 100644 --- a/renovate.json +++ b/renovate.json @@ -99,7 +99,7 @@ }, { "matchPackageNames": [ - "public.ecr.aws/docker/library/redis" + "ecr-public.aws.com/docker/library/redis" ], "matchDatasources": [ "docker"