From 66825fed044bb7a5dbf67901be1a365217ad66e6 Mon Sep 17 00:00:00 2001 From: Christopher Bradford Date: Thu, 4 Jun 2020 13:58:29 -0400 Subject: [PATCH] Updating tests for 1.0.0 and 1.1.0 --- operator/.osdk-scorecard.yaml | 34 +++++++++++++------ ...operator.v1.0.0.clusterserviceversion.yaml | 2 +- ...operator.v1.1.0.clusterserviceversion.yaml | 7 +++- .../example-cassdc-scorecard.yaml | 2 +- .../dse-6.8.0/example-cassdc-scorecard.yaml | 2 +- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/operator/.osdk-scorecard.yaml b/operator/.osdk-scorecard.yaml index 1d364cca2..7e29c3550 100644 --- a/operator/.osdk-scorecard.yaml +++ b/operator/.osdk-scorecard.yaml @@ -1,17 +1,31 @@ +# Note the structure below is intentional to avoid unnecessary warnings scorecard: - # Setting a global scorecard option - output: json + bundle: deploy/olm-catalog/cass-operator plugins: - # `basic` tests configured to test 2 CRs - # - basic: - # cr-manifest: - # - "example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml" - # - "example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml" + # Basic CR Tests + - basic: + cr-manifest: + - "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" + + # v1.0.0 + - olm: + cr-manifest: + - "example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml" + 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" + csv-path: "deploy/olm-catalog/cass-operator/1.0.0/cass-operator.v1.0.0.clusterserviceversion.yaml" - # OLM tests may only test one CR + # v1.1.0 - olm: cr-manifest: - "example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml" - # - "example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml" csv-path: "deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml" - \ No newline at end of file + - olm: + cr-manifest: + - "example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml" + csv-path: "deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml" diff --git a/operator/deploy/olm-catalog/cass-operator/1.0.0/cass-operator.v1.0.0.clusterserviceversion.yaml b/operator/deploy/olm-catalog/cass-operator/1.0.0/cass-operator.v1.0.0.clusterserviceversion.yaml index 4d8311ef4..d4a0b201c 100644 --- a/operator/deploy/olm-catalog/cass-operator/1.0.0/cass-operator.v1.0.0.clusterserviceversion.yaml +++ b/operator/deploy/olm-catalog/cass-operator/1.0.0/cass-operator.v1.0.0.clusterserviceversion.yaml @@ -43,7 +43,7 @@ spec: version: v1 name: "" - kind: StatefulSet - version: v1beta1 + version: v1 name: "" - kind: Secret version: v1 diff --git a/operator/deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml b/operator/deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml index 84973e635..924bedc4d 100644 --- a/operator/deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml +++ b/operator/deploy/olm-catalog/cass-operator/1.1.0/cass-operator.v1.1.0.clusterserviceversion.yaml @@ -3,7 +3,7 @@ kind: ClusterServiceVersion metadata: annotations: alm-examples: >- - [{"apiVersion": "cassandra.datastax.com/v1beta1","kind": "CassandraDatacenter","metadata": {"name": "dc1"},"spec": {"clusterName": "cluster1","size": 3,"racks": [{"name": "rack1","zone": "us-central1-a"},{"name": "rack2","zone": "us-central1-b"},{"name": "rack3","zone": "us-central1-c"}],"resources": {"requests": {"memory": "24Gi","cpu": "6000m"},"limits": {"memory": "24Gi","cpu": "6000m"}},"storageConfig": {"cassandraDataVolumeClaimSpec": {"storageClassName": "server-storage","accessModes": ["ReadWriteOnce"],"resources": {"requests": {"storage": "1000Gi"}}}},"allowMultipleNodesPerWorker": false,"stopped": false,"rollingRestartRequested": false,"canaryUpgrade": false,"serverType": "dse","serverVersion": "6.8.0","serverImage": "registry.connect.redhat.com/datastax/dse-server:6.8.0","configBuilderImage": "registry.connect.redhat.com/datastax/cass-config-builder:1.0.0","superuserSecretName": "","managementApiAuth": {"insecure": {}},"serviceAccount": "default","replaceNodes": []}}] + [{"apiVersion": "cassandra.datastax.com/v1beta1","kind": "CassandraDatacenter","metadata": {"name": "dc1"},"spec": {"clusterName": "cluster1","size": 3,"racks": [{"name": "rack1","zone": "us-central1-a"},{"name": "rack2","zone": "us-central1-b"},{"name": "rack3","zone": "us-central1-c"}],"resources": {"requests": {"memory": "24Gi","cpu": "6000m"},"limits": {"memory": "24Gi","cpu": "6000m"}},"storageConfig": {"cassandraDataVolumeClaimSpec": {"storageClassName": "server-storage","accessModes": ["ReadWriteOnce"],"resources": {"requests": {"storage": "1000Gi"}}}},"allowMultipleNodesPerWorker": false,"stopped": false,"rollingRestartRequested": false,"canaryUpgrade": false,"serverType": "dse","serverVersion": "6.8.0","serverImage": "registry.connect.redhat.com/datastax/dse-server:6.8.0","configBuilderImage": "registry.connect.redhat.com/datastax/cass-config-builder:1.0.0","superuserSecretName": "","managementApiAuth": {"insecure": {}},"serviceAccount": "default"}}] categories: Database,Big Data,OpenShift Optional description: > Simple provisioning, turn-key operations, and automated remediation of @@ -259,6 +259,11 @@ spec: Configuration for connectivity between cass-operator and Management API displayName: Management API Authentication + - path: replaceNodes + description: | + A list of pod names that need to be replaced + displayName: Replace Nodes + statusDescriptors: - path: cassandraOperatorProgress description: Cassandra Operator Progress diff --git a/operator/example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml b/operator/example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml index 7bd5b3f1b..52462e813 100644 --- a/operator/example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml +++ b/operator/example-cassdc-yaml/cassandra-3.11.6/example-cassdc-scorecard.yaml @@ -1,7 +1,7 @@ apiVersion: cassandra.datastax.com/v1beta1 kind: CassandraDatacenter metadata: - name: dc1 + name: cass-dc namespace: default spec: size: 1 diff --git a/operator/example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml b/operator/example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml index 37c04fbd5..12c99ea0e 100644 --- a/operator/example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml +++ b/operator/example-cassdc-yaml/dse-6.8.0/example-cassdc-scorecard.yaml @@ -1,7 +1,7 @@ apiVersion: cassandra.datastax.com/v1beta1 kind: CassandraDatacenter metadata: - name: dc1 + name: dse-dc namespace: default spec: size: 1