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

move eck and kibana installation to servicemesh and fix to delete-apps #85

Merged
merged 2 commits into from
Mar 28, 2022
Merged

move eck and kibana installation to servicemesh and fix to delete-apps #85

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19e3ecf
fix to delete-apps
seungkyua Mar 28, 2022
857c7f5
wait until eck installation completed
seungkyua Mar 28, 2022
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
2 changes: 1 addition & 1 deletion templates/argo-cd/delete-apps-wftpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
echo -e "[1st phase] Deleting apps:\n$app_list"
echo "$app_list" | xargs ./argocd app delete --cascade -y

until [ $(./argocd app list -l $FILTER --output name | grep -v operator | wc -l) == 0 ]
until [ $(./argocd app list -l $FILTER --output name | grep -v operator | grep -v crds | wc -l) == 0 ]
do
echo "Waiting 20 secs for apps to be deleted.."
sleep 20
Expand Down
2 changes: 1 addition & 1 deletion templates/decapod-apps/remove-servicemesh-all-wftpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
templateRef:
name: delete-apps
template: DeleteAppsByLabel

- - name: delete-namespace
template: delete-namespace-list
arguments:
Expand Down
35 changes: 32 additions & 3 deletions templates/decapod-apps/service-mesh-wf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,37 @@ spec:
- name: list
value: |
[
{ "namespace": "istio-system", "label": "name=lma" },
{ "namespace": "istio-ingress", "label": "istio-injection=enabled" }
{ "namespace": "istio-system", "label": "name=lma,taco-tls=enabled" },
{ "namespace": "istio-ingress", "label": "istio-injection=enabled,taco-tls=enabled" },
{ "namespace": "lma", "label": "name=lma,taco-tls=enabled" }
]

- - name: eck-operator
templateRef:
name: create-application
template: installApps
arguments:
parameters:
- name: list
value: |
[
{ "app_group": "lma", "path": "eck-operator", "namespace": "elastic-system", "target_cluster": "" },
{ "app_group": "lma", "path": "fluentbit-operator-crds", "namespace": "lma", "target_cluster": "" },
{ "app_group": "lma", "path": "fluentbit-operator", "namespace": "lma", "target_cluster": "" }
]

- - name: logging-efk
templateRef:
name: create-application
template: installApps
arguments:
parameters:
- name: list
value: |
[
{ "app_group": "lma", "path": "eck-resource", "namespace": "lma", "target_cluster": "" },
{ "app_group": "lma", "path": "fluentbit", "namespace": "lma", "target_cluster": "" },
{ "app_group": "lma", "path": "kubernetes-event-exporter", "namespace": "lma", "target_cluster": "" }
]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. service mesh 에서 lma appgroup,namespace 를 사용하는데... 의도된건가요?
  2. 이동이면, 기존의 lma 설치 workflow 에서도 제거되야 하지 않을까요?

Copy link
Contributor Author

@seungkyua seungkyua Mar 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • service mesh 에서 lma appgroup,namespace 를 사용하는데... 의도된건가요?
  • 이동이면, 기존의 lma 설치 workflow 에서도 제거되야 하지 않을까요?
  1. 의도된 것입니다. app_group 이 path 를 보기 때문에 lma 디렉토리를 봐야 합니다.
  2. 일단 lma 에서 lma_efk 를 설치 안하면 되기 때문에 service mesh 에 설치를 추가했습니다. servicemesh 에서 설치가 가능해지면 추후 lma-efk 에서 제거하는 단계적 접근 방식입니다.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lma 와 servicemesh 의 dependecy 가 없을 수록 좋을 것 같습니다. (가능하다면)
appgroup, namespace 등은 추후 고민해보면 좋겠습니다.


- - name: create-eck-secret-certs
Expand Down Expand Up @@ -177,7 +206,7 @@ spec:
kubectl $kube_params get ns ${NAMESPACE}
if [[ $? =~ 1 ]]; then
kubectl $kube_params create ns ${NAMESPACE}
kubectl $kube_params label ns ${NAMESPACE} ${LABEL}
IFS=','; for l in ${LABEL}; do kubectl $kube_params label ns ${NAMESPACE} ${l}; done
log "INFO" "${NAMESPACE} successfully created."
fi
env:
Expand Down