Skip to content

Commit d975dde

Browse files
committed
change the order or gitea and argocd installation and upgrade
Signed-off-by: Halim, Abdul <abdul.halim@intel.com>
1 parent 951641c commit d975dde

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

on-prem-installers/cmd/onprem-argo-cd/after-install.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ applicationSet:
9494
helm install argocd /tmp/argo-cd/argo-cd --values /tmp/argo-cd/values.yaml -f /tmp/argo-cd/mounts.yaml -n argocd --create-namespace
9595
}
9696

97-
install_argocd
98-
9997

10098
processSAN() {
10199
local result="subjectAltName=DNS:localhost"
@@ -217,3 +215,4 @@ EOF
217215
}
218216

219217
install_gitea
218+
install_argocd

on-prem-installers/cmd/onprem-argo-cd/after-remove.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ EOF
3636
rm -rf /tmp/argo-cd || true
3737
}
3838

39-
remove_argocd
4039

4140
remove_gitea() {
4241
cat << "EOF"
@@ -57,3 +56,4 @@ EOF
5756
}
5857

5958
remove_gitea
59+
remove_argocd

on-prem-installers/cmd/onprem-argo-cd/after-upgrade.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ helm upgrade argocd /tmp/argo-cd/argo-cd --values /tmp/argo-cd/values.yaml -f /t
9898
--wait --timeout 15m0s
9999
}
100100

101-
upgrade_argocd
102-
103101
processSAN() {
104102
local result="subjectAltName=DNS:localhost"
105103
for domain in "$@"; do
@@ -220,3 +218,4 @@ EOF
220218
}
221219

222220
upgrade_gitea
221+
upgrade_argocd

0 commit comments

Comments
 (0)