Merge pull request #7527 from leseb/remove-ob-obc-from-csv

ceph: do not include ob/obc/volumes crds in csv

Makefile

@@ -168,7 +168,8 @@ prune: ## Prune cached artifacts.
 	@$(MAKE) -C images prune
 
 csv-ceph: export MAX_DESC_LEN=0 # sets the description length to 0 since CSV cannot be bigger than 1MB
-csv-ceph: crds ## Generate a CSV file for OLM.
+csv-ceph: export NO_OB_OBC_VOL_GEN=true
+csv-ceph: csv-clean crds ## Generate a CSV file for OLM.
 	@echo Generating CSV manifests
 	@cluster/olm/ceph/generate-rook-csv.sh $(CSV_VERSION) $(CSV_PLATFORM) $(ROOK_OP_VERSION)
 

build/crds/build-crds.sh

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 set -o errexit
-set -o nounset
 set -o pipefail
 
 SCRIPT_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd -P)
@@ -45,9 +44,12 @@ copy_ob_obc_crds() {
   cp -f "${SCRIPT_ROOT}/cluster/olm/ceph/assemble/objectbucket.io_objectbuckets.yaml" "$OLM_CATALOG_DIR"
 }
 
-generating_crds() {
-  echo "Generating crds.yaml"
+generating_crds_v1() {
+  echo "Generating v1 in crds.yaml"
   "$CONTROLLER_GEN_BIN_PATH" "$CRD_OPTIONS" paths="./pkg/apis/ceph.rook.io/v1" output:crd:artifacts:config="$OLM_CATALOG_DIR"
+}
+
+generating_crds_v1alpha2() {
   "$CONTROLLER_GEN_BIN_PATH" "$CRD_OPTIONS" paths="./pkg/apis/rook.io/v1alpha2" output:crd:artifacts:config="$OLM_CATALOG_DIR"
   # TODO: revisit later
   # * remove copy_ob_obc_crds()
@@ -92,8 +94,14 @@ build_helm_resources() {
 ########
 # MAIN #
 ########
-copy_ob_obc_crds
-generating_crds
+generating_crds_v1
+
+if [ -z "$NO_OB_OBC_VOL_GEN" ]; then
+  echo "Generating v1alpha2 in crds.yaml"
+  copy_ob_obc_crds
+  generating_crds_v1alpha2
+fi
+
 generating_main_crd
 
 for crd in "$OLM_CATALOG_DIR/"*.yaml; do

images/ceph/Makefile

@@ -64,11 +64,12 @@ do.build: generate-csv-ceph-templates
 		-t $(CEPH_IMAGE) \
 		$(TEMP)
 	@rm -fr $(TEMP)
+	@$(MAKE) -C ../.. crds # revert changes made to the crds.yaml file during the csv-gen sequence
 
 generate-csv-ceph-templates: $(OPERATOR_SDK) $(YQ)
 	@if [ ! "$(INCLUDE_CSV_TEMPLATES)" = "" ]; then\
 		BEFORE_GEN_CRD_SIZE=$$(wc -l < ../../cluster/examples/kubernetes/ceph/crds.yaml);\
-		$(MAKE) -C ../.. MAX_DESC_LEN=0 crds;\
+		$(MAKE) -C ../.. NO_OB_OBC_VOL_GEN=true MAX_DESC_LEN=0 crds;\
 		AFTER_GEN_CRD_SIZE=$$(wc -l < ../../cluster/examples/kubernetes/ceph/crds.yaml);\
 		if [ "$$BEFORE_GEN_CRD_SIZE" -le "$$AFTER_GEN_CRD_SIZE" ]; then\
 			echo "the new crd file must be smaller since the description fields were stripped!";\