From b97aa793c517cd0cd06b54ff34d4b1a524d6e22c Mon Sep 17 00:00:00 2001 From: ThanKarab Date: Thu, 2 Sep 2021 23:48:53 -0700 Subject: [PATCH 1/3] Move docker-swarm deployment in internal folder. --- Federated-Deployment/.gitignore | 6 +++--- .../Compose-Files/docker-compose-master.yml | 0 .../Compose-Files/docker-compose-worker.yml | 0 .../{ => docker-swarm}/Docker-Ansible/CheckDomain.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Init-Swarm.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Join-Workers.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Leave-Master.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Leave-Worker.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Metadata-Master.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Metadata-Worker.yaml | 0 .../Docker-Ansible/Start-Exareme-Worker.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Start-Exareme.yaml | 0 .../Docker-Ansible/Stop-Exareme-Worker.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/Stop-Services.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/group_vars/all.yaml | 0 .../Docker-Ansible/roles/add-label/tasks/main.yaml | 0 .../Docker-Ansible/roles/add-worker-label/tasks/main.yaml | 0 .../Docker-Ansible/roles/copy-directory/tasks/main.yaml | 0 .../Docker-Ansible/roles/copy-metadata/tasks/main.yaml | 0 .../Docker-Ansible/roles/join-workers/tasks/main.yaml | 0 .../Docker-Ansible/roles/start-services/tasks/main.yaml | 0 .../roles/start-worker-service/tasks/main.yaml | 0 .../Docker-Ansible/roles/stop-services/tasks/main.yaml | 0 .../roles/stop-worker-service/tasks/main.yaml | 0 .../Docker-Ansible/roles/swarm-init/tasks/main.yaml | 0 .../Docker-Ansible/roles/swarm-leave/tasks/main.yaml | 0 .../Docker-Ansible/roles/worker-token/tasks/main.yaml | 0 .../{ => docker-swarm}/Docker-Ansible/scripts/add_worker.sh | 0 .../{ => docker-swarm}/Docker-Ansible/scripts/deploy.sh | 0 .../{ => docker-swarm}/Docker-Ansible/scripts/deploy_all.sh | 0 .../{ => docker-swarm}/Docker-Ansible/scripts/exareme.sh | 0 .../Docker-Ansible/scripts/remove_worker.sh | 0 .../{ => docker-swarm}/Docker-Ansible/scripts/restart.sh | 0 .../Docker-Ansible/scripts/restartWorker.sh | 0 .../{ => docker-swarm}/Docker-Ansible/scripts/stop.sh | 0 .../{ => docker-swarm}/Docker-Ansible/scripts/stopWorker.sh | 0 .../Docker-Ansible/scripts/updateFiles.sh | 0 .../Docker-Ansible/scripts/updateHosts.sh | 0 .../{ => docker-swarm}/Documentation/DeployByHospital.md | 0 .../Documentation/Federation_Specifications.md | 0 .../Documentation/Firewall_Configuration.md | 0 .../{ => docker-swarm}/Documentation/ManualDeployment.md | 0 .../{ => docker-swarm}/Documentation/Optionals.md | 0 .../{ => docker-swarm}/Documentation/Troubleshoot.md | 0 .../Documentation/docker-swarm-master.xml | 0 .../Documentation/docker-swarm-worker.xml | 0 Federated-Deployment/{ => docker-swarm}/README.md | 0 47 files changed, 3 insertions(+), 3 deletions(-) rename Federated-Deployment/{ => docker-swarm}/Compose-Files/docker-compose-master.yml (100%) rename Federated-Deployment/{ => docker-swarm}/Compose-Files/docker-compose-worker.yml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/CheckDomain.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Init-Swarm.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Join-Workers.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Leave-Master.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Leave-Worker.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Metadata-Master.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Metadata-Worker.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Start-Exareme-Worker.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Start-Exareme.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Stop-Exareme-Worker.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/Stop-Services.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/group_vars/all.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/add-label/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/add-worker-label/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/copy-directory/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/copy-metadata/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/join-workers/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/start-services/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/start-worker-service/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/stop-services/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/swarm-init/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/swarm-leave/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/roles/worker-token/tasks/main.yaml (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/add_worker.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/deploy.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/deploy_all.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/exareme.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/remove_worker.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/restart.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/restartWorker.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/stop.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/stopWorker.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/updateFiles.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Docker-Ansible/scripts/updateHosts.sh (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/DeployByHospital.md (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/Federation_Specifications.md (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/Firewall_Configuration.md (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/ManualDeployment.md (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/Optionals.md (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/Troubleshoot.md (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/docker-swarm-master.xml (100%) rename Federated-Deployment/{ => docker-swarm}/Documentation/docker-swarm-worker.xml (100%) rename Federated-Deployment/{ => docker-swarm}/README.md (100%) diff --git a/Federated-Deployment/.gitignore b/Federated-Deployment/.gitignore index df175abd3..75572ba97 100644 --- a/Federated-Deployment/.gitignore +++ b/Federated-Deployment/.gitignore @@ -6,6 +6,6 @@ settings.local.* #Ansible *.retry -/Docker-Ansible/vault.yaml -/Docker-Ansible/hosts.ini -/Docker-Ansible/group_vars/exareme.yaml +**/Docker-Ansible/vault.yaml +**/Docker-Ansible/hosts.ini +**/Docker-Ansible/group_vars/exareme.yaml diff --git a/Federated-Deployment/Compose-Files/docker-compose-master.yml b/Federated-Deployment/docker-swarm/Compose-Files/docker-compose-master.yml similarity index 100% rename from Federated-Deployment/Compose-Files/docker-compose-master.yml rename to Federated-Deployment/docker-swarm/Compose-Files/docker-compose-master.yml diff --git a/Federated-Deployment/Compose-Files/docker-compose-worker.yml b/Federated-Deployment/docker-swarm/Compose-Files/docker-compose-worker.yml similarity index 100% rename from Federated-Deployment/Compose-Files/docker-compose-worker.yml rename to Federated-Deployment/docker-swarm/Compose-Files/docker-compose-worker.yml diff --git a/Federated-Deployment/Docker-Ansible/CheckDomain.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/CheckDomain.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/CheckDomain.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/CheckDomain.yaml diff --git a/Federated-Deployment/Docker-Ansible/Init-Swarm.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Init-Swarm.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Init-Swarm.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Init-Swarm.yaml diff --git a/Federated-Deployment/Docker-Ansible/Join-Workers.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Join-Workers.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Join-Workers.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Join-Workers.yaml diff --git a/Federated-Deployment/Docker-Ansible/Leave-Master.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Master.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Leave-Master.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Master.yaml diff --git a/Federated-Deployment/Docker-Ansible/Leave-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Worker.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Leave-Worker.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Leave-Worker.yaml diff --git a/Federated-Deployment/Docker-Ansible/Metadata-Master.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Master.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Metadata-Master.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Master.yaml diff --git a/Federated-Deployment/Docker-Ansible/Metadata-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Worker.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Metadata-Worker.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Metadata-Worker.yaml diff --git a/Federated-Deployment/Docker-Ansible/Start-Exareme-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme-Worker.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Start-Exareme-Worker.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme-Worker.yaml diff --git a/Federated-Deployment/Docker-Ansible/Start-Exareme.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Start-Exareme.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Start-Exareme.yaml diff --git a/Federated-Deployment/Docker-Ansible/Stop-Exareme-Worker.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Exareme-Worker.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Stop-Exareme-Worker.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Exareme-Worker.yaml diff --git a/Federated-Deployment/Docker-Ansible/Stop-Services.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Services.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/Stop-Services.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/Stop-Services.yaml diff --git a/Federated-Deployment/Docker-Ansible/group_vars/all.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/group_vars/all.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/group_vars/all.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/group_vars/all.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/add-label/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-label/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/add-label/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-label/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/add-worker-label/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-worker-label/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/add-worker-label/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/add-worker-label/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/copy-directory/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-directory/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/copy-directory/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-directory/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/copy-metadata/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-metadata/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/copy-metadata/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/copy-metadata/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/join-workers/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/join-workers/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/join-workers/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/join-workers/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/start-services/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-services/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/start-services/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-services/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/start-worker-service/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-worker-service/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/start-worker-service/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/start-worker-service/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/stop-services/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-services/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/stop-services/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-services/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/stop-worker-service/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/swarm-init/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-init/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/swarm-init/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-init/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/swarm-leave/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-leave/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/swarm-leave/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/swarm-leave/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/roles/worker-token/tasks/main.yaml b/Federated-Deployment/docker-swarm/Docker-Ansible/roles/worker-token/tasks/main.yaml similarity index 100% rename from Federated-Deployment/Docker-Ansible/roles/worker-token/tasks/main.yaml rename to Federated-Deployment/docker-swarm/Docker-Ansible/roles/worker-token/tasks/main.yaml diff --git a/Federated-Deployment/Docker-Ansible/scripts/add_worker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/add_worker.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/add_worker.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/add_worker.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/deploy.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/deploy.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/deploy_all.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy_all.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/deploy_all.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/deploy_all.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/exareme.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/exareme.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/exareme.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/exareme.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/remove_worker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/remove_worker.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/remove_worker.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/remove_worker.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/restart.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restart.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/restart.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restart.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/restartWorker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restartWorker.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/restartWorker.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/restartWorker.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/stop.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stop.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/stop.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stop.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/stopWorker.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stopWorker.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/stopWorker.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/stopWorker.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/updateFiles.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateFiles.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/updateFiles.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateFiles.sh diff --git a/Federated-Deployment/Docker-Ansible/scripts/updateHosts.sh b/Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateHosts.sh similarity index 100% rename from Federated-Deployment/Docker-Ansible/scripts/updateHosts.sh rename to Federated-Deployment/docker-swarm/Docker-Ansible/scripts/updateHosts.sh diff --git a/Federated-Deployment/Documentation/DeployByHospital.md b/Federated-Deployment/docker-swarm/Documentation/DeployByHospital.md similarity index 100% rename from Federated-Deployment/Documentation/DeployByHospital.md rename to Federated-Deployment/docker-swarm/Documentation/DeployByHospital.md diff --git a/Federated-Deployment/Documentation/Federation_Specifications.md b/Federated-Deployment/docker-swarm/Documentation/Federation_Specifications.md similarity index 100% rename from Federated-Deployment/Documentation/Federation_Specifications.md rename to Federated-Deployment/docker-swarm/Documentation/Federation_Specifications.md diff --git a/Federated-Deployment/Documentation/Firewall_Configuration.md b/Federated-Deployment/docker-swarm/Documentation/Firewall_Configuration.md similarity index 100% rename from Federated-Deployment/Documentation/Firewall_Configuration.md rename to Federated-Deployment/docker-swarm/Documentation/Firewall_Configuration.md diff --git a/Federated-Deployment/Documentation/ManualDeployment.md b/Federated-Deployment/docker-swarm/Documentation/ManualDeployment.md similarity index 100% rename from Federated-Deployment/Documentation/ManualDeployment.md rename to Federated-Deployment/docker-swarm/Documentation/ManualDeployment.md diff --git a/Federated-Deployment/Documentation/Optionals.md b/Federated-Deployment/docker-swarm/Documentation/Optionals.md similarity index 100% rename from Federated-Deployment/Documentation/Optionals.md rename to Federated-Deployment/docker-swarm/Documentation/Optionals.md diff --git a/Federated-Deployment/Documentation/Troubleshoot.md b/Federated-Deployment/docker-swarm/Documentation/Troubleshoot.md similarity index 100% rename from Federated-Deployment/Documentation/Troubleshoot.md rename to Federated-Deployment/docker-swarm/Documentation/Troubleshoot.md diff --git a/Federated-Deployment/Documentation/docker-swarm-master.xml b/Federated-Deployment/docker-swarm/Documentation/docker-swarm-master.xml similarity index 100% rename from Federated-Deployment/Documentation/docker-swarm-master.xml rename to Federated-Deployment/docker-swarm/Documentation/docker-swarm-master.xml diff --git a/Federated-Deployment/Documentation/docker-swarm-worker.xml b/Federated-Deployment/docker-swarm/Documentation/docker-swarm-worker.xml similarity index 100% rename from Federated-Deployment/Documentation/docker-swarm-worker.xml rename to Federated-Deployment/docker-swarm/Documentation/docker-swarm-worker.xml diff --git a/Federated-Deployment/README.md b/Federated-Deployment/docker-swarm/README.md similarity index 100% rename from Federated-Deployment/README.md rename to Federated-Deployment/docker-swarm/README.md From 1efb08ee1413d5087993a8db3b52b06c84eb503a Mon Sep 17 00:00:00 2001 From: ThanKarab Date: Thu, 2 Sep 2021 23:57:13 -0700 Subject: [PATCH 2/3] Added kubernetes deployment. --- Federated-Deployment/kubernetes/README.md | 2 + .../kubernetes/exareme-keystore.yaml | 49 +++++++++++++++ .../kubernetes/exareme-master.yaml | 63 +++++++++++++++++++ .../kubernetes/exareme-worker.yaml | 59 +++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 Federated-Deployment/kubernetes/README.md create mode 100644 Federated-Deployment/kubernetes/exareme-keystore.yaml create mode 100644 Federated-Deployment/kubernetes/exareme-master.yaml create mode 100644 Federated-Deployment/kubernetes/exareme-worker.yaml diff --git a/Federated-Deployment/kubernetes/README.md b/Federated-Deployment/kubernetes/README.md new file mode 100644 index 000000000..447daa46a --- /dev/null +++ b/Federated-Deployment/kubernetes/README.md @@ -0,0 +1,2 @@ +# Deploy exareme with Kubernetes + diff --git a/Federated-Deployment/kubernetes/exareme-keystore.yaml b/Federated-Deployment/kubernetes/exareme-keystore.yaml new file mode 100644 index 000000000..d9e907db6 --- /dev/null +++ b/Federated-Deployment/kubernetes/exareme-keystore.yaml @@ -0,0 +1,49 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: exareme-keystore-deployment + labels: + app: exareme-keystore +spec: + replicas: 1 + selector: + matchLabels: + app: exareme-keystore + template: + metadata: + labels: + app: exareme-keystore + spec: + nodeSelector: + nodeType: master + containers: + - name: exareme-keystore + image: bitnami/consul:1.8.3 + ports: + - containerPort: 8500 + env: + - name: CONSUL_AGENT_MODE + value: "server" + - name: CONSUL_BOOTSTRAP_EXPECT + value: "1" + - name: CONSUL_CLIENT_LAN_ADDRESS + value: "0.0.0.0" + - name: CONSUL_ENABLE_UI + value: "true" + + +--- + +apiVersion: v1 +kind: Service +metadata: + name: exareme-keystore-service +spec: + type: LoadBalancer + selector: + app: exareme-keystore + ports: + - protocol: TCP + port: 8500 + targetPort: 8500 + nodePort: 30000 \ No newline at end of file diff --git a/Federated-Deployment/kubernetes/exareme-master.yaml b/Federated-Deployment/kubernetes/exareme-master.yaml new file mode 100644 index 000000000..4a0b3672a --- /dev/null +++ b/Federated-Deployment/kubernetes/exareme-master.yaml @@ -0,0 +1,63 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: exareme-master-deployment + labels: + app: exareme-master +spec: + replicas: 1 + selector: + matchLabels: + app: exareme-master + template: + metadata: + labels: + app: exareme-master + spec: + nodeSelector: + nodeType: master + containers: + - name: exareme-master + image: hbpmip/exareme:24.1.2 + ports: + - containerPort: 9090 + volumeMounts: + - mountPath: /root/exareme/data + name: csvs + env: + - name: CONSULURL + value: "exareme-keystore-service:8500" + - name: FEDERATION_ROLE + value: "master" + - name: NODE_NAME + value: "master" + - name: TEMP_FILES_CLEANUP_TIME + value: "30" + - name: NODE_COMMUNICATION_TIMEOUT + value: "30000" + - name: ENVIRONMENT_TYPE + value: "PROD" + - name: LOG_LEVEL + value: "INFO" + - name: CONVERT_CSVS + value: "TRUE" + volumes: + - name: csvs + hostPath: + path: /etc/exareme + +--- + +apiVersion: v1 +kind: Service +metadata: + name: exareme-master-service +spec: + type: LoadBalancer + selector: + app: exareme-master + ports: + - protocol: TCP + port: 9090 + targetPort: 9090 + nodePort: 30090 diff --git a/Federated-Deployment/kubernetes/exareme-worker.yaml b/Federated-Deployment/kubernetes/exareme-worker.yaml new file mode 100644 index 000000000..74a2c9e84 --- /dev/null +++ b/Federated-Deployment/kubernetes/exareme-worker.yaml @@ -0,0 +1,59 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: exareme-worker-deployment + labels: + app: exareme-worker +spec: + replicas: 2 + selector: + matchLabels: + app: exareme-worker + template: + metadata: + labels: + app: exareme-worker + spec: + nodeSelector: + nodeType: worker + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - exareme-worker + topologyKey: "kubernetes.io/hostname" + containers: + - name: exareme-worker + image: hbpmip/exareme:24.1.2 + ports: + - containerPort: 9090 + volumeMounts: + - mountPath: /root/exareme/data + name: csvs + env: + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: CONSULURL + value: "exareme-keystore-service:8500" + - name: FEDERATION_ROLE + value: "worker" + - name: TEMP_FILES_CLEANUP_TIME + value: "30" + - name: NODE_COMMUNICATION_TIMEOUT + value: "30000" + - name: ENVIRONMENT_TYPE + value: "PROD" + - name: LOG_LEVEL + value: "INFO" + - name: CONVERT_CSVS + value: "TRUE" + volumes: + - name: csvs + hostPath: + path: /etc/exareme From 0ad8d455f1f081397875237b5f4f0f4845ae704c Mon Sep 17 00:00:00 2001 From: ThanKarab Date: Fri, 3 Sep 2021 07:10:53 -0700 Subject: [PATCH 3/3] Added kubernetes deployment. --- Federated-Deployment/kubernetes/Chart.yaml | 8 + .../kubernetes/DevDeployment.md | 36 +++++ Federated-Deployment/kubernetes/README.md | 145 +++++++++++++++++- .../kind_configuration/kind_cluster.yaml | 20 +++ .../{ => templates}/exareme-keystore.yaml | 2 +- .../{ => templates}/exareme-master.yaml | 31 ++-- .../{ => templates}/exareme-worker.yaml | 39 ++--- Federated-Deployment/kubernetes/values.yaml | 14 ++ 8 files changed, 259 insertions(+), 36 deletions(-) create mode 100644 Federated-Deployment/kubernetes/Chart.yaml create mode 100644 Federated-Deployment/kubernetes/DevDeployment.md create mode 100644 Federated-Deployment/kubernetes/kind_configuration/kind_cluster.yaml rename Federated-Deployment/kubernetes/{ => templates}/exareme-keystore.yaml (97%) rename Federated-Deployment/kubernetes/{ => templates}/exareme-master.yaml (66%) rename Federated-Deployment/kubernetes/{ => templates}/exareme-worker.yaml (69%) create mode 100644 Federated-Deployment/kubernetes/values.yaml diff --git a/Federated-Deployment/kubernetes/Chart.yaml b/Federated-Deployment/kubernetes/Chart.yaml new file mode 100644 index 000000000..57e73fe51 --- /dev/null +++ b/Federated-Deployment/kubernetes/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: exareme +description: A helm chart for Kubernetes deployment of Exareme + +version: 0.1.0 + +type: application + diff --git a/Federated-Deployment/kubernetes/DevDeployment.md b/Federated-Deployment/kubernetes/DevDeployment.md new file mode 100644 index 000000000..080a1b5c4 --- /dev/null +++ b/Federated-Deployment/kubernetes/DevDeployment.md @@ -0,0 +1,36 @@ +# Exareme Development deployment with Kubernetes in one node + +## Configuration + +The following packages need to be installed: + +``` +docker +kubectl +helm +``` + +## Setup the kubernetes cluster with kind + +1. Create the cluster using the e2e_tests setup (you can create a custom one if you want) : +``` +kind create cluster --config Federated-Deployment/kubernetes/kind_configuration/kind_cluster.yaml +``` + +2. After the nodes are started, you need to taint them properly: +``` +kubectl taint nodes kind-control-plane node-role.kubernetes.io/master- +kubectl label node kind-control-plane nodeType=master +kubectl label node kind-worker nodeType=worker +kubectl label node kind-worker2 nodeType=worker +``` + +3. (Optional) Load the docker images to the kuberentes cluster, if not the images will be pulled from dockerhub: +``` +kind load docker-image hbpmip/exareme:latest +``` + +4. Deploy the MIP-Engine kubernetes pods using helm charts: +``` +helm install exareme Federated-Deployment/kubernetes/ +``` diff --git a/Federated-Deployment/kubernetes/README.md b/Federated-Deployment/kubernetes/README.md index 447daa46a..eee97edca 100644 --- a/Federated-Deployment/kubernetes/README.md +++ b/Federated-Deployment/kubernetes/README.md @@ -1,2 +1,145 @@ -# Deploy exareme with Kubernetes +# Exareme deployment with Kubernetes +## Configuration + +The following packages need to be installed on **master/worker** nodes: + +``` +docker +kubelet +kubeadm +``` + +Packages needed on the **master** node only: + +``` +helm +``` + +To configure kubernetes to use docker you should also follow this [guide](https://kubernetes.io/docs/setup/production-environment/container-runtimes/#docker "guide") . + +## Cluster Management + +### Initialize the cluster + +On the **master** node: + +1. Run the following command to initialize the cluster: + +``` +sudo kubeadm init --pod-network-cidr=192.168.0.0/16 +``` + +2. To enable kubectl run the following commands as prompted from the previous command: + +``` +mkdir -p $HOME/.kube +sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config +sudo chown $(id -u):$(id -g) $HOME/.kube/config +``` + +3. Add calico network tool in the cluster: + +``` +kubectl apply -f https://docs.projectcalico.org/v3.20/manifests/calico.yaml +``` + +4. Allow master-specific pods to run on the **master** node with: + +``` +kubectl taint nodes --all node-role.kubernetes.io/master- +kubectl label node nodeType=master +``` + +### Add a worker node to the cluster + +1. On the **master** node, get the join token with the following command: + +``` +kubeadm token create --print-join-command +``` + +Use the provided on the **worker** node, with `sudo`, to join the cluster. + +2. Allow worker-specific pods to run on the **worker** node with: + +``` +kubectl label node nodeType=worker +``` + +3. If the node has status `Ready,SchedulingDisabled` run: + +``` +kubectl uncordon +``` + +### Remove a worker node from the cluster + +On the **master** node execute the following commands: + +``` +kubectl drain --ignore-daemonsets +kubectl delete node +``` + +## Deploy Exareme + +1. Configure the [helm chart values](values.yaml). + + - The `exareme_images -> version` should be the exareme services' version in dockerhub. + - The `data_path` should be set to the path, in the workers' host machine, that contains the data. + - The `workers` is a counter for the amount of workers in the cluster. + +1. From the `exareme` folder, deploy the services: + +``` +helm install exareme Federated-Deployment/kubernetes/ +``` + +### Change the Exareme version running + +1. Modify the `exareme_images -> version` value in the [helm chart values](values.yaml) accordingly. + +1. Upgrade the helm chart with: + +``` +helm upgrade exareme Federated-Deployment/kubernetes/ +``` + +### Increase/reduce the number of workers + +1. Modify the `workers` value in the [helm chart values](values.yaml) accordingly. + +1. Upgrade the helm chart with: + +``` +helm upgrade exareme Federated-Deployment/kubernetes/ +``` + +### Restart the federation + +You can restart the federation with helm by running: + +``` +helm uninstall exareme +helm install exareme Federated-Deployment/kubernetes/ +``` + +## Firewall Configuration + +Using firewalld the following rules should apply, + +in the **master** node: + +``` +firewall-cmd --permanent --add-port=6443/tcp # Kubelet api port +firewall-cmd --permanent --add-port=30000/tcp # MIPEngine Controller port +``` + +on all nodes: + +``` +firewall-cmd --zone=public --permanent --add-rich-rule='rule protocol value="ipip" accept' # Protocol "4" for "calico"-network-plugin. +``` + +These rules allow for kubectl to only be run on the **master** node. diff --git a/Federated-Deployment/kubernetes/kind_configuration/kind_cluster.yaml b/Federated-Deployment/kubernetes/kind_configuration/kind_cluster.yaml new file mode 100644 index 000000000..b514476d7 --- /dev/null +++ b/Federated-Deployment/kubernetes/kind_configuration/kind_cluster.yaml @@ -0,0 +1,20 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +nodes: +- role: control-plane + extraPortMappings: + - containerPort: 30000 + hostPort: 9090 + - containerPort: 30050 + hostPort: 8500 + extraMounts: + - hostPath: /opt/exareme_data_1 + containerPath: /opt/data +- role: worker + extraMounts: + - hostPath: /opt/exareme_data_2 + containerPath: /opt/data +- role: worker + extraMounts: + - hostPath: /opt/exareme_data_3 + containerPath: /opt/data diff --git a/Federated-Deployment/kubernetes/exareme-keystore.yaml b/Federated-Deployment/kubernetes/templates/exareme-keystore.yaml similarity index 97% rename from Federated-Deployment/kubernetes/exareme-keystore.yaml rename to Federated-Deployment/kubernetes/templates/exareme-keystore.yaml index d9e907db6..7d889ae38 100644 --- a/Federated-Deployment/kubernetes/exareme-keystore.yaml +++ b/Federated-Deployment/kubernetes/templates/exareme-keystore.yaml @@ -46,4 +46,4 @@ spec: - protocol: TCP port: 8500 targetPort: 8500 - nodePort: 30000 \ No newline at end of file + nodePort: 30050 \ No newline at end of file diff --git a/Federated-Deployment/kubernetes/exareme-master.yaml b/Federated-Deployment/kubernetes/templates/exareme-master.yaml similarity index 66% rename from Federated-Deployment/kubernetes/exareme-master.yaml rename to Federated-Deployment/kubernetes/templates/exareme-master.yaml index 4a0b3672a..6f71ff34d 100644 --- a/Federated-Deployment/kubernetes/exareme-master.yaml +++ b/Federated-Deployment/kubernetes/templates/exareme-master.yaml @@ -18,33 +18,34 @@ spec: nodeType: master containers: - name: exareme-master - image: hbpmip/exareme:24.1.2 + image: {{ .Values.exareme_images.repository }}/exareme:{{ .Values.exareme_images.version }} + imagePullPolicy: IfNotPresent ports: - containerPort: 9090 volumeMounts: - mountPath: /root/exareme/data - name: csvs + name: data env: + - name: ENVIRONMENT_TYPE + value: "{{ .Values.exareme.environment_type }}" + - name: LOG_LEVEL + value: "{{ .Values.exareme.log_level }}" + - name: CONVERT_CSVS + value: "{{ .Values.exareme.convert_csvs }}" + - name: TEMP_FILES_CLEANUP_TIME + value: "{{ .Values.exareme.temp_file_cleanup_time }}" + - name: NODE_COMMUNICATION_TIMEOUT + value: "{{ .Values.exareme.node_communication_timeout }}" - name: CONSULURL value: "exareme-keystore-service:8500" - name: FEDERATION_ROLE value: "master" - name: NODE_NAME value: "master" - - name: TEMP_FILES_CLEANUP_TIME - value: "30" - - name: NODE_COMMUNICATION_TIMEOUT - value: "30000" - - name: ENVIRONMENT_TYPE - value: "PROD" - - name: LOG_LEVEL - value: "INFO" - - name: CONVERT_CSVS - value: "TRUE" volumes: - - name: csvs + - name: data hostPath: - path: /etc/exareme + path: {{ .Values.data_path }} --- @@ -60,4 +61,4 @@ spec: - protocol: TCP port: 9090 targetPort: 9090 - nodePort: 30090 + nodePort: 30000 diff --git a/Federated-Deployment/kubernetes/exareme-worker.yaml b/Federated-Deployment/kubernetes/templates/exareme-worker.yaml similarity index 69% rename from Federated-Deployment/kubernetes/exareme-worker.yaml rename to Federated-Deployment/kubernetes/templates/exareme-worker.yaml index 74a2c9e84..ce450ea82 100644 --- a/Federated-Deployment/kubernetes/exareme-worker.yaml +++ b/Federated-Deployment/kubernetes/templates/exareme-worker.yaml @@ -5,7 +5,7 @@ metadata: labels: app: exareme-worker spec: - replicas: 2 + replicas: {{ .Values.workers }} selector: matchLabels: app: exareme-worker @@ -28,32 +28,33 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: exareme-worker - image: hbpmip/exareme:24.1.2 + image: {{ .Values.exareme_images.repository }}/exareme:{{ .Values.exareme_images.version }} + imagePullPolicy: IfNotPresent ports: - containerPort: 9090 volumeMounts: - mountPath: /root/exareme/data - name: csvs + name: data env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName + - name: ENVIRONMENT_TYPE + value: "{{ .Values.exareme.environment_type }}" + - name: LOG_LEVEL + value: "{{ .Values.exareme.log_level }}" + - name: CONVERT_CSVS + value: "{{ .Values.exareme.convert_csvs }}" + - name: TEMP_FILES_CLEANUP_TIME + value: "{{ .Values.exareme.temp_file_cleanup_time }}" + - name: NODE_COMMUNICATION_TIMEOUT + value: "{{ .Values.exareme.node_communication_timeout }}" - name: CONSULURL value: "exareme-keystore-service:8500" - name: FEDERATION_ROLE value: "worker" - - name: TEMP_FILES_CLEANUP_TIME - value: "30" - - name: NODE_COMMUNICATION_TIMEOUT - value: "30000" - - name: ENVIRONMENT_TYPE - value: "PROD" - - name: LOG_LEVEL - value: "INFO" - - name: CONVERT_CSVS - value: "TRUE" + - name: NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName volumes: - - name: csvs + - name: data hostPath: - path: /etc/exareme + path: {{ .Values.data_path }} diff --git a/Federated-Deployment/kubernetes/values.yaml b/Federated-Deployment/kubernetes/values.yaml new file mode 100644 index 000000000..c4cedc767 --- /dev/null +++ b/Federated-Deployment/kubernetes/values.yaml @@ -0,0 +1,14 @@ +exareme_images: + repository: hbpmip + version: 24.2.0 + +data_path: /opt/data + +exareme: + log_level: INFO + environment_type: PROD + convert_csvs: TRUE + temp_file_cleanup_time: 30 + node_communication_timeout: 30000 + +workers: 2