From 4055b4c48bfc97d22d78fffe09b5aa4b52400cd1 Mon Sep 17 00:00:00 2001
From: Xiang Dai <764524258@qq.com>
Date: Sun, 1 Dec 2019 19:59:03 +0800
Subject: [PATCH] =?UTF-8?q?[incubator/cassandra-operator]=20Introduce=20cr?=
 =?UTF-8?q?ds=20directory=20for=20compatibi=E2=80=A6=20(#19207)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [incubator/cassandra-operator] Introduce crds directory for compatibility with Helm v3

Signed-off-by: Xiang Dai <764524258@qq.com>

* bump up chart version

Signed-off-by: Xiang Dai <764524258@qq.com>

* update README

Signed-off-by: Xiang Dai <764524258@qq.com>
---
 incubator/cassandra-operator/Chart.yaml                     | 2 +-
 incubator/cassandra-operator/README.md                      | 1 +
 .../db_v1alpha1_cassandracluster_crd.yaml                   | 2 --
 incubator/cassandra-operator/templates/crds.yaml            | 6 ++++++
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename incubator/cassandra-operator/{templates => crds}/db_v1alpha1_cassandracluster_crd.yaml (88%)
 create mode 100644 incubator/cassandra-operator/templates/crds.yaml

diff --git a/incubator/cassandra-operator/Chart.yaml b/incubator/cassandra-operator/Chart.yaml
index e5c0fe2fc3..b51f94ccab 100644
--- a/incubator/cassandra-operator/Chart.yaml
+++ b/incubator/cassandra-operator/Chart.yaml
@@ -5,7 +5,7 @@ name: cassandra-operator
 home: https://github.com/Orange-OpenSource/cassandra-k8s-operator
 sources:
   - https://github.com/Orange-OpenSource/cassandra-k8s-operator
-version: 0.3.2
+version: 0.3.3
 appVersion: 0.3.1-mater
 maintainers:
   - name: allamand
diff --git a/incubator/cassandra-operator/README.md b/incubator/cassandra-operator/README.md
index c0fa2b4063..fe389aa329 100644
--- a/incubator/cassandra-operator/README.md
+++ b/incubator/cassandra-operator/README.md
@@ -26,6 +26,7 @@ The following tables lists the configurable parameters of the Cassandra Operator
 | `resources`                      | Pod resource requests & limits                   | `{}`                                      |
 | `metricService`                  | deploy service for metrics                       | `false`                                   |
 | `debug.enabled`                  | activate DEBUG log level                         | `false`                                   |
+| `createCustomResource`           | If false, do not create custom resource(do not require with Helm v3)   | `false`             |
 
 
 
diff --git a/incubator/cassandra-operator/templates/db_v1alpha1_cassandracluster_crd.yaml b/incubator/cassandra-operator/crds/db_v1alpha1_cassandracluster_crd.yaml
similarity index 88%
rename from incubator/cassandra-operator/templates/db_v1alpha1_cassandracluster_crd.yaml
rename to incubator/cassandra-operator/crds/db_v1alpha1_cassandracluster_crd.yaml
index e61fc35bf1..08ad587dfc 100644
--- a/incubator/cassandra-operator/templates/db_v1alpha1_cassandracluster_crd.yaml
+++ b/incubator/cassandra-operator/crds/db_v1alpha1_cassandracluster_crd.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.createCustomResource }}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -14,4 +13,3 @@ spec:
     singular: cassandracluster
   scope: Namespaced
   version: v1alpha1
-{{- end }}
diff --git a/incubator/cassandra-operator/templates/crds.yaml b/incubator/cassandra-operator/templates/crds.yaml
new file mode 100644
index 0000000000..2dc01faab9
--- /dev/null
+++ b/incubator/cassandra-operator/templates/crds.yaml
@@ -0,0 +1,6 @@
+{{- if .Values.createCustomResource }}
+{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
+{{ $.Files.Get $path }}
+---
+{{- end }}
+{{- end }}