Skip to content

Commit 2296eeb

Browse files
authored
Merge pull request #962 from lsst-it/IT-6059_osuser_osclaim_loki_kueyen
(kueyen) normalize objectstoreuser, objectstoreclaim for loki
2 parents f04c217 + f363ff8 commit 2296eeb

File tree

7 files changed

+161
-133
lines changed

7 files changed

+161
-133
lines changed

fleet/lib/rook-ceph-conf/charts/kueyen/templates/cephobjectstore-o11y.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,13 @@ spec:
5757
name: rook-ceph-rgw-o11y
5858
port:
5959
number: 80
60+
---
61+
apiVersion: storage.k8s.io/v1
62+
kind: StorageClass
63+
metadata:
64+
name: o11y
65+
provisioner: rook-ceph.ceph.rook.io/bucket
66+
parameters:
67+
objectStoreName: o11y
68+
objectStoreNamespace: rook-ceph
69+
reclaimPolicy: Retain
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
apiVersion: ceph.rook.io/v1
3+
kind: CephObjectStoreUser
4+
metadata:
5+
name: s3-loki
6+
namespace: rook-ceph
7+
spec:
8+
store: o11y
9+
clusterNamespace: rook-ceph
10+
quotas:
11+
maxBuckets: 3
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
apiVersion: objectbucket.io/v1alpha1
3+
kind: ObjectBucketClaim
4+
metadata:
5+
name: logs-admin
6+
namespace: rook-ceph
7+
spec:
8+
bucketName: logs-admin
9+
storageClassName: o11y
10+
additionalConfig:
11+
bucketOwner: s3-loki
12+
bucketMaxSize: 5Ti
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/s3-loki"
22+
},
23+
"Action": [
24+
"s3:ListBucket",
25+
"s3:GetObject",
26+
"s3:GetObjectVersion"
27+
],
28+
"Resource": [
29+
"arn:aws:s3:::logs-admin",
30+
"arn:aws:s3:::logs-admin/*"
31+
]
32+
}
33+
]
34+
}
35+
bucketLifecycle: |
36+
{
37+
"Rules": [
38+
{
39+
"ID": "AbortIncompleteMultipartUploads",
40+
"Status": "Enabled",
41+
"Prefix": "",
42+
"AbortIncompleteMultipartUpload": {
43+
"DaysAfterInitiation": 1
44+
}
45+
}
46+
]
47+
}
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
apiVersion: objectbucket.io/v1alpha1
2+
kind: ObjectBucketClaim
3+
metadata:
4+
name: logs-chunks
5+
namespace: rook-ceph
6+
spec:
7+
bucketName: logs-chunks
8+
storageClassName: o11y
9+
additionalConfig:
10+
bucketOwner: s3-loki
11+
bucketMaxSize: 5Ti
12+
bucketPolicy: |
13+
{
14+
"Version": "2012-10-17",
15+
"Statement": [
16+
{
17+
"Sid": "AllowReadAccess",
18+
"Effect": "Allow",
19+
"Principal": {
20+
"AWS": "arn:aws:iam:::user/s3-loki"
21+
},
22+
"Action": [
23+
"s3:ListBucket",
24+
"s3:GetObject",
25+
"s3:GetObjectVersion"
26+
],
27+
"Resource": [
28+
"arn:aws:s3:::logs-chunks",
29+
"arn:aws:s3:::logs-chunks/*"
30+
]
31+
}
32+
]
33+
}
34+
bucketLifecycle: |
35+
{
36+
"Rules": [
37+
{
38+
"ID": "AbortIncompleteMultipartUploads",
39+
"Status": "Enabled",
40+
"Prefix": "",
41+
"AbortIncompleteMultipartUpload": {
42+
"DaysAfterInitiation": 1
43+
}
44+
}
45+
]
46+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
apiVersion: objectbucket.io/v1alpha1
3+
kind: ObjectBucketClaim
4+
metadata:
5+
name: logs-ruler
6+
namespace: rook-ceph
7+
spec:
8+
bucketName: logs-ruler
9+
storageClassName: o11y
10+
additionalConfig:
11+
bucketOwner: s3-loki
12+
bucketMaxSize: 5Ti
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/s3-loki"
22+
},
23+
"Action": [
24+
"s3:ListBucket",
25+
"s3:GetObject",
26+
"s3:GetObjectVersion"
27+
],
28+
"Resource": [
29+
"arn:aws:s3:::logs-ruler",
30+
"arn:aws:s3:::logs-ruler/*"
31+
]
32+
}
33+
]
34+
}
35+
bucketLifecycle: |
36+
{
37+
"Rules": [
38+
{
39+
"ID": "AbortIncompleteMultipartUploads",
40+
"Status": "Enabled",
41+
"Prefix": "",
42+
"AbortIncompleteMultipartUpload": {
43+
"DaysAfterInitiation": 1
44+
}
45+
}
46+
]
47+
}

fleet/lib/rook-ceph-conf/charts/kueyen/templates/obc-loki.yaml

Lines changed: 0 additions & 98 deletions
This file was deleted.

fleet/lib/rook-ceph-conf/charts/kueyen/templates/objectstoreuser-loki.yaml

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)