Add generic CSI driver operator controller

CSIDriverObserver checks Infracstructure CRD for the underlying cloud and starts corresponding CSIDriverOperatorController(s). CSIDriverOperatorController installs one CSI driver operator.
openshift · Jul 24, 2020 · e52266c · e52266c
1 parent 8159f89
commit e52266c
Show file tree

Hide file tree

Showing 1,228 changed files with 84,162 additions and 25,808 deletions.
diff --git a/go.mod b/go.mod
@@ -1,26 +1,23 @@
 module github.com/openshift/cluster-storage-operator
 
-go 1.13
+go 1.14
 
 require (
-	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/google/go-cmp v0.4.0
-	github.com/googleapis/gnostic v0.3.1 // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/openshift/api v0.0.0-20200623075207-eb651a5bb0ad
-	github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc
-	github.com/openshift/client-go v0.0.0-20200623090625-83993cebb5ae
-	github.com/openshift/library-go v0.0.0-20200423084921-517634e0a772
-	github.com/prometheus/client_golang v1.4.1
-	github.com/spf13/cobra v0.0.6
+	github.com/openshift/api v0.0.0-20200723113038-c1d9554393d6
+	github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7
+	github.com/openshift/client-go v0.0.0-20200723130357-94e1065ab1f8
+	github.com/openshift/library-go v0.0.0-20200723110847-d4f7abc3872e
+	github.com/prometheus/client_golang v1.7.1
+	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
-	google.golang.org/genproto v0.0.0-20191220175831-5c49e3ecc1c1 // indirect
-	k8s.io/api v0.18.4
-	k8s.io/apiextensions-apiserver v0.18.2
-	k8s.io/apimachinery v0.18.4
-	k8s.io/client-go v0.18.3
-	k8s.io/code-generator v0.18.3
-	k8s.io/component-base v0.18.2
+	k8s.io/api v0.19.0-rc.2
+	k8s.io/apiextensions-apiserver v0.19.0-rc.2
+	k8s.io/apimachinery v0.19.0-rc.2
+	k8s.io/client-go v0.19.0-rc.2
+	k8s.io/code-generator v0.19.0-rc.2
+	k8s.io/component-base v0.19.0-rc.2
+	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.3.0
 )
diff --git a/go.sum b/go.sum
diff --git a/manifests/00-namespace.yaml → manifests/00-operator-namespace.yaml b/manifests/00-namespace.yaml → manifests/00-operator-namespace.yaml
diff --git a/manifests/01_crd.yaml → manifests/01_crd_operator.yaml b/manifests/01_crd.yaml → manifests/01_crd_operator.yaml
diff --git a/manifests/02_operator_cr.yaml b/manifests/02_operator_cr.yaml
@@ -6,3 +6,4 @@ metadata:
     release.openshift.io/create-only: "true"
 spec:
   managementState: Managed
+  logLevel: Normal
diff --git a/manifests/04-deployment.yaml b/manifests/04-deployment.yaml
@@ -31,7 +31,7 @@ spec:
       serviceAccountName: cluster-storage-operator
       containers:
         - name: cluster-storage-operator
-          image: openshift/origin-cluster-storage-operator:latest
+          image: quay.io/openshift/origin-cluster-storage-operator:latest
           terminationMessagePolicy: FallbackToLogsOnError
           ports:
           - containerPort: 60000
@@ -43,6 +43,24 @@ spec:
           env:
           - name: OPERATOR_IMAGE_VERSION
             value: "0.0.1-snapshot"
+          - name: OPERAND_IMAGE_VERSION
+            value: "0.0.1-snapshot"
+          - name: RELATED_IMAGE_AWS_EBS_DRIVER_OPERATOR
+            value: quay.io/openshift/origin-aws-ebs-csi-driver-operator:latest
+          - name: RELATED_IMAGE_AWS_EBS_DRIVER
+            value: quay.io/openshift/origin-aws-ebs-csi-driver:latest
+          - name: RELATED_IMAGE_PROVISIONER
+            value: quay.io/openshift/origin-csi-external-provisioner:latest
+          - name: RELATED_IMAGE_ATTACHER
+            value: quay.io/openshift/origin-csi-external-attacher:latest
+          - name: RELATED_IMAGE_RESIZER
+            value: quay.io/openshift/origin-csi-external-resizer:latest
+          - name: RELATED_IMAGE_SNAPSHOTTER
+            value: quay.io/openshift/origin-csi-external-snapshotter:latest
+          - name: RELATED_IMAGE_NODE_DRIVER_REGISTRAR
+            value: quay.io/openshift/origin-csi-node-driver-registrar:latest
+          - name: RELATED_IMAGE_LIVENESS_PROBE
+            value: quay.io/openshift/origin-csi-livenessprobe:latest
           resources:
             requests:
               cpu: 10m

diff --git a/manifests/05-cluster-operator.yaml b/manifests/05-cluster-operator.yaml
@@ -2,6 +2,8 @@ apiVersion: config.openshift.io/v1
 kind: ClusterOperator
 metadata:
   name: storage
+spec:
+  managementState: Managed
 status:
   versions:
   - name: operator

diff --git a/manifests/image-references b/manifests/image-references
@@ -6,3 +6,35 @@ spec:
     from:
       kind: DockerImage
       name: openshift/origin-cluster-storage-operator:latest
+  - name: aws-ebs-csi-driver-operator
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-aws-ebs-csi-driver-operator:latest
+  - name: aws-ebs-csi-driver
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-aws-ebs-csi-driver:latest
+  - name: csi-external-provisioner
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-csi-external-provisioner:latest
+  - name: csi-external-attacher
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-csi-external-attacher:latest
+  - name: csi-external-resizer
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-csi-external-resizer:latest
+  - name: csi-external-snapshotter
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-csi-external-snapshotter:latest
+  - name: csi-node-driver-registrar
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-csi-node-driver-registrar:latest
+  - name: csi-livenessprobe
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-csi-livenessprobe:latest