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

servicemesh refactoring #44

Merged
merged 1 commit into from
Jul 9, 2021
Merged

servicemesh refactoring #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/createapp-wftpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
./argocd app get $PATH
if [[ $? -ne 0 ]]; then
# create new application if not exists.
./argocd app create $PATH --repo $REPO --revision $REVISION --path $SITE_NAME/$APP_NAME/$PATH --dest-namespace $NAMESPACE --dest-name $SITE_NAME --project $APP_NAME --directory-recurse
./argocd app create $PATH --repo $REPO --revision $REVISION --path $SITE_NAME/$APP_NAME/$PATH --dest-namespace $NAMESPACE --dest-name $SITE_NAME --project $APP_NAME --label app=$APP_NAME --directory-recurse
fi

./argocd app set $PATH --sync-policy automated --auto-prune
Expand Down
217 changes: 179 additions & 38 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 @@ -7,42 +7,183 @@ spec:
entrypoint: deploy
arguments:
parameters:
- name: site_name
value: "hanu-reference"
- name: app_name
value: "service-mesh"
- name: repository_url
value: "https://github.com/openinfradev/decapod-manifests"
- name: revision
value: main
- name: site_name
value: hanu-reference
- name: app_name
value: service-mesh
- name: repository_url
value: 'https://github.com/openinfradev/decapod-manifests'
- name: revision
value: main
templates:
- name: deploy
dag:
tasks:
- name: operator
templateRef:
name: create-application
template: AppGroup
arguments:
parameters:
- name: list
value: |
[
{ "path": "istio-operator", "namespace": "istio-system" },
{ "path": "jaeger-operator", "namespace": "lma" }
]
dependencies: []
- name: resource
templateRef:
name: create-application
template: AppGroup
arguments:
parameters:
- name: list
value: |
[
{ "path": "kiali-operator", "namespace": "istio-system" },
{ "path": "service-mesh-controlplane", "namespace": "istio-system" },
{ "path": "service-mesh-gateway", "namespace": "istio-system" }
]
dependencies: [operator]
- name: deploy
dag:
tasks:
- name: create-eck-secret
template: copy-eck-secret
arguments:
parameters:
- name: secret_name
value: eck-elasticsearch-es-http-certs-public
- name: source_namespace
value: lma
- name: target_namespace
value: istio-system
- name: istio-operator
arguments:
parameters:
- name: list
value: |
[
{ "path": "istio-operator", "namespace": "istio-operator" }
]
templateRef:
name: create-application
template: AppGroup
dependencies:
- create-eck-secret
- name: istio-controlplane
arguments:
parameters:
- name: list
value: |
[
{ "path": "servicemesh-controlplane", "namespace": "istio-system" }
]
templateRef:
name: create-application
template: AppGroup
dependencies:
- istio-operator
- name: istio-gateway
arguments:
parameters:
- name: list
value: |
[
{ "path": "servicemesh-gateway", "namespace": "istio-system" }
]
templateRef:
name: create-application
template: AppGroup
dependencies:
- istio-controlplane
- name: jaeger-kiali-operator
arguments:
parameters:
- name: list
value: |
[
{ "path": "jaeger-operator", "namespace": "istio-system" },
{ "path": "kiali-operator", "namespace": "istio-system" }
]
templateRef:
name: create-application
template: AppGroup
dependencies:
- istio-controlplane
- name: servicemesh-jaeger-kiali-resource
arguments:
parameters:
- name: list
value: |
[
{ "path": "servicemesh-jaeger-resource", "namespace": "istio-system" },
{ "path": "servicemesh-kiali-resource", "namespace": "istio-system" }
]
templateRef:
name: create-application
template: AppGroup
dependencies:
- jaeger-kiali-operator
- name: grafana-prometheus-resource
arguments:
parameters:
- name: list
value: |
[
{ "path": "servicemesh-grafana-dashboard", "namespace": "istio-system" },
{ "path": "servicemesh-prometheusmonitor", "namespace": "istio-system" },
{ "path": "servicemesh-prometheusrule", "namespace": "istio-system" }
]
templateRef:
name: create-application
template: AppGroup
dependencies:
- jaeger-kiali-operator
- name: sync-app
template: sync-app
arguments: {}
dependencies:
- grafana-prometheus-resource
- name: copy-eck-secret
arguments: {}
inputs:
parameters:
- name: secret_name
- name: source_namespace
- name: target_namespace
outputs: {}
metadata: {}
container:
name: copy-eck-secret
image: 'k8s.gcr.io/hyperkube:v1.18.6'
command:
- /bin/bash
- '-c'
- |
function log() {
level=$1
msg=$2
date=$(date '+%F %H:%M:%S')
echo "[$date] $level $msg"
}

kubectl get ns ${TARGET_NAMESPACE}
if [[ $? =~ 1 ]]; then
kubectl create ns ${TARGET_NAMESPACE}
kubectl label ns ${TARGET_NAMESPACE} name=lma
log "INFO" "${TARGET_NAMESPACE} successfully created."
fi

kubectl get secret ${SECRET_NAME}
if [[ $? =~ 1 ]]; then
kubectl get secret ${SECRET_NAME} -n ${SOURCE_NAMESPACE} -o yaml \
| grep -v '^\s*namespace:\s' \
| kubectl apply -n ${TARGET_NAMESPACE} -f -
log "INFO" "${SECRET_NAME} successfully created."
fi
env:
- name: SECRET_NAME
value: '{{inputs.parameters.secret_name}}'
- name: SOURCE_NAMESPACE
value: '{{inputs.parameters.source_namespace}}'
- name: TARGET_NAMESPACE
value: '{{inputs.parameters.target_namespace}}'
resources: {}
activeDeadlineSeconds: 900
retryStrategy:
limit: 2
- name: sync-app
arguments: {}
inputs: {}
outputs: {}
metadata: {}
container:
name: sync-app
image: 'docker.io/sktdev/argocd:latest'
command:
- /bin/bash
- '-c'
- |
./argocd login $ARGO_SERVER --insecure --username $ARGO_USERNAME \
--password $ARGO_PASSWORD

./argocd app sync -l app=service-mesh
envFrom:
- secretRef:
name: decapod-argocd-config
resources: {}
activeDeadlineSeconds: 900
retryStrategy:
limit: 2