Merge pull request ceph#24 from iamniting/prefix

bundle: rename the prefix from ocscsi to ceph-csi
Madhu-1 · Aug 21, 2024 · 40292ab · 40292ab
2 parents 3a3fae7 + fcf84f7
commit 40292ab
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 50 deletions.
diff --git a/Makefile.Downstream.mk b/Makefile.Downstream.mk
@@ -36,7 +36,7 @@ BUNDLE_CHANNELS := --channels=$(CHANNELS)
 OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk-$(OPERATOR_SDK_VERSION)
 OPERATOR_SDK_VERSION ?= 1.34.1
 
-NAME_PREFIX = ocscsi-
+NAME_PREFIX = ceph-csi-
 
 SERVICE_ACCOUNTS := \
 	$(NAME_PREFIX)cephfs-ctrlplugin-sa, \

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-cephconnection-viewer-role
+  name: ceph-csi-cephconnection-viewer-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-cephconnections-editor-role
+  name: ceph-csi-cephconnections-editor-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-clientprofile-viewer-role
+  name: ceph-csi-clientprofile-viewer-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-clientprofilemapping-editor-role
+  name: ceph-csi-clientprofilemapping-editor-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-clientprofilemapping-viewer-role
+  name: ceph-csi-clientprofilemapping-viewer-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-clientprofiles-editor-role
+  name: ceph-csi-clientprofiles-editor-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml b/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
     control-plane: controller-manager
-  name: ocscsi-controller-manager-metrics-service
+  name: ceph-csi-controller-manager-metrics-service
 spec:
   ports:
   - name: https

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-driver-editor-role
+  name: ceph-csi-driver-editor-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-driver-viewer-role
+  name: ceph-csi-driver-viewer-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-metrics-reader
+  name: ceph-csi-metrics-reader
 rules:
 - nonResourceURLs:
   - /metrics

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-operatorconfig-editor-role
+  name: ceph-csi-operatorconfig-editor-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml b/....authorization.k8s.io_v1_clusterrole.yaml → ....authorization.k8s.io_v1_clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: ceph-csi-operator
-  name: ocscsi-operatorconfig-viewer-role
+  name: ceph-csi-operatorconfig-viewer-role
 rules:
 - apiGroups:
   - csi.ceph.io

diff --git a/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml b/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2024-08-14T06:13:44Z"
+    createdAt: "2024-08-20T14:06:06Z"
     olm.skipRange: ""
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/operator-type: non-standalone
@@ -138,7 +138,7 @@ spec:
           verbs:
           - update
           - patch
-        serviceAccountName: ocscsi-cephfs-ctrlplugin-sa
+        serviceAccountName: ceph-csi-cephfs-ctrlplugin-sa
       - rules:
         - apiGroups:
           - ""
@@ -170,7 +170,7 @@ spec:
           - serviceaccounts/token
           verbs:
           - create
-        serviceAccountName: ocscsi-cephfs-nodeplugin-sa
+        serviceAccountName: ceph-csi-cephfs-nodeplugin-sa
       - rules:
         - apiGroups:
           - ""
@@ -340,7 +340,7 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: ocscsi-controller-manager
+        serviceAccountName: ceph-csi-controller-manager
       - rules:
         - apiGroups:
           - ""
@@ -469,15 +469,15 @@ spec:
           - volumeattachments/status
           verbs:
           - patch
-        serviceAccountName: ocscsi-nfs-ctrlplugin-sa
+        serviceAccountName: ceph-csi-nfs-ctrlplugin-sa
       - rules:
         - apiGroups:
           - ""
           resources:
           - nodes
           verbs:
           - get
-        serviceAccountName: ocscsi-nfs-nodeplugin-sa
+        serviceAccountName: ceph-csi-nfs-nodeplugin-sa
       - rules:
         - apiGroups:
           - ""
@@ -629,7 +629,7 @@ spec:
           - get
           - list
           - watch
-        serviceAccountName: ocscsi-rbd-ctrlplugin-sa
+        serviceAccountName: ceph-csi-rbd-ctrlplugin-sa
       - rules:
         - apiGroups:
           - ""
@@ -676,13 +676,13 @@ spec:
           - nodes
           verbs:
           - get
-        serviceAccountName: ocscsi-rbd-nodeplugin-sa
+        serviceAccountName: ceph-csi-rbd-nodeplugin-sa
       deployments:
       - label:
           app.kubernetes.io/managed-by: kustomize
           app.kubernetes.io/name: ceph-csi-operator
           control-plane: controller-manager
-        name: ocscsi-controller-manager
+        name: ceph-csi-controller-manager
         spec:
           replicas: 1
           selector:
@@ -732,7 +732,7 @@ spec:
                     fieldRef:
                       fieldPath: metadata.namespace
                 - name: CSI_SERVICE_ACCOUNT_PREFIX
-                  value: ocscsi-
+                  value: ceph-csi-
                 image: quay.io/ocs-dev/cephcsi-operator:latest
                 livenessProbe:
                   httpGet:
@@ -761,7 +761,7 @@ spec:
                     - ALL
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: ocscsi-controller-manager
+              serviceAccountName: ceph-csi-controller-manager
               terminationGracePeriodSeconds: 10
       permissions:
       - rules:
@@ -782,7 +782,7 @@ spec:
           - csiaddonsnodes
           verbs:
           - create
-        serviceAccountName: ocscsi-cephfs-ctrlplugin-sa
+        serviceAccountName: ceph-csi-cephfs-ctrlplugin-sa
       - rules:
         - apiGroups:
           - ""
@@ -815,7 +815,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: ocscsi-controller-manager
+        serviceAccountName: ceph-csi-controller-manager
       - rules:
         - apiGroups:
           - coordination.k8s.io
@@ -834,15 +834,15 @@ spec:
           - csiaddonsnodes
           verbs:
           - create
-        serviceAccountName: ocscsi-rbd-ctrlplugin-sa
+        serviceAccountName: ceph-csi-rbd-ctrlplugin-sa
       - rules:
         - apiGroups:
           - csiaddons.openshift.io
           resources:
           - csiaddonsnodes
           verbs:
           - create
-        serviceAccountName: ocscsi-rbd-nodeplugin-sa
+        serviceAccountName: ceph-csi-rbd-nodeplugin-sa
     strategy: deployment
   installModes:
   - supported: true

diff --git a/bundle/manifests/csi.ceph.io_clientprofilemappings.yaml b/bundle/manifests/csi.ceph.io_clientprofilemappings.yaml
@@ -40,31 +40,23 @@ spec:
           spec:
             description: ClientProfileMappingSpec defines the desired state of ClientProfileMapping
             properties:
-              blockPoolMapping:
+              mappings:
                 items:
-                  description: BlockPoolMappingSpec define a mapiing between a local
-                    and remote block pools
+                  description: MappingsSpec define a mapping between a local and remote
+                    profiles
                   properties:
-                    local:
-                      description: BlockPoolRefSpec identify a blockpool - client
-                        profile pair
-                      properties:
-                        clientProfileName:
+                    blockPoolIdMapping:
+                      items:
+                        items:
                           type: string
-                        poolId:
-                          minimum: 0
-                          type: integer
-                      type: object
-                    remote:
-                      description: BlockPoolRefSpec identify a blockpool - client
-                        profile pair
-                      properties:
-                        clientProfileName:
-                          type: string
-                        poolId:
-                          minimum: 0
-                          type: integer
-                      type: object
+                        maxItems: 2
+                        minItems: 2
+                        type: array
+                      type: array
+                    localClientProfile:
+                      type: string
+                    remoteClientProfile:
+                      type: string
                   type: object
                 type: array
             type: object