This commit is contained in:
parent
302fd21b15
commit
5917c76b6c
|
|
@ -254,6 +254,10 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: array
|
||||
passCredentials:
|
||||
description: PassCredentials pass credentials to all domains
|
||||
(Helm's --pass-credentials)
|
||||
type: boolean
|
||||
releaseName:
|
||||
description: ReleaseName is the Helm release name to use.
|
||||
If omitted it will use the application name
|
||||
|
|
@ -606,6 +610,10 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: array
|
||||
passCredentials:
|
||||
description: PassCredentials pass credentials to all domains
|
||||
(Helm's --pass-credentials)
|
||||
type: boolean
|
||||
releaseName:
|
||||
description: ReleaseName is the Helm release name to use.
|
||||
If omitted it will use the application name
|
||||
|
|
@ -972,6 +980,10 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: array
|
||||
passCredentials:
|
||||
description: PassCredentials pass credentials to all
|
||||
domains (Helm's --pass-credentials)
|
||||
type: boolean
|
||||
releaseName:
|
||||
description: ReleaseName is the Helm release name to
|
||||
use. If omitted it will use the application name
|
||||
|
|
@ -1353,6 +1365,10 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: array
|
||||
passCredentials:
|
||||
description: PassCredentials pass credentials
|
||||
to all domains (Helm's --pass-credentials)
|
||||
type: boolean
|
||||
releaseName:
|
||||
description: ReleaseName is the Helm release name
|
||||
to use. If omitted it will use the application
|
||||
|
|
@ -1713,6 +1729,10 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: array
|
||||
passCredentials:
|
||||
description: PassCredentials pass credentials to all
|
||||
domains (Helm's --pass-credentials)
|
||||
type: boolean
|
||||
releaseName:
|
||||
description: ReleaseName is the Helm release name
|
||||
to use. If omitted it will use the application name
|
||||
|
|
@ -2060,6 +2080,10 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: array
|
||||
passCredentials:
|
||||
description: PassCredentials pass credentials to all
|
||||
domains (Helm's --pass-credentials)
|
||||
type: boolean
|
||||
releaseName:
|
||||
description: ReleaseName is the Helm release name
|
||||
to use. If omitted it will use the application name
|
||||
|
|
@ -2487,6 +2511,10 @@ spec:
|
|||
description: Schedule is the time the window will begin, specified
|
||||
in cron format
|
||||
type: string
|
||||
timeZone:
|
||||
description: TimeZone of the sync that will be applied to the
|
||||
schedule
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
|
|
@ -2847,7 +2875,7 @@ metadata:
|
|||
---
|
||||
apiVersion: v1
|
||||
data:
|
||||
ssh_known_hosts: |
|
||||
ssh_known_hosts: |-
|
||||
bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
|
||||
github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
|
||||
gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=
|
||||
|
|
@ -2855,6 +2883,8 @@ data:
|
|||
gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
|
||||
ssh.dev.azure.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
|
||||
vs-ssh.visualstudio.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
|
||||
github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
|
||||
github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
labels:
|
||||
|
|
@ -3027,7 +3057,7 @@ spec:
|
|||
- command:
|
||||
- /shared/argocd-dex
|
||||
- rundex
|
||||
image: ghcr.io/dexidp/dex:v2.27.0
|
||||
image: ghcr.io/dexidp/dex:v2.30.0
|
||||
imagePullPolicy: Always
|
||||
name: dex
|
||||
ports:
|
||||
|
|
@ -3049,7 +3079,11 @@ 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:
|
||||
|
|
@ -3102,7 +3136,7 @@ spec:
|
|||
- ""
|
||||
- --appendonly
|
||||
- "no"
|
||||
image: redis:6.2.6-alpine
|
||||
image: redis:6.2.4-alpine
|
||||
imagePullPolicy: Always
|
||||
name: redis
|
||||
ports:
|
||||
|
|
@ -3224,7 +3258,17 @@ 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
|
||||
value: /helm-working-dir
|
||||
- name: HELM_DATA_HOME
|
||||
value: /helm-working-dir
|
||||
image: quay.io/argoproj/argocd:v2.2.0
|
||||
>>>>>>> ab3e92a (upgrade argocd)
|
||||
imagePullPolicy: Always
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
|
|
@ -3263,6 +3307,21 @@ spec:
|
|||
name: argocd-repo-server-tls
|
||||
- mountPath: /tmp
|
||||
name: tmp
|
||||
- mountPath: /helm-working-dir
|
||||
name: helm-working-dir
|
||||
- mountPath: /home/argocd/cmp-server/plugins
|
||||
name: plugins
|
||||
initContainers:
|
||||
- command:
|
||||
- cp
|
||||
- -n
|
||||
- /usr/local/bin/argocd
|
||||
- /var/run/argocd/argocd-cmp-server
|
||||
image: quay.io/argoproj/argocd:v2.2.0
|
||||
name: copyutil
|
||||
volumeMounts:
|
||||
- mountPath: /var/run/argocd
|
||||
name: var-files
|
||||
volumes:
|
||||
- configMap:
|
||||
name: argocd-ssh-known-hosts-cm
|
||||
|
|
@ -3277,6 +3336,8 @@ spec:
|
|||
name: gpg-keyring
|
||||
- emptyDir: {}
|
||||
name: tmp
|
||||
- emptyDir: {}
|
||||
name: helm-working-dir
|
||||
- name: argocd-repo-server-tls
|
||||
secret:
|
||||
items:
|
||||
|
|
@ -3288,6 +3349,10 @@ spec:
|
|||
path: ca.crt
|
||||
optional: true
|
||||
secretName: argocd-repo-server-tls
|
||||
- emptyDir: {}
|
||||
name: var-files
|
||||
- emptyDir: {}
|
||||
name: plugins
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
|
|
@ -3439,6 +3504,12 @@ spec:
|
|||
key: server.login.attempts.expiration
|
||||
name: argocd-cmd-params-cm
|
||||
optional: true
|
||||
- name: ARGOCD_SERVER_STATIC_ASSETS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
key: server.staticassets
|
||||
name: argocd-cmd-params-cm
|
||||
optional: true
|
||||
- name: ARGOCD_APP_STATE_CACHE_EXPIRATION
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
|
|
@ -3463,7 +3534,17 @@ 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:
|
||||
key: server.http.cookie.maxnumber
|
||||
name: argocd-cmd-params-cm
|
||||
optional: true
|
||||
image: quay.io/argoproj/argocd:v2.2.0
|
||||
>>>>>>> ab3e92a (upgrade argocd)
|
||||
imagePullPolicy: Always
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
|
|
@ -3653,7 +3734,7 @@ spec:
|
|||
key: controller.default.cache.expiration
|
||||
name: argocd-cmd-params-cm
|
||||
optional: true
|
||||
image: quay.io/argoproj/argocd:v2.1.8
|
||||
image: quay.io/argoproj/argocd:v2.2.0
|
||||
imagePullPolicy: Always
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
|
|
|
|||
Reference in a new issue