Skip to content

Commit 3695a76

Browse files
committed
remove minio, use rgw with ceph-bucket
1 parent daafaa1 commit 3695a76

File tree

13 files changed

+47
-261
lines changed

13 files changed

+47
-261
lines changed

kubernetes/main/apps/database/kustomization.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ resources:
77
# - ./cloudnative-pg/ks.yaml
88
- ./dragonfly/ks.yaml
99
# - ./emqx/ks.yaml
10-
- ./minio/ks.yaml
1110
# - ./pgadmin/ks.yaml

kubernetes/main/apps/database/minio/app/gatus.yaml

-35
This file was deleted.

kubernetes/main/apps/database/minio/app/helmrelease.yaml

-140
This file was deleted.

kubernetes/main/apps/database/minio/app/kustomization.yaml

-10
This file was deleted.

kubernetes/main/apps/database/minio/app/secret.sops.yaml

-30
This file was deleted.

kubernetes/main/apps/database/minio/ks.yaml

-25
This file was deleted.

kubernetes/main/apps/observability/loki/app/helmrelease.yaml

+26-16
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
chart:
1111
spec:
1212
chart: loki
13-
version: 6.6.1
13+
version: 6.6.3
1414
sourceRef:
1515
kind: HelmRepository
1616
name: grafana
@@ -28,35 +28,44 @@ spec:
2828
dependsOn:
2929
- name: openebs
3030
namespace: openebs-system
31-
- name: minio
32-
namespace: database
31+
- name: rook-ceph-cluster
32+
namespace: rook-ceph
3333
- name: vector-agent
3434
namespace: observability
3535
- name: vector-aggregator
3636
namespace: observability
3737
valuesFrom:
38+
- targetPath: loki.storage.bucketNames.chunks
39+
kind: ConfigMap
40+
name: &cephBucket loki-bucket
41+
valuesKey: BUCKET_NAME
42+
- targetPath: loki.storage.s3.endpoint
43+
kind: ConfigMap
44+
name: *cephBucket
45+
valuesKey: BUCKET_HOST
46+
- targetPath: loki.storage.s3.region
47+
kind: ConfigMap
48+
name: *cephBucket
49+
valuesKey: BUCKET_REGION
3850
- targetPath: loki.storage.s3.accessKeyId
3951
kind: Secret
40-
name: &minioSecret minio-secret
41-
valuesKey: MINIO_ROOT_USER
52+
name: *cephBucket
53+
valuesKey: AWS_ACCESS_KEY_ID
4254
- targetPath: loki.storage.s3.secretAccessKey
4355
kind: Secret
44-
name: *minioSecret
45-
valuesKey: MINIO_ROOT_PASSWORD
56+
name: *cephBucket
57+
valuesKey: AWS_SECRET_ACCESS_KEY
4658
values:
4759
deploymentMode: SimpleScalable
4860
loki:
4961
podAnnotations:
50-
configmap.reloader.stakater.com/reload: *minioSecret
51-
secret.reloader.stakater.com/reload: *minioSecret
62+
configmap.reloader.stakater.com/reload: *cephBucket
63+
secret.reloader.stakater.com/reload: *cephBucket
5264
ingester:
5365
chunk_encoding: snappy
5466
storage:
5567
type: s3
56-
bucketNames:
57-
chunks: loki
5868
s3:
59-
endpoint: minio.database.svc.cluster.local:9000
6069
s3ForcePathStyle: true
6170
insecure: true
6271
schemaConfig:
@@ -104,12 +113,12 @@ spec:
104113
analytics:
105114
reporting_enabled: false
106115
backend:
107-
replicas: 1
116+
replicas: 2
108117
persistence:
109118
size: 20Gi
110119
storageClass: openebs-hostpath
111120
gateway:
112-
replicas: 1
121+
replicas: 2
113122
image:
114123
registry: ghcr.io
115124
ingress:
@@ -120,10 +129,11 @@ spec:
120129
paths:
121130
- path: /
122131
pathType: Prefix
132+
tls: []
123133
read:
124-
replicas: 1
134+
replicas: 2
125135
write:
126-
replicas: 1
136+
replicas: 2
127137
persistence:
128138
size: 20Gi
129139
storageClass: openebs-hostpath

kubernetes/main/apps/observability/loki/app/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
resources:
6+
- ./objectbucketclaim.yaml
67
- ./helmrelease.yaml
7-
- ../../../database/minio/app/secret.sops.yaml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/objectbucket.io/objectbucketclaim_v1alpha1.json
3+
apiVersion: objectbucket.io/v1alpha1
4+
kind: ObjectBucketClaim
5+
metadata:
6+
name: loki-bucket
7+
spec:
8+
bucketName: loki
9+
storageClassName: ceph-bucket

kubernetes/main/apps/observability/loki/ks.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ spec:
1010
commonMetadata:
1111
labels:
1212
app.kubernetes.io/name: *app
13-
dependsOn:
14-
- name: minio
1513
path: ./kubernetes/main/apps/observability/loki/app
1614
prune: true
1715
sourceRef:

kubernetes/main/apps/system-upgrade/system-upgrade-controller/plans/talos-i915.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: upgrade.cattle.io/v1
44
kind: Plan
55
metadata:
6-
name: talos
6+
name: talos-i915
77
spec:
88
version: ${TALOS_VERSION}
99
serviceAccountName: system-upgrade
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
apiVersion: source.toolkit.fluxcd.io/v1
3+
kind: HelmRepository
4+
metadata:
5+
name: kubernetes-dashboard
6+
namespace: flux-system
7+
spec:
8+
interval: 1h
9+
url: https://kubernetes.github.io/dashboard/

kubernetes/main/flux/repositories/helm/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ resources:
1616
- ./jetstack.yaml
1717
- ./k8s-gateway.yaml
1818
- ./k8tz.yaml
19+
- ./kubernetes-dashboard.yaml
1920
- ./metrics-server.yaml
2021
- ./node-feature-discovery.yaml
2122
- ./openebs.yaml

0 commit comments

Comments
 (0)