commit cfa4d5ae33f800681d2a0f275f42966c1df44dc6
parent 61dd92758556ec1ae2e83067e3acc637e36fad77
Author: MTRNord <mtrnord1@gmail.com>
Date: Sun, 16 Apr 2023 23:21:23 +0200
fix conflicts on cluster
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/base/rook/filesystem.yaml b/apps/base/rook/filesystem.yaml
@@ -2,7 +2,7 @@
apiVersion: ceph.rook.io/v1
kind: CephCluster
metadata:
- name: rook-ceph
+ name: main-fs-cluster
namespace: rook-ceph # namespace:cluster
spec:
cephVersion:
@@ -471,7 +471,7 @@ spec:
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
- name: rook-cephfs
+ name: rook-main-fs
namespace: rook-cephfs
# Change "rook-ceph" provisioner prefix to match the operator namespace if needed
provisioner: rook-ceph.cephfs.csi.ceph.com # driver:namespace:operator
@@ -509,7 +509,7 @@ mountOptions: []
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
- name: rook-ceph-mgr-dashboard
+ name: rook-main-fs-mgr-dashboard
namespace: rook-ceph
annotations:
traefik.ingress.kubernetes.io/router.middlewares: traefik-ingress-sso@kubernetescrd