Merge pull request red-hat-storage#352 from kshlm/disable-rook-csi-sn…

…apshotter deploy: Disable csi-snapshotter in Rook deployment
pdvian · Dec 3, 2019 · 35364ff · 35364ff
2 parents 3410692 + f6b38ed
commit 35364ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml b/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml
@@ -1016,6 +1016,8 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
+                - name: CSI_ENABLE_SNAPSHOTTER
+                  value: "false"
                 image: rook/ceph:v1.1.4-27.gf20c056
                 name: rook-ceph-operator
                 resources: {}

diff --git a/hack/latest-csv-checksum.md5 b/hack/latest-csv-checksum.md5
@@ -1 +1 @@
-822e621c165f0e9fdb87b3acb030acbd
+b8b9747bc624034a9f72d933ace56aaa
diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go
@@ -278,6 +278,10 @@ func unmarshalStrategySpec(csv *csvv1.ClusterServiceVersion) *csvStrategySpec {
 					},
 				},
 			},
+			{
+				Name:  "CSI_ENABLE_SNAPSHOTTER",
+				Value: "false",
+			},
 		}
 
 		if *rookCsiCephImage != "" {