diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-01-20 23:36:22 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-01-20 23:36:22 +0100 |
| commit | 6eb0d4b80be0db7951560e392bee9d5d1b156040 (patch) | |
| tree | 37d56400f0a79edb5ba61093a8b67125bc063591 | |
| parent | fix storage/zfs/base role (diff) | |
finalize apps/node-red
| -rw-r--r-- | chaos-at-home/ch-testvm-prometheus.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-testvm-prometheus.yml | 23 | ||||
| -rw-r--r-- | roles/apps/node-red/instance/tasks/main.yml | 14 | ||||
| -rw-r--r-- | roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 | 4 |
4 files changed, 32 insertions, 10 deletions
diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml index d7fa23c2..c739e714 100644 --- a/chaos-at-home/ch-testvm-prometheus.yml +++ b/chaos-at-home/ch-testvm-prometheus.yml @@ -20,3 +20,4 @@ - role: kubernetes/standalone/base - role: apps/publish/base - role: apps/whawty/auth + - role: apps/node-red diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml index dbd6c41a..ad4a1d9c 100644 --- a/inventory/host_vars/ch-testvm-prometheus.yml +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -62,7 +62,7 @@ zfs_volumes: whawty: children: auth: {} - + node-red: {} spreadspace_apt_repo_components: - container @@ -271,3 +271,24 @@ whawty_auth_instances: create_subject_key_identifier: yes not_after: +52w renew_margin: +42d + + +_node_red_zfs_base_: + pool: storage + name: node-red + +node_red_instances: + test: + version: 3.1.3 + port: 1880 + credential_secret: "altough-i-should-be-i-am-neither-secret-nor-random" + storage: + type: zfs + parent: "{{ _node_red_zfs_base_ }}" + name: test + properties: + quota: 512M + publish: + zone: "{{ apps_publish_zone__ch_testvm_prometheus }}" + hostnames: + - node-red.example.com diff --git a/roles/apps/node-red/instance/tasks/main.yml b/roles/apps/node-red/instance/tasks/main.yml index 410a1b9f..63d03539 100644 --- a/roles/apps/node-red/instance/tasks/main.yml +++ b/roles/apps/node-red/instance/tasks/main.yml @@ -1,10 +1,12 @@ --- -## TODO: add storage handling! -- set_fact: - node_red_instance_basepath: "/srv/node-red/{{ node_red_instance }}" -## +- name: prepare storage volume + vars: + storage_volume: "{{ node_red_instances[node_red_instance].storage }}" + include_role: + name: "storage/{{ node_red_instances[node_red_instance].storage.type }}/volume" -## TODO: custom user +- set_fact: + node_red_instance_basepath: "{{ storage_volume_mountpoint }}" - name: create instance directories loop: @@ -182,8 +184,10 @@ requestCert: true, minVersion: 'TLSv1.3' }, + {% if 'extra_settings' in node_red_instances[node_red_instance] %} {{ node_red_instances[node_red_instance].extra_settings | indent(4) }} + {% endif %} ** **************************************** diff --git a/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 b/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 index 50f8e0c2..3677d84b 100644 --- a/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 +++ b/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 @@ -22,10 +22,6 @@ containers: readOnly: true - name: store mountPath: /store - env: -{# TODO: remove debug output #} - - name: WHAWTY_AUTH_DEBUG - value: "1" ports: - containerPort: {{ whawty_auth_instances[whawty_auth_instance].port }} hostPort: {{ whawty_auth_instances[whawty_auth_instance].port }} |