From 87bb031ed00b7993a29d74aee2e89875c5444caf Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 25 Dec 2022 22:31:18 +0100 Subject: Migrate prod cluster secrets to new format --- cluster/prod/app/telemetry/secrets.toml | 16 ++++++++++++++++ .../telemetry/secrets/telemetry/grafana/admin_password | 1 - .../telemetry/secrets/telemetry/grafana/s3_access_key | 1 - .../telemetry/secrets/telemetry/grafana/s3_secret_key | 1 - 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 cluster/prod/app/telemetry/secrets.toml delete mode 100644 cluster/prod/app/telemetry/secrets/telemetry/grafana/admin_password delete mode 100644 cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_access_key delete mode 100644 cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_secret_key (limited to 'cluster/prod/app/telemetry') diff --git a/cluster/prod/app/telemetry/secrets.toml b/cluster/prod/app/telemetry/secrets.toml new file mode 100644 index 0000000..763a14c --- /dev/null +++ b/cluster/prod/app/telemetry/secrets.toml @@ -0,0 +1,16 @@ +[secrets."telemetry/grafana/admin_password"] +type = 'command' +rotate = true +command = 'openssl rand -base64 12' + + +# S3 database storage access + +[secrets."telemetry/grafana/s3_access_key"] +type = 'user' +description = 'S3 access key for grafana db' + +[secrets."telemetry/grafana/s3_secret_key"] +type = 'user' +description = 'S3 secret key for grafana db' + diff --git a/cluster/prod/app/telemetry/secrets/telemetry/grafana/admin_password b/cluster/prod/app/telemetry/secrets/telemetry/grafana/admin_password deleted file mode 100644 index 2f36e97..0000000 --- a/cluster/prod/app/telemetry/secrets/telemetry/grafana/admin_password +++ /dev/null @@ -1 +0,0 @@ -CMD openssl rand -base64 12 diff --git a/cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_access_key b/cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_access_key deleted file mode 100644 index c7e41a4..0000000 --- a/cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_access_key +++ /dev/null @@ -1 +0,0 @@ -USER S3 access key for grafana db diff --git a/cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_secret_key b/cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_secret_key deleted file mode 100644 index 051f41a..0000000 --- a/cluster/prod/app/telemetry/secrets/telemetry/grafana/s3_secret_key +++ /dev/null @@ -1 +0,0 @@ -USER S3 secret key for grafana db -- cgit v1.2.3