Move customresourcedefinition.yaml back to templates dir (#304)

* Move customresourcedefinition.yaml back to templates dir * Bump to a WaitForDatacenter function with a longer timeout * Revert a little more * One more half revert * Regenerated all-in-one manifests
datastax · Nov 3, 2020 · f345931 · f345931
1 parent c7c159d
commit f345931
Show file tree

Hide file tree

Showing 9 changed files with 31,450 additions and 5 deletions.
diff --git a/...-chart/crds/customresourcedefinition.yaml → ...t/templates/customresourcedefinition.yaml b/...-chart/crds/customresourcedefinition.yaml → ...t/templates/customresourcedefinition.yaml
diff --git a/docs/user/cass-operator-manifests-v1.15.yaml b/docs/user/cass-operator-manifests-v1.15.yaml
diff --git a/docs/user/cass-operator-manifests-v1.16.yaml b/docs/user/cass-operator-manifests-v1.16.yaml
diff --git a/docs/user/cass-operator-manifests-v1.17.yaml b/docs/user/cass-operator-manifests-v1.17.yaml
diff --git a/docs/user/cass-operator-manifests-v1.18.yaml b/docs/user/cass-operator-manifests-v1.18.yaml
diff --git a/docs/user/cass-operator-manifests-v1.19.yaml b/docs/user/cass-operator-manifests-v1.19.yaml
diff --git a/hack/release/check-chart-sources.sh b/hack/release/check-chart-sources.sh
@@ -19,4 +19,4 @@ diff -u $opDeploy/webhook_configuration.yaml  $chartTmpl/validatingwebhookconfig
 diff -u $opDeploy/operator.yaml               $chartTmpl/deployment.yaml | diff-so-fancy || true
 diff -u $opDeploy/webhook_service.yaml        $chartTmpl/service.yaml | diff-so-fancy || true
 diff -u $opDeploy/webhook_secret.yaml         $chartTmpl/secret.yaml | diff-so-fancy || true
-diff -u $opDeploy/crds/$crdFilename           $chartCrd/customresourcedefinition.yaml | diff-so-fancy || true
+diff -u $opDeploy/crds/$crdFilename           $chartTmpl/customresourcedefinition.yaml | diff-so-fancy || true
diff --git a/mage/operator/lib.go b/mage/operator/lib.go
@@ -35,7 +35,7 @@ const (
 	genClientImage             = "operator-gen-client"
 	mermaidJsImage             = "operator-mermaid-js"
 	generatedDseDataCentersCrd = "operator/deploy/crds/cassandra.datastax.com_cassandradatacenters_crd.yaml"
-	helmChartCrd               = "charts/cass-operator-chart/crds/customresourcedefinition.yaml"
+	helmChartCrd               = "charts/cass-operator-chart/templates/customresourcedefinition.yaml"
 	packagePath                = "github.com/datastax/cass-operator/operator"
 	envGitBranch               = "MO_BRANCH"
 	envVersionString           = "MO_VERSION"
@@ -238,7 +238,7 @@ func doSdkGenerate() {
 
 	generateK8sAndOpenApi()
 	postProcessCrd()
-	patchCrd()
+	patchCrdToTemplate()
 }
 
 func cpCrdToChart() {
@@ -249,7 +249,7 @@ func cpCrdToChart() {
 	mageutil.PanicOnError(err)
 }
 
-func patchCrd() {
+func patchCrdToTemplate() {
 	shutil.RunVPanic("patch", generatedDseDataCentersCrd, "mage/operator/crd.patch", "-o", helmChartCrd)
 }
 

diff --git a/tests/upgrade_operator/upgrade_operator_suite_test.go b/tests/upgrade_operator/upgrade_operator_suite_test.go
@@ -97,7 +97,7 @@ var _ = Describe(testName, func() {
 			// give the operator a minute to reconcile and update the datacenter
 			time.Sleep(1 * time.Minute)
 
-			ns.WaitForDatacenterReady(dcName)
+			ns.WaitForDatacenterReadyWithTimeouts(dcName, 800, 60)
 
 			// check no longer using old managed-by value
 			step = "ensure no resources using defunct managed-by value after operator upgrade"