Compare commits
1 Commits
909d29cc6c
...
68b9b607cb
Author | SHA1 | Date | |
---|---|---|---|
68b9b607cb |
@ -330,7 +330,6 @@ apply_module() {
|
|||||||
for t in $MODULES; do
|
for t in $MODULES; do
|
||||||
# apply/replace app of apps directly
|
# apply/replace app of apps directly
|
||||||
if [ $t == "kubezero" ]; then
|
if [ $t == "kubezero" ]; then
|
||||||
[ -f $CHARTS/kubezero/hooks.d/pre-install.sh ] && . $CHARTS/kubezero/hooks.d/pre-install.sh
|
|
||||||
kubectl replace -f $WORKDIR/kubezero/templates $(field_manager $ARGOCD)
|
kubectl replace -f $WORKDIR/kubezero/templates $(field_manager $ARGOCD)
|
||||||
else
|
else
|
||||||
#_helm apply $t
|
#_helm apply $t
|
||||||
|
@ -22,7 +22,7 @@ dependencies:
|
|||||||
repository: https://argoproj.github.io/argo-helm
|
repository: https://argoproj.github.io/argo-helm
|
||||||
condition: argo-events.enabled
|
condition: argo-events.enabled
|
||||||
- name: argo-cd
|
- name: argo-cd
|
||||||
version: 7.8.15
|
version: 7.8.14
|
||||||
repository: https://argoproj.github.io/argo-helm
|
repository: https://argoproj.github.io/argo-helm
|
||||||
condition: argo-cd.enabled
|
condition: argo-cd.enabled
|
||||||
- name: argocd-image-updater
|
- name: argocd-image-updater
|
||||||
|
@ -23,7 +23,3 @@ GITKEY=$(get_kubezero_secret argo-cd.kubezero.sshPrivateKey)
|
|||||||
if [ -z "$GITKEY" ]; then
|
if [ -z "$GITKEY" ]; then
|
||||||
set_kubezero_secret argo-cd.kubezero.sshPrivateKey "Insert ssh Private Key from your git server"
|
set_kubezero_secret argo-cd.kubezero.sshPrivateKey "Insert ssh Private Key from your git server"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Redis secret
|
|
||||||
kubectl get secret argocd-redis -n argocd || kubectl create secret generic argocd-redis -n argocd \
|
|
||||||
--from-literal=auth=$(date +%s | sha256sum | base64 | head -c 16 ; echo)
|
|
||||||
|
@ -17,10 +17,4 @@ spec:
|
|||||||
sourceRepos:
|
sourceRepos:
|
||||||
- https://cdn.zero-downtime.net/charts
|
- https://cdn.zero-downtime.net/charts
|
||||||
- {{ index .Values "argo-cd" "kubezero" "repoUrl" }}
|
- {{ index .Values "argo-cd" "kubezero" "repoUrl" }}
|
||||||
syncWindows:
|
|
||||||
- kind: deny
|
|
||||||
schedule: '0 * * * *'
|
|
||||||
duration: 24h
|
|
||||||
namespaces:
|
|
||||||
- '*'
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user