diff --git a/ansible/group_vars/do/do-values.template.yaml b/ansible/group_vars/do/do-values.template.yaml index a2ed9fcb..8a2932b6 100644 --- a/ansible/group_vars/do/do-values.template.yaml +++ b/ansible/group_vars/do/do-values.template.yaml @@ -72,4 +72,22 @@ email: password: {{ sender_password }} reply_to_email: {{ reply_to_email }} +# Admin Addons +{% if enable_admin_addons %} +addons: + admin: + logging: true +btrix-admin-logging: + logging: + enabled: true + dedicatedNode: + enabled: true + ingress: + tls: true + host: "{{ full_domain }}" + elasticsearch: + local: false + kibana: + local: false +{% endif %} diff --git a/ansible/group_vars/do/main.yml b/ansible/group_vars/do/main.yml index 4ae2dc1b..34cdb798 100644 --- a/ansible/group_vars/do/main.yml +++ b/ansible/group_vars/do/main.yml @@ -3,11 +3,14 @@ project_name: "default" main_node_size: "s-1vcpu-2gb" crawl_node_size: "c-4" +admin_node_size: "s-4vcpu-8gb" droplet_region: "sfo3" +enable_admin_addons: true node_pools: - name=main-app;size={{ main_node_size }};label=nodeType=main;count=2 - name=crawling;size={{ crawl_node_size }};label=nodeType=crawling;taint=nodeType=crawling:NoSchedule;auto-scale=true;min-nodes=1;max-nodes=3;count=1 + - "{% if enable_admin_addons %}name=admin-app;size={{ admin_node_size }};label=nodeType=admin;count=1{% endif %}" db_name: "{{ project_name }}" k8s_name: "{{ project_name }}" @@ -38,5 +41,3 @@ smtp_host: "" sender_email: "" reply_to_email: "" sender_password: "" - - diff --git a/ansible/playbooks/do_setup.yml b/ansible/playbooks/do_setup.yml index cbbb34a9..a6556b12 100644 --- a/ansible/playbooks/do_setup.yml +++ b/ansible/playbooks/do_setup.yml @@ -98,7 +98,7 @@ # skip_ansible_lint ansible.builtin.command: >- doctl kubernetes cluster create {{ k8s_name }} --1-clicks ingress-nginx,cert-manager --node-pool - "{{ node_pools|join(',') }}" + "{{ node_pools | select('match','name=*') | list |join(',') }}" --region={{ droplet_region }} async: 1800 @@ -191,6 +191,13 @@ ansible.builtin.shell: set -o pipefail && doctl registry kubernetes-manifest | kubectl apply -f - when: use_do_registry + # Addons + # =========================================== + - name: d_ocean | addons | run all admin bookstrap scripts + ansible.builtin.command: >- + ../../chart/admin/logging/scripts/eck_install.sh + register: addons_init + when: enable_admin_addons # Helm Output + Deploy # ===========================================