Skip to content

Commit 179d40c

Browse files
committed
(ruka) fix ownership of rubinobs-butler-* buckets
1 parent d01928a commit 179d40c

10 files changed

+33
-26
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-butler-comcam
5+
name: &name rubinobs-butler-comcam
66
namespace: rook-ceph
77
spec:
8-
bucketName: rubinobs-butler-comcam
8+
bucketName: *name
99
storageClassName: lfa
1010
additionalConfig:
11-
bucketOwner: comcam
11+
bucketOwner: butler
1212
bucketMaxSize: 20Ti
1313
bucketPolicy: |
1414
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-butler-latiss
5+
name: &name rubinobs-butler-latiss
66
namespace: rook-ceph
77
spec:
8-
bucketName: rubinobs-butler-latiss
8+
bucketName: *name
99
storageClassName: lfa
1010
additionalConfig:
11-
bucketOwner: latiss
11+
bucketOwner: butler
1212
bucketMaxSize: 10Ti
1313
bucketPolicy: |
1414
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-butler-lsstcam
5+
name: &name rubinobs-butler-lsstcam
66
namespace: rook-ceph
77
spec:
8-
bucketName: rubinobs-butler-lsstcam
8+
bucketName: *name
99
storageClassName: lfa
1010
additionalConfig:
11-
bucketOwner: lsstcam
11+
bucketOwner: butler
1212
bucketMaxSize: 2.5Pi
1313
bucketPolicy: |
1414
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-calibrations
5+
name: &name rubinobs-calibrations
66
namespace: rook-ceph
77
spec:
8-
bucketName: rubinobs-calibrations
8+
bucketName: *name
99
storageClassName: lfa
1010
additionalConfig:
1111
bucketOwner: calib

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-lfa-cp
5+
name: &name rubinobs-lfa-cp
66
namespace: rook-ceph
77
spec:
8-
bucketName: rubinobs-lfa-cp
8+
bucketName: *name
99
storageClassName: lfa
1010
additionalConfig:
1111
bucketOwner: saluser

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-raw-comcam
5+
name: &name rubinobs-raw-comcam
66
namespace: rook-ceph
77
labels:
88
bucket-notification-lsst.s3.raw.comcam: lsst.s3.raw.comcam
99
spec:
10-
bucketName: rubinobs-raw-comcam
10+
bucketName: *name
1111
storageClassName: lfa
1212
additionalConfig:
1313
bucketOwner: comcam
@@ -62,7 +62,7 @@ spec:
6262
}
6363
},
6464
{
65-
"ID": "ExpireAfter30Days",
65+
"ID": "ExpireAfter90Days",
6666
"Status": "Enabled",
6767
"Prefix": "",
6868
"Expiration": {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-raw-latiss
5+
name: &name rubinobs-raw-latiss
66
namespace: rook-ceph
77
labels:
88
bucket-notification-lsst.s3.raw.latiss: lsst.s3.raw.latiss
99
spec:
10-
bucketName: rubinobs-raw-latiss
10+
bucketName: *name
1111
storageClassName: lfa
1212
additionalConfig:
1313
bucketOwner: latiss
@@ -62,7 +62,7 @@ spec:
6262
}
6363
},
6464
{
65-
"ID": "ExpireAfter30Days",
65+
"ID": "ExpireAfter90Days",
6666
"Status": "Enabled",
6767
"Prefix": "",
6868
"Expiration": {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubinobs-raw-lsstcam
5+
name: &name rubinobs-raw-lsstcam
66
namespace: rook-ceph
77
labels:
88
bucket-notification-lsst.s3.raw.lsstcam: lsst.s3.raw.lsstcam
99
spec:
10-
bucketName: rubinobs-raw-lsstcam
10+
bucketName: *name
1111
storageClassName: lfa
1212
additionalConfig:
1313
bucketOwner: lsstcam
@@ -62,7 +62,7 @@ spec:
6262
}
6363
},
6464
{
65-
"ID": "ExpireAfter30Days",
65+
"ID": "ExpireAfter90Days",
6666
"Status": "Enabled",
6767
"Prefix": "",
6868
"Expiration": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: objectbucket.io/v1alpha1
33
kind: ObjectBucketClaim
44
metadata:
5-
name: rubintv
5+
name: &name rubintv
66
namespace: rook-ceph
77
spec:
8-
bucketName: rubintv
8+
bucketName: *name
99
storageClassName: lfa
1010
additionalConfig:
1111
bucketOwner: rubintv

fleet/lib/rook-ceph-conf/charts/ruka/values.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ users:
44
spec:
55
store: lfa
66
quotas:
7-
maxBuckets: 2
8-
maxSize: 2Pi
7+
maxBuckets: 3
98
- name: calib
109
spec:
1110
store: lfa
11+
quotas:
12+
maxBuckets: 1
1213
- name: comcam
1314
spec:
1415
store: lfa
@@ -27,12 +28,18 @@ users:
2728
- name: oods-comcam
2829
spec:
2930
store: lfa
31+
quotas:
32+
maxBuckets: 0
3033
- name: oods-latiss
3134
spec:
3235
store: lfa
36+
quotas:
37+
maxBuckets: 0
3338
- name: oods-lsstcam
3439
spec:
3540
store: lfa
41+
quotas:
42+
maxBuckets: 0
3643
- name: rubintv
3744
spec:
3845
store: lfa

0 commit comments

Comments
 (0)