Merge pull request #127 from Elbehery/update_csi_operator_manifest_re…

…adme

Bug 1960732: update manifest and readme

Dockerfile

@@ -5,7 +5,6 @@ RUN make
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 COPY --from=builder /go/src/github.com/openshift/aws-ebs-csi-driver-operator/aws-ebs-csi-driver-operator /usr/bin/
-COPY manifests /manifests
 ENTRYPOINT ["/usr/bin/aws-ebs-csi-driver-operator"]
 LABEL io.k8s.display-name="OpenShift AWS EBS CSI Driver Operator" \
 	io.k8s.description="The AWS EBS CSI Driver Operator installs and maintains the AWS EBS CSI Driver on a cluster."

Dockerfile.rhel7

@@ -5,7 +5,6 @@ RUN make
 
 FROM registry.ci.openshift.org/ocp/4.8:base
 COPY --from=builder /go/src/github.com/openshift/aws-ebs-csi-driver-operator/aws-ebs-csi-driver-operator /usr/bin/
-COPY manifests /manifests
 ENTRYPOINT ["/usr/bin/aws-ebs-csi-driver-operator"]
 LABEL io.k8s.display-name="OpenShift AWS EBS CSI Driver Operator" \
 	io.k8s.description="The AWS EBS CSI Driver Operator installs and maintains the AWS EBS CSI Driver on a cluster."

README.md

@@ -4,15 +4,26 @@ An operator to deploy the [AWS EBS CSI driver](https://github.com/openshift/aws-
 
 This operator is installed by the [cluster-storage-operator](https://github.com/openshift/cluster-storage-operator).
 
+#### Note: authoritative YAML files to deploy the driver are in github.com/openshift/cluster-storage-operator/tree/master/assets/csidriveroperators/aws-ebs
+
 # Quick start
 
+Before running the operator manually, you must remove the operator installed by CSO/CVO
+
+```shell
+# Scale down CVO and CSO
+oc scale --replicas=0 deploy/cluster-version-operator -n openshift-cluster-version
+oc scale --replicas=0 deploy/cluster-storage-operator -n openshift-cluster-storage-operator
+
+# Delete operator resources (daemonset, deployments)
+oc -n openshift-cluster-csi-drivers delete deployment.apps/aws-ebs-csi-driver-operator deployment.apps/aws-ebs-csi-driver-controller daemonset.apps/aws-ebs-csi-driver-node
+```
+
 To build and run the operator locally:
 
 ```shell
 # Create only the resources the operator needs to run via CLI
-oc apply -f manifests/00_crd.yaml
-oc apply -f manifests/01_namespace.yaml
-oc apply -f manifests/08_cr.yaml
+oc apply -f https://raw.githubusercontent.com/openshift/cluster-storage-operator/master/assets/csidriveroperators/aws-ebs/10_cr.yaml
 
 # Build the operator
 make
@@ -25,23 +36,9 @@ export RESIZER_IMAGE=quay.io/openshift/origin-csi-external-resizer:latest
 export SNAPSHOTTER_IMAGE=quay.io/openshift/origin-csi-external-snapshotter:latest
 export NODE_DRIVER_REGISTRAR_IMAGE=quay.io/openshift/origin-csi-node-driver-registrar:latest
 export LIVENESS_PROBE_IMAGE=quay.io/openshift/origin-csi-livenessprobe:latest
+export KUBE_RBAC_PROXY_IMAGE=quay.io/openshift/origin-kube-rbac-proxy:latest
 
 # Run the operator via CLI
 ./aws-ebs-csi-driver-operator start --kubeconfig $MY_KUBECONFIG --namespace openshift-cluster-csi-drivers
 ```
 
-To run the latest build of the operator:
-
-```shell
-# Set the environment variables
-export DRIVER_IMAGE=quay.io/openshift/origin-aws-ebs-csi-driver:latest
-export PROVISIONER_IMAGE=quay.io/openshift/origin-csi-external-provisioner:latest
-export ATTACHER_IMAGE=quay.io/openshift/origin-csi-external-attacher:latest
-export RESIZER_IMAGE=quay.io/openshift/origin-csi-external-resizer:latest
-export SNAPSHOTTER_IMAGE=quay.io/openshift/origin-csi-external-snapshotter:latest
-export NODE_DRIVER_REGISTRAR_IMAGE=quay.io/openshift/origin-csi-node-driver-registrar:latest
-export LIVENESS_PROBE_IMAGE=quay.io/openshift/origin-csi-livenessprobe:latest
-
-# Deploy the operator and everything it needs
-oc apply -f manifests/
-```