Skip to content

Commit a97c37c

Browse files
gildubgildub
committed
Use Quadlet
1 parent 53e1710 commit a97c37c

29 files changed

+203
-239
lines changed

‎roles/tpa_single_node/tasks/bombastic/api.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
type: "api"
88

99
- name: Deploy bombastic-api
10-
ansible.builtin.include_tasks: install_manifest.yml
10+
ansible.builtin.include_tasks: install_service.yml
1111
vars:
12-
podman_spec:
13-
state: started
14-
systemd_file: bombastic-api
12+
specs:
13+
service: bombastic-api
14+
state: restarted
1515
network: "{{ tpa_single_node_podman_network }}"
16-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/bombastic/api/Deployment.yaml.j2') | from_yaml }}"
16+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
17+
manifest_file: "{{ role_path }}/templates/manifests/bombastic/api/Deployment.yaml.j2"
1718
configmaps:
1819
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/bombastic-api.yaml"
1920
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/bombastic/indexer.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
- name: Deploy bombastic-indexer
2-
ansible.builtin.include_tasks: install_manifest.yml
2+
ansible.builtin.include_tasks: install_service.yml
33
vars:
4-
podman_spec:
5-
state: started
6-
systemd_file: bombastic-indexer
4+
specs:
5+
service: bombastic-indexer
6+
state: restarted
77
network: "{{ tpa_single_node_podman_network }}"
8-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/bombastic/indexer/Deployment.yaml.j2') | from_yaml }}"
8+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
9+
manifest_file: "{{ role_path }}/templates/manifests/bombastic/indexer/Deployment.yaml.j2"
910
configmaps:
1011
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/bombastic/walker.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
---
22
- name: Deploy bombastic walker Pod
3-
ansible.builtin.include_tasks: install_manifest_cronjob.yml
3+
ansible.builtin.include_tasks: install_service.yml
44
when: not tpa_single_node_bombastic_walker_suspended
55
vars:
6-
podman_spec:
6+
specs:
7+
service: bombastic-walker
78
state: stopped
8-
systemd_file: bombastic-walker
99
network: "{{ tpa_single_node_podman_network }}"
10-
timer_type: monotonic # realtime
11-
time_pattern: 1h # *:0/10 for realtime instead of monotonic
12-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/bombastic/walker/Deployment.yaml.j2') | from_yaml }}"
10+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
11+
manifest_file: "{{ role_path }}/templates/manifests/bombastic/walker/Deployment.yaml.j2"
1312
configmaps:
1413
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"
14+
timer:
15+
type: monotonic # realtime
16+
pattern: 1h # *:0/10 for realtime instead of monotonic

‎roles/tpa_single_node/tasks/collector/osv.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
type: "osv"
1515

1616
- name: Deploy collector-osv
17-
ansible.builtin.include_tasks: install_manifest.yml
17+
ansible.builtin.include_tasks: install_service.yml
1818
vars:
19-
podman_spec:
20-
state: started
21-
systemd_file: collector-osv
19+
specs:
20+
service: collector-osv
21+
state: restarted
2222
network: "{{ tpa_single_node_podman_network }}"
23-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/collector/osv/Deployment.yaml.j2') | from_yaml }}"
23+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
24+
manifest_file: "{{ role_path }}/templates/manifests/collector/osv/Deployment.yaml.j2"
2425
configmaps:
2526
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/collector-osv.yaml"
2627
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/collectorist-api-guac.yaml"

‎roles/tpa_single_node/tasks/collectorist/api.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
changed_when: false
2626

2727
- name: Deploy collectorist-api
28-
ansible.builtin.include_tasks: install_manifest.yml
28+
ansible.builtin.include_tasks: install_service.yml
2929
vars:
30-
podman_spec:
31-
state: started
32-
systemd_file: collectorist-api
30+
specs:
31+
service: collectorist-api
32+
state: restarted
3333
network: "{{ tpa_single_node_podman_network }}"
34-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/collectorist/api/Deployment.yaml.j2') | from_yaml }}"
34+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
35+
manifest_file: "{{ role_path }}/templates/manifests/collectorist/api/Deployment.yaml.j2"
3536
configmaps:
3637
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/collectorist-api.yaml"
3738
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/collectorist-api-guac.yaml"

‎roles/tpa_single_node/tasks/dataset/init.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
- name: Deploy init-dataset Pod
3-
ansible.builtin.include_tasks: install_manifest.yml
3+
ansible.builtin.include_tasks: install_service.yml
44
vars:
5-
podman_spec:
6-
state: stopped
7-
systemd_file: init-dataset
5+
specs:
6+
service: init-dataset
7+
state: started
88
network: "{{ tpa_single_node_podman_network }}"
9-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/init/dataset/Deployment.yaml.j2') | from_yaml }}"
9+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
10+
manifest_file: "{{ role_path }}/templates/manifests/init/dataset/Deployment.yaml.j2"
1011
configmaps:
1112
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/guac/bombastic_collector.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
- name: Deploy Guac bombastic collector
3-
ansible.builtin.include_tasks: install_manifest.yml
3+
ansible.builtin.include_tasks: install_service.yml
44
vars:
5-
podman_spec:
6-
state: started
7-
systemd_file: guac-collector-bombastic
5+
specs:
6+
service: guac-collector-bombastic
7+
state: restarted
88
network: "{{ tpa_single_node_podman_network }}"
9-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/guac/bombastic-collector/Deployment.yaml.j2') | from_yaml }}"
9+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
10+
manifest_file: "{{ role_path }}/templates/manifests/guac/bombastic-collector/Deployment.yaml.j2"
1011
configmaps:
1112
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/guac/guac_collectsub.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
- name: Deploy guac-collectsub Pod
3-
ansible.builtin.include_tasks: install_manifest.yml
3+
ansible.builtin.include_tasks: install_service.yml
44
vars:
5-
podman_spec:
6-
state: started
7-
systemd_file: guac-collectsub
5+
specs:
6+
service: guac-collectsub
7+
state: restarted
88
network: "{{ tpa_single_node_podman_network }}"
9-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/guac/collectsub/Deployment.yaml.j2') | from_yaml }}"
9+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
10+
manifest_file: "{{ role_path }}/templates/manifests/guac/collectsub/Deployment.yaml.j2"
1011
configmaps:
1112
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/guac/guac_graphql.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
- name: Deploy guac-graphql Pod
3-
ansible.builtin.include_tasks: install_manifest.yml
3+
ansible.builtin.include_tasks: install_service.yml
44
vars:
5-
podman_spec:
6-
state: started
7-
systemd_file: guac-graphql
8-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/guac/graphql/Deployment.yaml.j2') | from_yaml }}"
5+
specs:
6+
service: guac-graphql
7+
state: restarted
98
network: "{{ tpa_single_node_podman_network }}"
9+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
10+
manifest_file: "{{ role_path }}/templates/manifests/guac/graphql/Deployment.yaml.j2"
1011
configmaps:
1112
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/guac/vexination_collector.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
- name: Deploy Guac vexination collector
3-
ansible.builtin.include_tasks: install_manifest.yml
3+
ansible.builtin.include_tasks: install_service.yml
44
vars:
5-
podman_spec:
6-
state: started
7-
systemd_file: guac-collector-vexination
5+
specs:
6+
service: guac-collector-vexination
7+
state: restarted
88
network: "{{ tpa_single_node_podman_network }}"
9-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/guac/vexination-collector/Deployment.yaml.j2') | from_yaml }}"
9+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
10+
manifest_file: "{{ role_path }}/templates/manifests/guac/vexination-collector/Deployment.yaml.j2"
1011
configmaps:
1112
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/install_manifest.yml

-32
This file was deleted.

‎roles/tpa_single_node/tasks/install_manifest_cronjob.yml

-45
This file was deleted.

‎roles/tpa_single_node/tasks/install_service.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
- name: Generate {{ specs.service }} deployment manifest
2+
ansible.builtin.template:
3+
src: "{{ specs.manifest_file }}"
4+
dest: "{{ tpa_single_node_kube_manifest_dir }}/Deployments/{{ specs.service }}.yaml"
5+
mode: "0600"
6+
register: copy_manifest
7+
8+
- name: Generate {{ specs.service }} Quadlet file
9+
ansible.builtin.template:
10+
src: "{{ specs.kube_file }}"
11+
dest: "/etc/containers/systemd/{{ specs.service }}.kube"
12+
mode: "0600"
13+
register: copy_systemd_file
14+
15+
- name: Add systemd timer for {{ specs.service }}
16+
when: specs.timer is defined
17+
ansible.builtin.template:
18+
src: systemd/timer.j2
19+
dest: "{{ tpa_single_node_systemd_directory + '/' + specs.service }}.timer"
20+
mode: "0600"
21+
register: copy_systemd_timer_file
22+
23+
- name: Restart Podman Service for {{ specs.service }}
24+
ansible.builtin.systemd:
25+
state: "{{ specs.state }}"
26+
enabled: true
27+
daemon_reload: true
28+
name: "{{ specs.service }}"
29+
no_block: true
30+
when: copy_manifest.changed or copy_systemd_file.changed or copy_systemd_timer_file.changed

‎roles/tpa_single_node/tasks/spog/api.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@
3030
changed_when: false
3131

3232
- name: Deploy spog-api
33-
ansible.builtin.include_tasks: install_manifest.yml
33+
ansible.builtin.include_tasks: install_service.yml
3434
vars:
35-
podman_spec:
36-
state: started
37-
systemd_file: spog-api
35+
specs:
36+
service: spog-api
37+
state: restarted
3838
network: "{{ tpa_single_node_podman_network }}"
39-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/spog/api/Deployment.yaml.j2') | from_yaml }}"
39+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
40+
manifest_file: "{{ role_path }}/templates/manifests/spog/api/Deployment.yaml.j2"
4041
configmaps:
4142
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/spog-api.yaml"
4243
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/spog-ui-config.yaml"

‎roles/tpa_single_node/tasks/spog/nginx.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
mode: "0600"
2121

2222
- name: Deploy nginx reverse proxy
23-
ansible.builtin.include_tasks: install_manifest.yml
23+
ansible.builtin.include_tasks: install_service.yml
2424
vars:
25-
podman_spec:
26-
state: started
27-
systemd_file: nginx
25+
specs:
26+
service: nginx
27+
state: restarted
2828
network: "{{ tpa_single_node_podman_network }}"
29-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/nginx/Deployment.yaml.j2') | from_yaml }}"
29+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
30+
manifest_file: "{{ role_path }}/templates/manifests/nginx/Deployment.yaml.j2"
3031
configmaps:
3132
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/nginx.yaml"

‎roles/tpa_single_node/tasks/spog/ui.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
register: spog_ui_branding_configmap_checksum
2727

2828
- name: Deploy spog-ui
29-
ansible.builtin.include_tasks: install_manifest.yml
29+
ansible.builtin.include_tasks: install_service.yml
3030
vars:
31-
podman_spec:
32-
state: started
33-
systemd_file: spog-ui
31+
specs:
32+
service: spog-ui
33+
state: restarted
3434
network: "{{ tpa_single_node_podman_network }}"
35-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/spog/ui/Deployment.yaml.j2') | from_yaml }}"
35+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
36+
manifest_file: "{{ role_path }}/templates/manifests/spog/ui/Deployment.yaml.j2"
3637
configmaps:
3738
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/spog-ui-backend.yaml"
3839
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/spog-ui-branding.yaml"

‎roles/tpa_single_node/tasks/v11y/api.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
type: "api"
88

99
- name: Deploy v11y-api
10-
ansible.builtin.include_tasks: install_manifest.yml
10+
ansible.builtin.include_tasks: install_service.yml
1111
vars:
12-
podman_spec:
13-
state: started
14-
systemd_file: v11y-api
12+
specs:
13+
service: v11y-api
14+
state: restarted
1515
network: "{{ tpa_single_node_podman_network }}"
16-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/v11y/api/Deployment.yaml.j2') | from_yaml }}"
16+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
17+
manifest_file: "{{ role_path }}/templates/manifests/v11y/api/Deployment.yaml.j2"
1718
configmaps:
1819
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/v11y-api.yaml"
1920
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/v11y/indexer.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
- name: Deploy v11y-indexer
2-
ansible.builtin.include_tasks: install_manifest.yml
2+
ansible.builtin.include_tasks: install_service.yml
33
vars:
4-
podman_spec:
5-
state: started
6-
systemd_file: v11y-indexer
4+
specs:
5+
service: v11y-indexer
6+
state: restarted
77
network: "{{ tpa_single_node_podman_network }}"
8-
kube_file_content: "{{ lookup('ansible.builtin.template', 'manifests/v11y/indexer/Deployment.yaml.j2') | from_yaml }}"
8+
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
9+
manifest_file: "{{ role_path }}/templates/manifests/v11y/indexer/Deployment.yaml.j2"
910
configmaps:
1011
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

0 commit comments

Comments
 (0)