From 8a4035330575fe81337ddab6e0800d8e3719712f Mon Sep 17 00:00:00 2001 From: Jim Dickinson Date: Mon, 20 Jul 2020 23:46:25 -0400 Subject: [PATCH 1/2] Fix dir --- operator/.osdk-scorecard.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/operator/.osdk-scorecard.yaml b/operator/.osdk-scorecard.yaml index 0b9cfbe2d..deebba54b 100644 --- a/operator/.osdk-scorecard.yaml +++ b/operator/.osdk-scorecard.yaml @@ -8,7 +8,7 @@ scorecard: - "example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml" - basic: cr-manifest: - - "example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml" + - "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,7 +37,7 @@ 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 @@ -47,6 +47,5 @@ scorecard: 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.0/example-cassdc-scorecard.yaml" + - "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" - \ No newline at end of file From 46b075a957d4afe3740b7e7d0bd75d0a4c0bfbda Mon Sep 17 00:00:00 2001 From: Jim Dickinson Date: Tue, 21 Jul 2020 00:01:20 -0400 Subject: [PATCH 2/2] yaml fixes --- .../1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/operator/deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml b/operator/deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml index 49c86bc8e..1c325bbb8 100644 --- a/operator/deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml +++ b/operator/deploy/olm-catalog/cass-operator/1.3.0/cass-operator.v1.3.0.clusterserviceversion.yaml @@ -20,11 +20,12 @@ spec: customresourcedefinitions: owned: - name: cassandradatacenters.cassandra.datastax.com + displayName: Cassandra Datacenter description: | CassandraDatacenter is the Schema for the cassandradatacenters API kind: CassandraDatacenter version: v1beta1 -resources: + resources: - kind: Deployment version: v1 name: ""