apps/base/cephrgw-system/deployment.yaml

@@ -24,15 +24,16 @@ spec:
         runAsNonRoot: true
       containers:
         - name: operator
-          image: git.unkin.net/unkin/cephrgw-operator:v0.1.0
+          image: git.unkin.net/unkin/cephrgw-operator:v0.2.0
           args:
             - --metrics-bind-address=:8080
             - --health-probe-bind-address=:8081
             - --leader-elect
           envFrom:
-            # Provides CEPH_DASHBOARD_URL/USERNAME/PASSWORD and, optionally,
-            # CEPH_RGW_ENDPOINT / CEPH_DASHBOARD_CA. Create this Secret per
-            # docs/ceph-setup.md; it is intentionally not managed in GitOps.
+            # Provides CEPH_RGW_ACCESS_KEY/SECRET_KEY and the endpoints
+            # (CEPH_RGW_ENDPOINT / CEPH_RGW_ADMIN_ENDPOINT), plus optional
+            # CEPH_RGW_REGION / CEPH_RGW_CA / CEPH_RGW_INSECURE. Rendered from
+            # Vault per docs/ceph-setup.md; not managed in GitOps.
             - secretRef:
                 name: cephrgw-credentials
           ports:

apps/base/cephrgw-system/vaultstaticsecret.yaml

@@ -1,14 +1,17 @@
 ---
-# Renders the Ceph dashboard credentials from Vault into the cephrgw-credentials
+# Renders the radosgw 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.
+# (CEPH_RGW_ACCESS_KEY/SECRET_KEY, CEPH_RGW_ENDPOINT, optional
+# CEPH_RGW_ADMIN_ENDPOINT/REGION/CA) are copied verbatim, so they land as the
+# matching env vars.
 #
 # The path sits under the templated default policy
 # (kv/data/kubernetes/namespace/<ns>/<sa>/*), 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=...
+#     CEPH_RGW_ENDPOINT=https://s3.ceph.unkin.net \
+#     CEPH_RGW_ADMIN_ENDPOINT=https://radosgw.service.consul:443 \
+#     CEPH_RGW_ACCESS_KEY=... CEPH_RGW_SECRET_KEY=...
 apiVersion: secrets.hashicorp.com/v1beta1
 kind: VaultStaticSecret
 metadata: