Merge pull request #275 from shiftstack/add-cinder-csi

OSASINFRA-3618: Add Cinder CSI support (part 2)

Dockerfile.openstack-cinder

@@ -1,10 +1,10 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
-WORKDIR /go/src/github.com/openshift/openstack-cinder-csi-driver-operator
-COPY legacy/openstack-cinder-csi-driver-operator .
+WORKDIR /go/src/github.com/openshift/csi-operator
+COPY . .
 RUN make
 
 FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
-COPY --from=builder /go/src/github.com/openshift/openstack-cinder-csi-driver-operator/openstack-cinder-csi-driver-operator /usr/bin/
+COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/openstack-cinder-csi-driver-operator /usr/bin/
 ENTRYPOINT ["/usr/bin/openstack-cinder-csi-driver-operator"]
 LABEL io.k8s.display-name="OpenShift OpenStack Cinder CSI Driver Operator" \
 	io.k8s.description="The OpenStack Cinder CSI Driver Operator installs and maintains the OpenStack Cinder CSI Driver on a cluster."

README.md

@@ -10,6 +10,7 @@ Lifecycle Manager (OLM).
 * aws-efs-csi-driver-operator
 * azure-disk-csi-driver-operator
 * azure-file-csi-driver-operator
+* openstack-cinder-csi-driver-operator
 * smb-csi-driver-operator
 
 ## Automatic generation of CSI driver assets
@@ -37,7 +38,7 @@ Good starting points are `pkg/generator` and `pkg/generated-assets`.
 ### AWS EBS CSI driver operator
 
 Before running the operator manually, you must remove the operator installed by
-CSO/CVO
+CSO/CVO:
 
 ```shell
 # Scale down CVO and CSO

assets/base/node.yaml

@@ -16,8 +16,8 @@ spec:
       annotations:
         # This annotation allows the workload pinning feature to work when clusters are configured for it.
         # An admission webhook will look for this annotation when Pod admission occurs to modify the
-        # memory and cpu resources to a custom resource name that the schedular will use to correctly 
-        # assign Pods in a workload pinned cluster. This annotation will be stripped from Pods when 
+        # memory and cpu resources to a custom resource name that the schedular will use to correctly
+        # assign Pods in a workload pinned cluster. This annotation will be stripped from Pods when
         # the cluster is not configured for workload pinning.
         # See (openshift/enhancements#1213) for more info.
         target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'

assets/overlays/openstack-cinder/base/csidriver.yaml

@@ -0,0 +1,16 @@
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: cinder.csi.openstack.org
+  annotations:
+      # This CSIDriver is managed by an OCP CSI operator
+      csi.openshift.io/managed: "true"
+spec:
+  attachRequired: true
+  podInfoOnMount: true
+  fsGroupPolicy: File
+  requiresRepublish: false
+  storageCapacity: false
+  seLinuxMount: true
+  volumeLifecycleModes:
+    - Persistent

assets/overlays/openstack-cinder/base/storageclass.yaml

@@ -0,0 +1,10 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: standard-csi
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "true"
+provisioner: cinder.csi.openstack.org
+reclaimPolicy: "Delete"
+volumeBindingMode: WaitForFirstConsumer
+allowVolumeExpansion: true

assets/overlays/openstack-cinder/base/volumesnapshotclass.yaml

@@ -0,0 +1,10 @@
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: standard-csi
+  annotations:
+    snapshot.storage.kubernetes.io/is-default-class: "true"
+driver: cinder.csi.openstack.org
+deletionPolicy: Delete
+parameters:
+  force-create: "false"

assets/overlays/openstack-cinder/generated/standalone/cabundle_cm.yaml

@@ -0,0 +1,13 @@
+# Generated file. Do not edit. Update using "make update".
+#
+# Loaded from base/cabundle_cm.yaml
+#
+#
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    config.openshift.io/inject-trusted-cabundle: "true"
+  name: openstack-cinder-csi-driver-trusted-ca-bundle
+  namespace: ${NAMESPACE}