Bump version to 2.7.1 (#13418 )

Signed-off-by: GitHub <noreply@github.com> Co-authored-by: crenshaw-dev <crenshaw-dev@users.noreply.github.com>
fix(manifests): use params CM and env var for redis server (#13214 ) (#13396 ) (#13417 )
2026-03-10 18:38:46 +01:00 · 2023-05-02 12:19:11 -04:00 · 2023-05-02 12:15:41 -04:00
17 changed files with 103 additions and 86 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.7.0
+2.7.1
--- a/docs/operator-manual/upgrading/2.6-2.7.md
+++ b/docs/operator-manual/upgrading/2.6-2.7.md
@@ -81,3 +81,12 @@ Read the full [documentation](../deep_links.md) to see all possible combinations
 Argo CD now supports the `helm.sh/resource-policy` annotation to control the deletion of resources. The behavior is the same as the behavior of
 `argocd.argoproj.io/sync-options: Delete=false` annotation: if the annotation is present and set to `keep`, the resource will not be deleted
 when the application is deleted.
+
+## Check your Kustomize patches for `--redis` changes
+
+Starting in Argo CD 2.7, the install manifests no longer pass the Redis server name via `--redis`. 
+
+If your environment uses Kustomize JSON patches to modify the Redis server name, the patch might break when you upgrade
+to the 2.7 manifests. If it does, you can remove the patch and instead set the Redis server name via the `redis.server` 
+field in the argocd-cmd-params-cm ConfigMap. That value will be passed to the necessary components via `valueFrom` 
+environment variables.
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.7.0
+  newTag: v2.7.1
 resources:
 - ./application-controller
 - ./dex
--- a/manifests/base/redis/argocd-redis-deployment.yaml
+++ b/manifests/base/redis/argocd-redis-deployment.yaml
@@ -30,9 +30,6 @@ spec:
        - ""
        - "--appendonly"
        - "no"
-        env:
-        - name: ARGOCD_REDIS_SERVICE
-          value: ""
        ports:
        - containerPort: 6379
        securityContext:
--- a/manifests/base/redis/kustomization.yaml
+++ b/manifests/base/redis/kustomization.yaml
@@ -7,15 +7,3 @@ resources:
 - argocd-redis-sa.yaml
 - argocd-redis-service.yaml
 - argocd-redis-network-policy.yaml
-
-replacements:
-  - source:
-      kind: Service
-      name: argocd-redis
-      version: v1
-    targets:
-      - select:
-          kind: Deployment
-          name: argocd-redis
-        fieldPaths:
-          - spec.template.spec.containers.[name=redis].env.[name=ARGOCD_REDIS_SERVICE].value
--- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml
+++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml
@@ -23,8 +23,6 @@ spec:
        imagePullPolicy: Always
        args:
          - /usr/local/bin/argocd-repo-server
-          - "--redis"
-          - "$(ARGOCD_REDIS_SERVICE):6379"
        env:
          - name: ARGOCD_RECONCILIATION_TIMEOUT
            valueFrom:
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -16700,7 +16700,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -16782,9 +16782,6 @@ spec:
        - ""
        - --appendonly
        - "no"
-        env:
-        - name: ARGOCD_REDIS_SERVICE
-          value: argocd-redis
        image: redis:7.0.11-alpine
        imagePullPolicy: Always
        name: redis
@@ -16838,8 +16835,6 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-repo-server
-        - --redis
-        - $(ARGOCD_REDIS_SERVICE):6379
        env:
        - name: ARGOCD_RECONCILIATION_TIMEOUT
          valueFrom:
@@ -16967,7 +16962,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -17019,7 +17014,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -17232,7 +17227,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/core-install/kustomization.yaml
+++ b/manifests/core-install/kustomization.yaml
@@ -12,4 +12,4 @@ resources:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.7.0
+  newTag: v2.7.1
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -6,12 +6,13 @@ patches:
 - path: overlays/argocd-repo-server-deployment.yaml
 - path: overlays/argocd-server-deployment.yaml
 - path: overlays/argocd-application-controller-statefulset.yaml
+- path: overlays/argocd-cmd-params-cm.yaml


 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.7.0
+  newTag: v2.7.1
 resources:
 - ../../base/application-controller
 - ../../base/applicationset-controller
--- a/manifests/ha/base/overlays/argocd-application-controller-statefulset.yaml
+++ b/manifests/ha/base/overlays/argocd-application-controller-statefulset.yaml
@@ -9,5 +9,9 @@ spec:
      - name: argocd-application-controller
        args:
        - /usr/local/bin/argocd-application-controller
-        - --redis
-        - "argocd-redis-ha-haproxy:6379"
+        env:
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              name: argocd-cmd-params-cm
+              key: redis.server
--- a/manifests/ha/base/overlays/argocd-cmd-params-cm.yaml
+++ b/manifests/ha/base/overlays/argocd-cmd-params-cm.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-cmd-params-cm
+data:
+  redis.server: argocd-redis-ha-haproxy:6379
--- a/manifests/ha/base/overlays/argocd-repo-server-deployment.yaml
+++ b/manifests/ha/base/overlays/argocd-repo-server-deployment.yaml
@@ -24,5 +24,9 @@ spec:
      - name: argocd-repo-server
        args:
        - /usr/local/bin/argocd-repo-server
-        - --redis
-        - "argocd-redis-ha-haproxy:6379"
+        env:
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              name: argocd-cmd-params-cm
+              key: redis.server
--- a/manifests/ha/base/overlays/argocd-server-deployment.yaml
+++ b/manifests/ha/base/overlays/argocd-server-deployment.yaml
@@ -25,7 +25,10 @@ spec:
        env:
        - name: ARGOCD_API_SERVER_REPLICAS
          value: '2'
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              name: argocd-cmd-params-cm
+              key: redis.server
        args:
        - /usr/local/bin/argocd-server
-        - --redis
-        - "argocd-redis-ha-haproxy:6379"
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -16777,6 +16777,8 @@ metadata:
  name: argocd-cm
 ---
 apiVersion: v1
+data:
+  redis.server: argocd-redis-ha-haproxy:6379
 kind: ConfigMap
 metadata:
  labels:
@@ -17919,7 +17921,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -18029,7 +18031,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -18086,7 +18088,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -18259,9 +18261,12 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-repo-server
-        - --redis
-        - argocd-redis-ha-haproxy:6379
        env:
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
        - name: ARGOCD_RECONCILIATION_TIMEOUT
          valueFrom:
            configMapKeyRef:
@@ -18388,7 +18393,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -18440,7 +18445,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -18522,11 +18527,14 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-server
-        - --redis
-        - argocd-redis-ha-haproxy:6379
        env:
        - name: ARGOCD_API_SERVER_REPLICAS
          value: "2"
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
        - name: ARGOCD_SERVER_INSECURE
          valueFrom:
            configMapKeyRef:
@@ -18719,7 +18727,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -18830,9 +18838,12 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-application-controller
-        - --redis
-        - argocd-redis-ha-haproxy:6379
        env:
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
        - name: ARGOCD_CONTROLLER_REPLICAS
          value: "1"
        - name: ARGOCD_RECONCILIATION_TIMEOUT
@@ -18961,7 +18972,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -437,6 +437,8 @@ metadata:
  name: argocd-cm
 ---
 apiVersion: v1
+data:
+  redis.server: argocd-redis-ha-haproxy:6379
 kind: ConfigMap
 metadata:
  labels:
@@ -1579,7 +1581,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -1689,7 +1691,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -1746,7 +1748,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -1919,9 +1921,12 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-repo-server
-        - --redis
-        - argocd-redis-ha-haproxy:6379
        env:
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
        - name: ARGOCD_RECONCILIATION_TIMEOUT
          valueFrom:
            configMapKeyRef:
@@ -2048,7 +2053,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -2100,7 +2105,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -2182,11 +2187,14 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-server
-        - --redis
-        - argocd-redis-ha-haproxy:6379
        env:
        - name: ARGOCD_API_SERVER_REPLICAS
          value: "2"
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
        - name: ARGOCD_SERVER_INSECURE
          valueFrom:
            configMapKeyRef:
@@ -2379,7 +2387,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -2490,9 +2498,12 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-application-controller
-        - --redis
-        - argocd-redis-ha-haproxy:6379
        env:
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
        - name: ARGOCD_CONTROLLER_REPLICAS
          value: "1"
        - name: ARGOCD_RECONCILIATION_TIMEOUT
@@ -2621,7 +2632,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -17038,7 +17038,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -17148,7 +17148,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -17205,7 +17205,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -17282,9 +17282,6 @@ spec:
        - ""
        - --appendonly
        - "no"
-        env:
-        - name: ARGOCD_REDIS_SERVICE
-          value: argocd-redis
        image: redis:7.0.11-alpine
        imagePullPolicy: Always
        name: redis
@@ -17338,8 +17335,6 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-repo-server
-        - --redis
-        - $(ARGOCD_REDIS_SERVICE):6379
        env:
        - name: ARGOCD_RECONCILIATION_TIMEOUT
          valueFrom:
@@ -17467,7 +17462,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -17519,7 +17514,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -17794,7 +17789,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -18034,7 +18029,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -698,7 +698,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -808,7 +808,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -865,7 +865,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -942,9 +942,6 @@ spec:
        - ""
        - --appendonly
        - "no"
-        env:
-        - name: ARGOCD_REDIS_SERVICE
-          value: argocd-redis
        image: redis:7.0.11-alpine
        imagePullPolicy: Always
        name: redis
@@ -998,8 +995,6 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-repo-server
-        - --redis
-        - $(ARGOCD_REDIS_SERVICE):6379
        env:
        - name: ARGOCD_RECONCILIATION_TIMEOUT
          valueFrom:
@@ -1127,7 +1122,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -1179,7 +1174,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -1454,7 +1449,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -1694,7 +1689,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.0
+        image: quay.io/argoproj/argocd:v2.7.1
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
@@ -1 +1 @@
 .7.0
 .7.1