Skip to content

Commit d01928a

Browse files
jhoblittjhoblitt
committed
(ayekan) fix ownership of rubinobs-butler-* buckets
1 parent a839a48 commit d01928a

10 files changed

+96
-24
lines changed

‎fleet/lib/rook-ceph-conf/charts/ayekan/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/ayekan/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/ayekan/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/ayekan/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/ayekan/templates/obc-rubinobs-lfa-cp.yaml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
apiVersion: objectbucket.io/v1alpha1
3+
kind: ObjectBucketClaim
4+
metadata:
5+
name: &name rubinobs-lfa-cp
6+
namespace: rook-ceph
7+
spec:
8+
bucketName: *name
9+
storageClassName: lfa
10+
additionalConfig:
11+
bucketOwner: saluser
12+
bucketMaxSize: 10Ti
13+
bucketPolicy: |
14+
{
15+
"Version": "2012-10-17",
16+
"Statement": [
17+
{
18+
"Sid": "AllowReadAccess",
19+
"Effect": "Allow",
20+
"Principal": {
21+
"AWS": "arn:aws:iam:::user/s3lhn"
22+
},
23+
"Action": [
24+
"s3:ListBucket",
25+
"s3:GetObject",
26+
"s3:GetObjectVersion"
27+
],
28+
"Resource": [
29+
"arn:aws:s3:::rubinobs-lfa-cp",
30+
"arn:aws:s3:::rubinobs-lfa-cp/*"
31+
]
32+
},
33+
{
34+
"Sid": "PublicRead",
35+
"Effect": "Allow",
36+
"Principal": "*",
37+
"Action": [
38+
"s3:GetObject",
39+
"s3:GetObjectVersion"
40+
],
41+
"Resource": ["arn:aws:s3:::*"]
42+
}
43+
]
44+
}
45+
bucketLifecycle: |
46+
{
47+
"Rules": [
48+
{
49+
"ID": "AbortIncompleteMultipartUploads",
50+
"Status": "Enabled",
51+
"Prefix": "",
52+
"AbortIncompleteMultipartUpload": {
53+
"DaysAfterInitiation": 1
54+
}
55+
},
56+
{
57+
"ID": "ExpireAfter30Days",
58+
"Status": "Enabled",
59+
"Prefix": "",
60+
"Expiration": {
61+
"Days": 30
62+
}
63+
}
64+
]
65+
}

‎fleet/lib/rook-ceph-conf/charts/ayekan/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/ayekan/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/ayekan/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/ayekan/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/ayekan/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)