Resolve merge conflicts

datastax · Aug 25, 2020 · c3786ab · c3786ab
2 parents 592761e + 46b075a
commit c3786ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/operator/.osdk-scorecard.yaml b/operator/.osdk-scorecard.yaml
@@ -6,9 +6,9 @@ scorecard:
     - basic:
         cr-manifest:
           - "example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml"
-    # - basic:
-    #     cr-manifest:
-    #       - "example-cassdc-yaml/dse-6.8.x/example-cassdc-scorecard.yaml"
+    - basic:
+        cr-manifest:
+          - "example-cassdc-yaml/dse-6.8.x/example-cassdc-scorecard.yaml"
 
     # # v1.0.0
     # - olm:
@@ -17,7 +17,7 @@ scorecard:
     #     csv-path: "deploy/olm-catalog/cass-operator/1.0.0/cass-operator.v1.0.0.clusterserviceversion.yaml"
     # - olm:
     #     cr-manifest:
-    #       - "example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml"
+    #       - "example-cassdc-yaml/dse-6.8.x/example-cassdc-scorecard.yaml"
     #     csv-path: "deploy/olm-catalog/cass-operator/1.0.0/cass-operator.v1.0.0.clusterserviceversion.yaml"
 
     # # v1.1.0
@@ -27,7 +27,7 @@ scorecard:
     #     csv-path: "deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml"
     # - olm:
     #     cr-manifest:
-    #       - "example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml"
+    #       - "example-cassdc-yaml/dse-6.8.x/example-cassdc-scorecard.yaml"
     #     csv-path: "deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml"
 
     # v1.2.0
@@ -37,16 +37,15 @@ scorecard:
     #     csv-path: "deploy/olm-catalog/cass-operator/1.2.0/cass-operator.v1.2.0.clusterserviceversion.yaml"
     # - olm:
     #     cr-manifest:
-    #       - "example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml"
+    #       - "example-cassdc-yaml/dse-6.8.x/example-cassdc-scorecard.yaml"
     #     csv-path: "deploy/olm-catalog/cass-operator/1.2.0/cass-operator.v1.2.0.clusterserviceversion.yaml"
 
     # v1.3.0
-    # - olm:
-    #     cr-manifest:
-    #       - "example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml"
-    #     csv-path: "deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml"
-    # - olm:
-    #     cr-manifest:
-    #       - "example-cassdc-yaml/dse-6.8.x/example-cassdc-scorecard.yaml"
-    #     csv-path: "deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml"
-
+    - olm:
+        cr-manifest:
+          - "example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml"
+        csv-path: "deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml"
+    - olm:
+        cr-manifest:
+          - "example-cassdc-yaml/dse-6.8.x/example-cassdc-scorecard.yaml"
+        csv-path: "deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml"
diff --git a/...or/deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml b/...or/deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml
@@ -20,6 +20,7 @@ spec:
   customresourcedefinitions:
     owned:
     - name: cassandradatacenters.cassandra.datastax.com
+      displayName: Cassandra Datacenter
       description: |
         CassandraDatacenter is the Schema for the cassandradatacenters API
       kind: CassandraDatacenter