From 61854d19b8a1b156acf45558b97d6c9e197a40e3 Mon Sep 17 00:00:00 2001 From: desmax74 Date: Fri, 30 Aug 2024 18:12:55 +0200 Subject: [PATCH] refactor Signed-off-by: desmax74 --- roles/tpa_single_node/README.md | 38 +++++++++++++++++++ .../bombastic/api/020-ConfigMap-auth.yaml | 0 .../bombastic/api/030-Deployment.yaml | 0 .../bombastic/api/040-Service.yaml | 0 .../bombastic/api/050-Ingress.yaml | 0 .../bombastic/indexer/030-Deployment.yaml | 0 .../bombastic/walker/030-CronJob.yaml | 0 .../collector/osv/020-ConfigMap-auth.yaml | 0 .../collector/osv/030-Deployment.yaml | 0 .../collector/osv/040-Service.yaml | 0 .../bombastic-collector/030-Deployment.yaml | 0 .../guac/collectsub/030-Deployment.yaml | 0 .../guac/collectsub/040-Service.yaml | 0 .../guac/collectsub/050-NetworkPolicy.yaml | 0 .../guac/graphql/030-Deployment.yaml | 0 .../guac/graphql/040-Service.yaml | 0 .../guac/graphql/050-NetworkPolicy.yaml | 0 .../vexination-collector/030-Deployment.yaml | 0 .../{ => manifests}/init/dataset/020-Job.yaml | 0 .../init/guac/010-ConfigMap.yaml | 0 .../{ => manifests}/init/guac/020-Job.yaml | 0 .../spog/api/020-ConfigMap-auth.yaml | 0 .../spog/api/020-ConfigMap-ui.yaml | 0 .../spog/api/030-Deployment.yaml | 0 .../spog/api/040-Service.yaml | 0 .../spog/api/050-Ingress.yaml | 0 .../spog/ui/020-ConfigMap-backend.yaml | 0 roles/tpa_single_node/tests/inventory | 2 - roles/tpa_single_node/tests/test.yml | 6 --- 29 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 roles/tpa_single_node/README.md rename roles/tpa_single_node/templates/{services => manifests}/bombastic/api/020-ConfigMap-auth.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/bombastic/api/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/bombastic/api/040-Service.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/bombastic/api/050-Ingress.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/bombastic/indexer/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/bombastic/walker/030-CronJob.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/collector/osv/020-ConfigMap-auth.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/collector/osv/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/collector/osv/040-Service.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/bombastic-collector/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/collectsub/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/collectsub/040-Service.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/collectsub/050-NetworkPolicy.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/graphql/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/graphql/040-Service.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/graphql/050-NetworkPolicy.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/guac/vexination-collector/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{ => manifests}/init/dataset/020-Job.yaml (100%) rename roles/tpa_single_node/templates/{ => manifests}/init/guac/010-ConfigMap.yaml (100%) rename roles/tpa_single_node/templates/{ => manifests}/init/guac/020-Job.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/spog/api/020-ConfigMap-auth.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/spog/api/020-ConfigMap-ui.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/spog/api/030-Deployment.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/spog/api/040-Service.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/spog/api/050-Ingress.yaml (100%) rename roles/tpa_single_node/templates/{services => manifests}/spog/ui/020-ConfigMap-backend.yaml (100%) delete mode 100644 roles/tpa_single_node/tests/inventory delete mode 100644 roles/tpa_single_node/tests/test.yml diff --git a/roles/tpa_single_node/README.md b/roles/tpa_single_node/README.md new file mode 100644 index 0000000..3ebede3 --- /dev/null +++ b/roles/tpa_single_node/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +Apache + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/tpa_single_node/templates/services/bombastic/api/020-ConfigMap-auth.yaml b/roles/tpa_single_node/templates/manifests/bombastic/api/020-ConfigMap-auth.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/bombastic/api/020-ConfigMap-auth.yaml rename to roles/tpa_single_node/templates/manifests/bombastic/api/020-ConfigMap-auth.yaml diff --git a/roles/tpa_single_node/templates/services/bombastic/api/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/bombastic/api/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/bombastic/api/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/bombastic/api/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/services/bombastic/api/040-Service.yaml b/roles/tpa_single_node/templates/manifests/bombastic/api/040-Service.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/bombastic/api/040-Service.yaml rename to roles/tpa_single_node/templates/manifests/bombastic/api/040-Service.yaml diff --git a/roles/tpa_single_node/templates/services/bombastic/api/050-Ingress.yaml b/roles/tpa_single_node/templates/manifests/bombastic/api/050-Ingress.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/bombastic/api/050-Ingress.yaml rename to roles/tpa_single_node/templates/manifests/bombastic/api/050-Ingress.yaml diff --git a/roles/tpa_single_node/templates/services/bombastic/indexer/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/bombastic/indexer/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/bombastic/indexer/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/bombastic/indexer/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/services/bombastic/walker/030-CronJob.yaml b/roles/tpa_single_node/templates/manifests/bombastic/walker/030-CronJob.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/bombastic/walker/030-CronJob.yaml rename to roles/tpa_single_node/templates/manifests/bombastic/walker/030-CronJob.yaml diff --git a/roles/tpa_single_node/templates/services/collector/osv/020-ConfigMap-auth.yaml b/roles/tpa_single_node/templates/manifests/collector/osv/020-ConfigMap-auth.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/collector/osv/020-ConfigMap-auth.yaml rename to roles/tpa_single_node/templates/manifests/collector/osv/020-ConfigMap-auth.yaml diff --git a/roles/tpa_single_node/templates/services/collector/osv/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/collector/osv/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/collector/osv/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/collector/osv/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/services/collector/osv/040-Service.yaml b/roles/tpa_single_node/templates/manifests/collector/osv/040-Service.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/collector/osv/040-Service.yaml rename to roles/tpa_single_node/templates/manifests/collector/osv/040-Service.yaml diff --git a/roles/tpa_single_node/templates/services/guac/bombastic-collector/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/guac/bombastic-collector/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/bombastic-collector/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/guac/bombastic-collector/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/services/guac/collectsub/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/guac/collectsub/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/collectsub/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/guac/collectsub/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/services/guac/collectsub/040-Service.yaml b/roles/tpa_single_node/templates/manifests/guac/collectsub/040-Service.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/collectsub/040-Service.yaml rename to roles/tpa_single_node/templates/manifests/guac/collectsub/040-Service.yaml diff --git a/roles/tpa_single_node/templates/services/guac/collectsub/050-NetworkPolicy.yaml b/roles/tpa_single_node/templates/manifests/guac/collectsub/050-NetworkPolicy.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/collectsub/050-NetworkPolicy.yaml rename to roles/tpa_single_node/templates/manifests/guac/collectsub/050-NetworkPolicy.yaml diff --git a/roles/tpa_single_node/templates/services/guac/graphql/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/guac/graphql/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/graphql/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/guac/graphql/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/services/guac/graphql/040-Service.yaml b/roles/tpa_single_node/templates/manifests/guac/graphql/040-Service.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/graphql/040-Service.yaml rename to roles/tpa_single_node/templates/manifests/guac/graphql/040-Service.yaml diff --git a/roles/tpa_single_node/templates/services/guac/graphql/050-NetworkPolicy.yaml b/roles/tpa_single_node/templates/manifests/guac/graphql/050-NetworkPolicy.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/graphql/050-NetworkPolicy.yaml rename to roles/tpa_single_node/templates/manifests/guac/graphql/050-NetworkPolicy.yaml diff --git a/roles/tpa_single_node/templates/services/guac/vexination-collector/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/guac/vexination-collector/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/guac/vexination-collector/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/guac/vexination-collector/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/init/dataset/020-Job.yaml b/roles/tpa_single_node/templates/manifests/init/dataset/020-Job.yaml similarity index 100% rename from roles/tpa_single_node/templates/init/dataset/020-Job.yaml rename to roles/tpa_single_node/templates/manifests/init/dataset/020-Job.yaml diff --git a/roles/tpa_single_node/templates/init/guac/010-ConfigMap.yaml b/roles/tpa_single_node/templates/manifests/init/guac/010-ConfigMap.yaml similarity index 100% rename from roles/tpa_single_node/templates/init/guac/010-ConfigMap.yaml rename to roles/tpa_single_node/templates/manifests/init/guac/010-ConfigMap.yaml diff --git a/roles/tpa_single_node/templates/init/guac/020-Job.yaml b/roles/tpa_single_node/templates/manifests/init/guac/020-Job.yaml similarity index 100% rename from roles/tpa_single_node/templates/init/guac/020-Job.yaml rename to roles/tpa_single_node/templates/manifests/init/guac/020-Job.yaml diff --git a/roles/tpa_single_node/templates/services/spog/api/020-ConfigMap-auth.yaml b/roles/tpa_single_node/templates/manifests/spog/api/020-ConfigMap-auth.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/spog/api/020-ConfigMap-auth.yaml rename to roles/tpa_single_node/templates/manifests/spog/api/020-ConfigMap-auth.yaml diff --git a/roles/tpa_single_node/templates/services/spog/api/020-ConfigMap-ui.yaml b/roles/tpa_single_node/templates/manifests/spog/api/020-ConfigMap-ui.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/spog/api/020-ConfigMap-ui.yaml rename to roles/tpa_single_node/templates/manifests/spog/api/020-ConfigMap-ui.yaml diff --git a/roles/tpa_single_node/templates/services/spog/api/030-Deployment.yaml b/roles/tpa_single_node/templates/manifests/spog/api/030-Deployment.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/spog/api/030-Deployment.yaml rename to roles/tpa_single_node/templates/manifests/spog/api/030-Deployment.yaml diff --git a/roles/tpa_single_node/templates/services/spog/api/040-Service.yaml b/roles/tpa_single_node/templates/manifests/spog/api/040-Service.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/spog/api/040-Service.yaml rename to roles/tpa_single_node/templates/manifests/spog/api/040-Service.yaml diff --git a/roles/tpa_single_node/templates/services/spog/api/050-Ingress.yaml b/roles/tpa_single_node/templates/manifests/spog/api/050-Ingress.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/spog/api/050-Ingress.yaml rename to roles/tpa_single_node/templates/manifests/spog/api/050-Ingress.yaml diff --git a/roles/tpa_single_node/templates/services/spog/ui/020-ConfigMap-backend.yaml b/roles/tpa_single_node/templates/manifests/spog/ui/020-ConfigMap-backend.yaml similarity index 100% rename from roles/tpa_single_node/templates/services/spog/ui/020-ConfigMap-backend.yaml rename to roles/tpa_single_node/templates/manifests/spog/ui/020-ConfigMap-backend.yaml diff --git a/roles/tpa_single_node/tests/inventory b/roles/tpa_single_node/tests/inventory deleted file mode 100644 index 878877b..0000000 --- a/roles/tpa_single_node/tests/inventory +++ /dev/null @@ -1,2 +0,0 @@ -localhost - diff --git a/roles/tpa_single_node/tests/test.yml b/roles/tpa_single_node/tests/test.yml deleted file mode 100644 index 6b63614..0000000 --- a/roles/tpa_single_node/tests/test.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Install TPA locally - hosts: localhost - remote_user: root - roles: - - tpa_single_node