diff --git a/apps/base/cephrgw-system/kustomization.yaml b/apps/base/cephrgw-system/kustomization.yaml index c3558d4..8087c3e 100644 --- a/apps/base/cephrgw-system/kustomization.yaml +++ b/apps/base/cephrgw-system/kustomization.yaml @@ -9,3 +9,5 @@ resources: - https://git.unkin.net/unkin/cephrgw-operator/raw/tag/v0.1.0/config/crd/install.yaml - rbac.yaml - deployment.yaml + - vaultauth.yaml + - vaultstaticsecret.yaml diff --git a/apps/base/cephrgw-system/vaultauth.yaml b/apps/base/cephrgw-system/vaultauth.yaml new file mode 100644 index 0000000..ceb64b7 --- /dev/null +++ b/apps/base/cephrgw-system/vaultauth.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: secrets.hashicorp.com/v1beta1 +kind: VaultAuth +metadata: + name: default + namespace: cephrgw-system +spec: + method: kubernetes + mount: k8s/au/syd1 + vaultConnectionRef: vso-system/default + allowedNamespaces: + - cephrgw-system + kubernetes: + # Shared "default" role: binds the namespace's default ServiceAccount and + # grants the templated kv/kubernetes/namespace///* read policy, so + # no per-app terraform-vault change is needed. + role: default + serviceAccount: default + audiences: + - vault + tokenExpirationSeconds: 600 diff --git a/apps/base/cephrgw-system/vaultstaticsecret.yaml b/apps/base/cephrgw-system/vaultstaticsecret.yaml new file mode 100644 index 0000000..142cc74 --- /dev/null +++ b/apps/base/cephrgw-system/vaultstaticsecret.yaml @@ -0,0 +1,27 @@ +--- +# Renders the Ceph dashboard credentials from Vault into the cephrgw-credentials +# Secret the operator Deployment consumes via envFrom. The KV secret's keys +# (CEPH_DASHBOARD_URL/USERNAME/PASSWORD, optional CEPH_RGW_ENDPOINT/CA) are +# copied verbatim, so they land as the matching env vars. +# +# The path sits under the templated default policy +# (kv/data/kubernetes/namespace///*), so it needs no dedicated Vault +# role or policy. Seed the values with: +# vault kv put kv/kubernetes/namespace/cephrgw-system/default/cephrgw-credentials \ +# CEPH_DASHBOARD_URL=... CEPH_DASHBOARD_USERNAME=... CEPH_DASHBOARD_PASSWORD=... +apiVersion: secrets.hashicorp.com/v1beta1 +kind: VaultStaticSecret +metadata: + name: cephrgw-credentials + namespace: cephrgw-system +spec: + vaultAuthRef: default + mount: kv + type: kv-v2 + path: kubernetes/namespace/cephrgw-system/default/cephrgw-credentials + refreshAfter: 5m + hmacSecretData: true + destination: + name: cephrgw-credentials + create: true + overwrite: true