fix: switch new new rgw ingress

joryirving · Feb 13, 2024 · 8663c2b · 8663c2b
1 parent 720764d
commit 8663c2b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 57 deletions.
diff --git a/kubernetes/pi/apps/observability/kube-prometheus-stack/app/externalsecret.yaml b/kubernetes/pi/apps/observability/kube-prometheus-stack/app/externalsecret.yaml
@@ -17,7 +17,7 @@ spec:
           config:
             access_key: {{ .AWS_ACCESS_KEY_ID }}
             bucket: thanos
-            endpoint: rook-ceph-rgw.${PRIMARY_DOMAIN}
+            endpoint: rgw.${PRIMARY_DOMAIN}
             insecure: true
             region: ""
             secret_key: {{ .AWS_SECRET_ACCESS_KEY }}

diff --git a/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/cephobjectstoreuser.yaml b/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/cephobjectstoreuser.yaml
@@ -0,0 +1,10 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/ceph.rook.io/cephobjectstoreuser_v1.json
+apiVersion: ceph.rook.io/v1
+kind: CephObjectStoreUser
+metadata:
+  name: cluster-admin
+spec:
+  # Ref: https://rook.io/docs/rook/v1.13/Storage-Configuration/Object-Storage-RGW/object-storage/
+  store: ceph-objectstore
+  displayName: Cluster Admin
diff --git a/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
@@ -69,7 +69,7 @@ spec:
             memory: 1Gi
         osd:
           requests:
-            cpu: 500m
+            cpu: 400m
             memory: 2Gi
           limits:
             memory: 6Gi
@@ -111,7 +111,7 @@ spec:
             requiredDuringSchedulingIgnoredDuringExecution:
               nodeSelectorTerms:
                 - matchExpressions:
-                    - key: node-role.kubernetes.io/control-plane
+                    - key: node-role.kubernetes.io/worker
                       operator: Exists
         mon: *placement
     cephBlockPools:

diff --git a/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml b/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml
@@ -3,5 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ./cephobjectstoreuser.yaml
   - ./helmrelease.yaml
-  - ./rgw-external.yaml
diff --git a/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/rgw-external.yaml b/kubernetes/teyvat/apps/rook-ceph/rook-ceph/cluster/rgw-external.yaml