Compare commits

...

3 Commits

Author SHA1 Message Date
github-actions[bot]
ad2724661b Bump version to 2.14.2 on release-2.14 branch (#21797)
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: leoluz <44989+leoluz@users.noreply.github.com>
2025-02-05 18:39:56 -05:00
gcp-cherry-pick-bot[bot]
efd9c32e25 fix: Add proxy registry key by dest server + name (cherry-pick #21791) (#21794)
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Co-authored-by: Leonardo Luz Almeida <leoluz@users.noreply.github.com>
2025-02-05 16:13:27 -05:00
github-actions[bot]
3345d05a43 Bump version to 2.14.1 on release-2.14 branch (#21758)
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: crenshaw-dev <350466+crenshaw-dev@users.noreply.github.com>
2025-02-03 16:21:20 -05:00
17 changed files with 108 additions and 93 deletions

View File

@@ -1 +1 @@
2.14.0-rc7
2.14.2

View File

@@ -184,12 +184,11 @@ the argocd-secret with key 'some.argocd.secret.key'.
If provided, and multiple services are configured, will have to match
the application destination name or server to have requests properly
forwarded to this service URL. If there are multiple backends for the
same extension this field is required. In this case at least one of
the two will be required: name or server. It is better to provide both
values to avoid problems with applications unable to send requests to
the proper backend service. If only one backend service is
configured, this field is ignored, and all requests are forwarded to
the configured one.
same extension this field is required. In this case, it is necessary
to provide both values to avoid problems with applications unable to
send requests to the proper backend service. If only one backend
service is configured, this field is ignored, and all requests are
forwarded to the configured one.
#### `extensions.backend.services.cluster.name` (*string*)
(optional)

View File

@@ -5,7 +5,7 @@ kind: Kustomization
images:
- name: quay.io/argoproj/argocd
newName: quay.io/argoproj/argocd
newTag: v2.14.0-rc7
newTag: v2.14.2
resources:
- ./application-controller
- ./dex

View File

@@ -24165,7 +24165,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -24435,7 +24435,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -24696,7 +24696,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -24748,7 +24748,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -25066,7 +25066,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -24133,7 +24133,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -24253,7 +24253,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -24514,7 +24514,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -24566,7 +24566,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -24884,7 +24884,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -12,4 +12,4 @@ resources:
images:
- name: quay.io/argoproj/argocd
newName: quay.io/argoproj/argocd
newTag: v2.14.0-rc7
newTag: v2.14.2

View File

@@ -12,7 +12,7 @@ patches:
images:
- name: quay.io/argoproj/argocd
newName: quay.io/argoproj/argocd
newTag: v2.14.0-rc7
newTag: v2.14.2
resources:
- ../../base/application-controller
- ../../base/applicationset-controller

View File

@@ -25506,7 +25506,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -25793,7 +25793,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -25883,7 +25883,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -26004,7 +26004,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -26291,7 +26291,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -26343,7 +26343,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -26705,7 +26705,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -27059,7 +27059,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -25476,7 +25476,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -25613,7 +25613,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -25703,7 +25703,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -25824,7 +25824,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -26111,7 +26111,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -26163,7 +26163,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -26525,7 +26525,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -26879,7 +26879,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -1736,7 +1736,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -2023,7 +2023,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -2113,7 +2113,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -2234,7 +2234,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -2521,7 +2521,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -2573,7 +2573,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -2935,7 +2935,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -3289,7 +3289,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -1706,7 +1706,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -1843,7 +1843,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -1933,7 +1933,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -2054,7 +2054,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -2341,7 +2341,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -2393,7 +2393,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -2755,7 +2755,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -3109,7 +3109,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -24625,7 +24625,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -24912,7 +24912,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -25002,7 +25002,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -25104,7 +25104,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -25365,7 +25365,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -25417,7 +25417,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -25777,7 +25777,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -26131,7 +26131,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

16
manifests/install.yaml generated
View File

@@ -24593,7 +24593,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -24730,7 +24730,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -24820,7 +24820,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -24922,7 +24922,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -25183,7 +25183,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -25235,7 +25235,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -25595,7 +25595,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -25949,7 +25949,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -855,7 +855,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -1142,7 +1142,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -1232,7 +1232,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -1334,7 +1334,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -1595,7 +1595,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -1647,7 +1647,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -2007,7 +2007,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -2361,7 +2361,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -823,7 +823,7 @@ spec:
key: applicationsetcontroller.requeue.after
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-applicationset-controller
ports:
@@ -960,7 +960,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /shared/argocd-dex
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: copyutil
securityContext:
@@ -1050,7 +1050,7 @@ spec:
key: notificationscontroller.repo.server.plaintext
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
tcpSocket:
@@ -1152,7 +1152,7 @@ spec:
- argocd
- admin
- redis-initial-password
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: IfNotPresent
name: secret-init
securityContext:
@@ -1413,7 +1413,7 @@ spec:
value: /helm-working-dir
- name: HELM_DATA_HOME
value: /helm-working-dir
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
@@ -1465,7 +1465,7 @@ spec:
- -n
- /usr/local/bin/argocd
- /var/run/argocd/argocd-cmp-server
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
name: copyutil
securityContext:
allowPrivilegeEscalation: false
@@ -1825,7 +1825,7 @@ spec:
key: hydrator.enabled
name: argocd-cmd-params-cm
optional: true
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
livenessProbe:
httpGet:
@@ -2179,7 +2179,7 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
image: quay.io/argoproj/argocd:v2.14.0-rc7
image: quay.io/argoproj/argocd:v2.14.2
imagePullPolicy: Always
name: argocd-application-controller
ports:

View File

@@ -640,6 +640,14 @@ func appendProxy(registry ProxyRegistry,
}
registry[key] = proxy
}
if service.Cluster.Name != "" && service.Cluster.Server != "" {
key := proxyKey(extName, service.Cluster.Name, service.Cluster.Server)
if _, exist := registry[key]; exist {
return fmt.Errorf("duplicated proxy configuration found for extension key %q", key)
}
registry[key] = proxy
}
return nil
}

View File

@@ -355,7 +355,8 @@ func TestCallExtension(t *testing.T) {
settings := &settings.ArgoCDSettings{
ExtensionConfig: map[string]string{
"": configYaml,
"ephemeral": "services:\n- url: http://some-server.com",
"": configYaml,
},
Secrets: secrets,
}
@@ -481,11 +482,13 @@ func TestCallExtension(t *testing.T) {
response1 := "response backend 1"
cluster1Name := "cluster1"
cluster1URL := "url1"
beSrv1 := startBackendTestSrv(response1)
defer beSrv1.Close()
response2 := "response backend 2"
cluster2URL := "cluster2"
cluster2Name := "cluster2"
cluster2URL := "url2"
beSrv2 := startBackendTestSrv(response2)
defer beSrv2.Close()
@@ -493,7 +496,7 @@ func TestCallExtension(t *testing.T) {
f.appGetterMock.On("Get", "ns2", "app2").Return(getApp("", cluster2URL, defaultProjectName), nil)
withRbac(f, true, true)
withExtensionConfig(getExtensionConfigWith2Backends(extName, beSrv1.URL, cluster1Name, beSrv2.URL, cluster2URL), f)
withExtensionConfig(getExtensionConfigWith2Backends(extName, beSrv1.URL, cluster1Name, cluster1URL, beSrv2.URL, cluster2Name, cluster2URL), f)
withProject(getProjectWithDestinations("project-name", []string{cluster1Name}, []string{cluster2URL}), f)
withMetrics(f)
withUser(f, "some-user", []string{"group1", "group2"})
@@ -673,7 +676,7 @@ func TestCallExtension(t *testing.T) {
f.appGetterMock.On("Get", "ns1", "app1").Return(getApp(maliciousName, destinationServer, defaultProjectName), nil)
withRbac(f, true, true)
withExtensionConfig(getExtensionConfigWith2Backends(extName, "url1", "clusterName", "url2", "clusterURL"), f)
withExtensionConfig(getExtensionConfigWith2Backends(extName, "url1", "cluster1Name", "cluster1URL", "url2", "cluster2Name", "cluster2URL"), f)
withProject(getProjectWithDestinations("project-name", nil, []string{"srv1", destinationServer}), f)
withMetrics(f)
withUser(f, "some-user", []string{"group1", "group2"})
@@ -740,7 +743,7 @@ extensions:
return fmt.Sprintf(cfg, name, url)
}
func getExtensionConfigWith2Backends(name, url1, clusName, url2, clusURL string) string {
func getExtensionConfigWith2Backends(name, url1, clus1Name, clus1URL, url2, clus2Name, clus2URL string) string {
cfg := `
extensions:
- name: %s
@@ -752,17 +755,22 @@ extensions:
value: '$extension.auth.header'
cluster:
name: %s
server: %s
- url: %s
headers:
- name: Authorization
value: '$extension.auth.header2'
cluster:
name: %s
server: %s
- url: http://test.com
cluster:
name: cl1
- url: http://test2.com
cluster:
name: cl2
`
// second extension is configured with the cluster url rather
// than the cluster name so we can validate that both use-cases
// are working
return fmt.Sprintf(cfg, name, url1, clusName, url2, clusURL)
return fmt.Sprintf(cfg, name, url1, clus1Name, clus1URL, url2, clus2Name, clus2URL)
}
func getExtensionConfigString() string {