(elqui) fix ownership of rubinobs-butler-* buckets

Author: jhoblitt

fleet/lib/rook-ceph-conf/charts/elqui/templates/cephobjectstoreuser-extended-ceph-exporter.yaml

@@ -10,7 +10,7 @@ spec:
   displayName: extended-ceph-exporter
   capabilities:
     buckets: read
-    users: read
-    usage: read
     metadata: read
+    usage: read
+    users: read
     zone: read

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-butler-comcam.yaml

@@ -2,13 +2,13 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-butler-comcam
+  name: &name rubinobs-butler-comcam
   namespace: rook-ceph
 spec:
-  bucketName: rubinobs-butler-comcam
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
-    bucketOwner: comcam
+    bucketOwner: butler
     bucketMaxSize: 20Ti
     bucketPolicy: |
       {
@@ -60,14 +60,6 @@ spec:
             "AbortIncompleteMultipartUpload": {
               "DaysAfterInitiation": 1
             }
-          },
-          {
-            "ID": "ExpireAfter30Days",
-            "Status": "Enabled",
-            "Prefix": "",
-            "Expiration": {
-              "Days": 90
-            }
           }
         ]
       }

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-butler-latiss.yaml

@@ -2,13 +2,13 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-butler-latiss
+  name: &name rubinobs-butler-latiss
   namespace: rook-ceph
 spec:
-  bucketName: rubinobs-butler-latiss
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
-    bucketOwner: latiss
+    bucketOwner: butler
     bucketMaxSize: 10Ti
     bucketPolicy: |
       {
@@ -60,14 +60,6 @@ spec:
             "AbortIncompleteMultipartUpload": {
               "DaysAfterInitiation": 1
             }
-          },
-          {
-            "ID": "ExpireAfter30Days",
-            "Status": "Enabled",
-            "Prefix": "",
-            "Expiration": {
-              "Days": 90
-            }
           }
         ]
       }

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-butler-lsstcam.yaml

@@ -2,13 +2,13 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-butler-lsstcam
+  name: &name rubinobs-butler-lsstcam
   namespace: rook-ceph
 spec:
-  bucketName: rubinobs-butler-lsstcam
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
-    bucketOwner: lsstcam
+    bucketOwner: butler
     bucketMaxSize: 2.5Pi
     bucketPolicy: |
       {
@@ -61,14 +61,6 @@ spec:
             "AbortIncompleteMultipartUpload": {
               "DaysAfterInitiation": 1
             }
-          },
-          {
-            "ID": "ExpireAfter30Days",
-            "Status": "Enabled",
-            "Prefix": "",
-            "Expiration": {
-              "Days": 90
-            }
           }
         ]
       }

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-calibrations.yaml

@@ -2,10 +2,10 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-calibrations
+  name: &name rubinobs-calibrations
   namespace: rook-ceph
 spec:
-  bucketName: rubinobs-calibrations
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
     bucketOwner: calib

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-lfa-cp.yaml

@@ -2,10 +2,10 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-lfa-cp
+  name: &name rubinobs-lfa-cp
   namespace: rook-ceph
 spec:
-  bucketName: rubinobs-lfa-cp
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
     bucketOwner: saluser

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-raw-comcam.yaml

@@ -2,12 +2,12 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-raw-comcam
+  name: &name rubinobs-raw-comcam
   namespace: rook-ceph
   labels:
     bucket-notification-lsst.s3.raw.comcam: lsst.s3.raw.comcam
 spec:
-  bucketName: rubinobs-raw-comcam
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
     bucketOwner: comcam

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-raw-latiss.yaml

@@ -2,12 +2,12 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-raw-latiss
+  name: &name rubinobs-raw-latiss
   namespace: rook-ceph
   labels:
     bucket-notification-lsst.s3.raw.latiss: lsst.s3.raw.latiss
 spec:
-  bucketName: rubinobs-raw-latiss
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
     bucketOwner: latiss

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubinobs-raw-lsstcam.yaml

@@ -2,12 +2,12 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubinobs-raw-lsstcam
+  name: &name rubinobs-raw-lsstcam
   namespace: rook-ceph
   labels:
     bucket-notification-lsst.s3.raw.lsstcam: lsst.s3.raw.lsstcam
 spec:
-  bucketName: rubinobs-raw-lsstcam
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
     bucketOwner: lsstcam

fleet/lib/rook-ceph-conf/charts/elqui/templates/obc-rubintv.yaml

@@ -2,10 +2,10 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rubintv
+  name: &name rubintv
   namespace: rook-ceph
 spec:
-  bucketName: rubintv
+  bucketName: *name
   storageClassName: lfa
   additionalConfig:
     bucketOwner: rubintv