This commit is contained in:
parent
5917c76b6c
commit
3976abaac3
|
@ -3079,11 +3079,7 @@ spec:
|
||||||
- -n
|
- -n
|
||||||
- /usr/local/bin/argocd
|
- /usr/local/bin/argocd
|
||||||
- /shared/argocd-dex
|
- /shared/argocd-dex
|
||||||
<<<<<<< HEAD
|
|
||||||
image: quay.io/argoproj/argocd:v2.1.8
|
|
||||||
=======
|
|
||||||
image: quay.io/argoproj/argocd:v2.2.0
|
image: quay.io/argoproj/argocd:v2.2.0
|
||||||
>>>>>>> ab3e92a (upgrade argocd)
|
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
name: copyutil
|
name: copyutil
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
@ -3258,9 +3254,6 @@ spec:
|
||||||
key: reposerver.default.cache.expiration
|
key: reposerver.default.cache.expiration
|
||||||
name: argocd-cmd-params-cm
|
name: argocd-cmd-params-cm
|
||||||
optional: true
|
optional: true
|
||||||
<<<<<<< HEAD
|
|
||||||
image: quay.io/argoproj/argocd:v2.1.8
|
|
||||||
=======
|
|
||||||
- name: HELM_CACHE_HOME
|
- name: HELM_CACHE_HOME
|
||||||
value: /helm-working-dir
|
value: /helm-working-dir
|
||||||
- name: HELM_CONFIG_HOME
|
- name: HELM_CONFIG_HOME
|
||||||
|
@ -3268,7 +3261,6 @@ spec:
|
||||||
- name: HELM_DATA_HOME
|
- name: HELM_DATA_HOME
|
||||||
value: /helm-working-dir
|
value: /helm-working-dir
|
||||||
image: quay.io/argoproj/argocd:v2.2.0
|
image: quay.io/argoproj/argocd:v2.2.0
|
||||||
>>>>>>> ab3e92a (upgrade argocd)
|
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
failureThreshold: 3
|
failureThreshold: 3
|
||||||
|
@ -3534,9 +3526,6 @@ spec:
|
||||||
key: server.default.cache.expiration
|
key: server.default.cache.expiration
|
||||||
name: argocd-cmd-params-cm
|
name: argocd-cmd-params-cm
|
||||||
optional: true
|
optional: true
|
||||||
<<<<<<< HEAD
|
|
||||||
image: quay.io/argoproj/argocd:v2.1.8
|
|
||||||
=======
|
|
||||||
- name: ARGOCD_MAX_COOKIE_NUMBER
|
- name: ARGOCD_MAX_COOKIE_NUMBER
|
||||||
valueFrom:
|
valueFrom:
|
||||||
configMapKeyRef:
|
configMapKeyRef:
|
||||||
|
@ -3544,7 +3533,6 @@ spec:
|
||||||
name: argocd-cmd-params-cm
|
name: argocd-cmd-params-cm
|
||||||
optional: true
|
optional: true
|
||||||
image: quay.io/argoproj/argocd:v2.2.0
|
image: quay.io/argoproj/argocd:v2.2.0
|
||||||
>>>>>>> ab3e92a (upgrade argocd)
|
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
|
Reference in a new issue