tobru/gitops-tbrnt
Archived
1
0
Fork 0
Code Issues Pull requests Releases Activity

fix bad merge
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Tobias Brunner 2021-12-15 20:37:21 +01:00
parent 5917c76b6c
commit 3976abaac3
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
argocd/argocd.yaml
View file

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