Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1023 develop -> release ( v3.1.0 ) #132

Merged
merged 9 commits into from
Oct 23, 2023
Merged

1023 develop -> release ( v3.1.0 ) #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d18f88
Merge pull request #122 from openinfradev/release
ktkfree Jul 31, 2023
c7d2800
Merge pull request #125 from openinfradev/release
bluejayA Aug 16, 2023
6b1fdce
Merge pull request #127 from openinfradev/release
ktkfree Aug 18, 2023
de1d49d
Merge pull request #128 from openinfradev/main
ktkfree Aug 22, 2023
7d4f36f
deploy-lma: remove process-exporter from lma deployment
Sep 1, 2023
eedfce0
Merge pull request #129 from openinfradev/remove_process_exporter
ktkfree Sep 1, 2023
b40c1d5
rename admin-tools to tks-admin-tools
robertchoi80 Oct 11, 2023
3c0b2ab
automatically create ns by argo CD
robertchoi80 Oct 11, 2023
6e7f76a
Merge pull request #131 from openinfradev/tks-issues-861
robertchoi80 Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/argo-cd/create-app-wftpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ spec:

# For crds-only app, set sync-option to 'replace'
if [[ $ARGOCD_APP_NAME == *crds ]]; then
./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune --sync-option Replace=true
./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune --sync-option CreateNamespace=true --sync-option Replace=true
else
./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune
./argocd app set $ARGOCD_APP_NAME --sync-policy automated --auto-prune --sync-option CreateNamespace=true
fi
./argocd app sync $ARGOCD_APP_NAME --async
./argocd app wait $ARGOCD_APP_NAME --health
Expand Down
9 changes: 2 additions & 7 deletions templates/argo-cd/prepare-argocd-wftpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ spec:
./argocd proj create service-mesh --dest "*,*" --src "*" --allow-cluster-resource "*/*"
fi

./argocd proj get openstack
if [[ $? != 0 ]]; then
./argocd proj create openstack --dest "*,*" --src "*" --allow-cluster-resource "*/*"
fi

./argocd proj get sealed-secrets
if [[ $? != 0 ]]; then
./argocd proj create sealed-secrets --dest "*,*" --src "*" --allow-cluster-resource "*/*"
Expand All @@ -82,9 +77,9 @@ spec:
./argocd proj create tks-cluster --dest "*,*" --src "*" --allow-cluster-resource "*/*"
fi

./argocd proj get admin-tools
./argocd proj get tks-admin-tools
if [[ $? != 0 ]]; then
./argocd proj create admin-tools --dest "*,*" --src "*" --allow-cluster-resource "*/*"
./argocd proj create tks-admin-tools --dest "*,*" --src "*" --allow-cluster-resource "*/*"
fi
env:
- name: ARGO_SERVER
Expand Down
1 change: 0 additions & 1 deletion templates/decapod-apps/lma-uniformed-wftpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ spec:
[
{ "app_group": "lma", "path": "prometheus", "namespace": "lma", "target_cluster": "" },
{ "app_group": "lma", "path": "kube-state-metrics", "namespace": "lma", "target_cluster": "" },
{ "app_group": "lma", "path": "prometheus-process-exporter", "namespace": "lma", "target_cluster": "" },
{ "app_group": "lma", "path": "prometheus-pushgateway", "namespace": "lma", "target_cluster": "" },
{ "app_group": "lma", "path": "prometheus-node-exporter", "namespace": "lma", "target_cluster": ""},
{ "app_group": "lma", "path": "prometheus-adapter", "namespace": "lma", "target_cluster": "" },
Expand Down