Skip to content

Commit f4aa1b7

Browse files
jhoblittjhoblitt
committed
WIP (fleet/mimir) replace mimir-pre bundle with kustomize
+ manage mimir s3 buckets with obc
1 parent d2bf838 commit f4aa1b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+418
-292
lines changed

‎fleet/lib/mimir-pre/externalsecret-mimir-s3.yaml‎

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

‎fleet/lib/mimir-pre/fleet.yaml‎

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

‎fleet/lib/mimir/fleet.yaml‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
2-
# XXX automate provisioning of buckets and rgw user
32
defaultNamespace: &name mimir
43
labels:
54
bundle: *name
65
namespaceLabels:
76
lsst.io/discover: "true"
7+
kustomize:
8+
dir: kustomize/base
89
helm:
910
chart: &chart mimir-distributed
1011
releaseName: *chart
@@ -17,24 +18,47 @@ helm:
1718
dependsOn:
1819
- selector:
1920
matchLabels:
20-
bundle: mimir-pre
21+
bundle: rook-ceph
2122
- selector:
2223
matchLabels:
2324
bundle: prometheus-operator-crds
2425
targetCustomizations:
25-
- name: rke2
26+
- name: antu
27+
clusterSelector:
28+
matchExpressions:
29+
- key: management.cattle.io/cluster-display-name
30+
operator: In
31+
values:
32+
- antu
33+
kustomize:
34+
dir: kustomize/overlays/antu
35+
- name: kona
2636
clusterSelector:
2737
matchExpressions:
2838
- key: management.cattle.io/cluster-display-name
2939
operator: In
3040
values:
31-
- ruka
32-
- kueyen
33-
- pillan
3441
- kona
35-
helm:
36-
valuesFiles:
37-
- overlays/rke2/values.yaml
42+
kustomize:
43+
dir: kustomize/overlays/ruka
44+
- name: kueyen
45+
clusterSelector:
46+
matchExpressions:
47+
- key: management.cattle.io/cluster-display-name
48+
operator: In
49+
values:
50+
- kueyen
51+
kustomize:
52+
dir: kustomize/overlays/kueyen
53+
- name: ruka
54+
clusterSelector:
55+
matchExpressions:
56+
- key: management.cattle.io/cluster-display-name
57+
operator: In
58+
values:
59+
- ruka
60+
kustomize:
61+
dir: kustomize/overlays/kueyen
3862
- name: pillan
3963
clusterSelector:
4064
matchExpressions:
@@ -45,3 +69,5 @@ targetCustomizations:
4569
helm:
4670
valuesFiles:
4771
- overlays/pillan/values.yaml
72+
kustomize:
73+
dir: kustomize/overlays/pillan

‎fleet/lib/mimir/kustomize/base/cephobjectstoreuser-mimir.yaml‎

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: mimir
6+
spec:
7+
store: o11y
8+
clusterNamespace: rook-ceph
9+
displayName: mimir
10+
quotas:
11+
maxBuckets: 4

‎fleet/lib/mimir/kustomize/base/kustomization.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
resources:
3+
- cephobjectstoreuser-mimir.yaml
4+
- obc-mimir-alertmanager.yaml
5+
- obc-mimir-blocks.yaml
6+
- obc-mimir-ruler.yaml
7+
- obc-mimir.yaml

‎fleet/lib/mimir/kustomize/base/obc-mimir-alertmanager.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
apiVersion: objectbucket.io/v1alpha1
3+
kind: ObjectBucketClaim
4+
metadata:
5+
name: mimir-alertmanager
6+
spec:
7+
bucketName: mimir-alertmanager
8+
storageClassName: o11y
9+
additionalConfig:
10+
bucketOwner: mimir
11+
bucketLifecycle: |
12+
{
13+
"Rules": [
14+
{
15+
"ID": "AbortIncompleteMultipartUploads",
16+
"Status": "Enabled",
17+
"Prefix": "",
18+
"AbortIncompleteMultipartUpload": {
19+
"DaysAfterInitiation": 1
20+
}
21+
}
22+
]
23+
}

‎fleet/lib/mimir/kustomize/base/obc-mimir-blocks.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
apiVersion: objectbucket.io/v1alpha1
3+
kind: ObjectBucketClaim
4+
metadata:
5+
name: mimir-blocks
6+
spec:
7+
bucketName: mimir-blocks
8+
storageClassName: o11y
9+
additionalConfig:
10+
bucketOwner: mimir
11+
bucketLifecycle: |
12+
{
13+
"Rules": [
14+
{
15+
"ID": "AbortIncompleteMultipartUploads",
16+
"Status": "Enabled",
17+
"Prefix": "",
18+
"AbortIncompleteMultipartUpload": {
19+
"DaysAfterInitiation": 1
20+
}
21+
}
22+
]
23+
}

‎fleet/lib/mimir/kustomize/base/obc-mimir-ruler.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
apiVersion: objectbucket.io/v1alpha1
3+
kind: ObjectBucketClaim
4+
metadata:
5+
name: mimir-ruler
6+
spec:
7+
bucketName: mimir-ruler
8+
storageClassName: o11y
9+
additionalConfig:
10+
bucketOwner: mimir
11+
bucketLifecycle: |
12+
{
13+
"Rules": [
14+
{
15+
"ID": "AbortIncompleteMultipartUploads",
16+
"Status": "Enabled",
17+
"Prefix": "",
18+
"AbortIncompleteMultipartUpload": {
19+
"DaysAfterInitiation": 1
20+
}
21+
}
22+
]
23+
}

‎fleet/lib/mimir/kustomize/base/obc-mimir.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
apiVersion: objectbucket.io/v1alpha1
3+
kind: ObjectBucketClaim
4+
metadata:
5+
name: mimir
6+
spec:
7+
bucketName: mimir
8+
storageClassName: o11y
9+
additionalConfig:
10+
bucketOwner: mimir
11+
bucketLifecycle: |
12+
{
13+
"Rules": [
14+
{
15+
"ID": "AbortIncompleteMultipartUploads",
16+
"Status": "Enabled",
17+
"Prefix": "",
18+
"AbortIncompleteMultipartUpload": {
19+
"DaysAfterInitiation": 1
20+
}
21+
}
22+
]
23+
}

‎fleet/lib/mimir/kustomize/overlays/antu/kustomization.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
resources:
3+
- ../../base
4+
patches:
5+
- path: obc-mimir-alertmanager.yaml
6+
- path: obc-mimir-blocks.yaml
7+
- path: obc-mimir-ruler.yaml
8+
- path: obc-mimir.yaml

0 commit comments

Comments
 (0)