From b1c4639af071a6f92ab25a3027c515e81654f131 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Wed, 21 May 2025 11:23:59 -0700 Subject: [PATCH] SYS-652 miscellaneous fixes --- ansible/roles/volumes/handlers/main.yml | 6 +++++- k8s/helm/grafana/Chart.yaml | 4 ---- k8s/helm/grafana/values.yaml | 2 -- k8s/helm/restic/values.yaml | 2 -- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ansible/roles/volumes/handlers/main.yml b/ansible/roles/volumes/handlers/main.yml index 96a3fe1e..6ea97b19 100644 --- a/ansible/roles/volumes/handlers/main.yml +++ b/ansible/roles/volumes/handlers/main.yml @@ -1,6 +1,10 @@ --- - name: Cryptsetup resize - command: cryptsetup resize luks-{{ item.key }} + ansible.builtin.shell: | + mount /masterlock + cryptsetup resize luks-{{ item.key }} \ + --key-file /masterlock/keys/{{ inventory_hostname_short }}/{{ item.key }} + umount /masterlock with_dict: "{{ luks_volumes }}" - name: Filesystem resize diff --git a/k8s/helm/grafana/Chart.yaml b/k8s/helm/grafana/Chart.yaml index 5c9ef75d..72562477 100644 --- a/k8s/helm/grafana/Chart.yaml +++ b/k8s/helm/grafana/Chart.yaml @@ -20,7 +20,3 @@ dependencies: version: 0.1.0 repository: file://subcharts/alertmanager condition: alertmanager.enabled -- name: redis - version: 0.1.0 - repository: file://subcharts/redis - condition: redis.enabled diff --git a/k8s/helm/grafana/values.yaml b/k8s/helm/grafana/values.yaml index 1ba4cabe..837bb848 100644 --- a/k8s/helm/grafana/values.yaml +++ b/k8s/helm/grafana/values.yaml @@ -93,5 +93,3 @@ prometheus: enabled: true alertmanager: enabled: true -redis: - enabled: false diff --git a/k8s/helm/restic/values.yaml b/k8s/helm/restic/values.yaml index 8393974a..bd8e4a95 100644 --- a/k8s/helm/restic/values.yaml +++ b/k8s/helm/restic/values.yaml @@ -25,11 +25,9 @@ deployment: resources: limits: memory: 2048Mi - ephemeral-storage: 50Mi requests: cpu: 200m memory: 512Mi - ephemeral-storage: 10Mi volumeMounts: - mountPath: /var/spool/cron/crontabs/root name: config