catalog: don't convert bundle-objects to csv-metadata <=4.16

Signed-off-by: Jan Fajerski <[email protected]>
rhobs · Dec 11, 2024 · bf65375 · bf65375
1 parent 30b4a67
commit bf65375
Show file tree

Hide file tree

Showing 8 changed files with 190 additions and 6 deletions.
diff --git a/Dockerfile-4.12.catalog b/Dockerfile-4.12.catalog
@@ -4,7 +4,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry:v4.12
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
-COPY catalog/coo-product /configs/cluster-observability-operator
+COPY catalog/coo-product-4.16 /configs/cluster-observability-operator
 
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 

diff --git a/Dockerfile-4.13.catalog b/Dockerfile-4.13.catalog
@@ -4,7 +4,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry:v4.13
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
-COPY catalog/coo-product /configs/cluster-observability-operator
+COPY catalog/coo-product-4.16 /configs/cluster-observability-operator
 
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 

diff --git a/Dockerfile-4.14.catalog b/Dockerfile-4.14.catalog
@@ -4,7 +4,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry:v4.14
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
-COPY catalog/coo-product /configs/cluster-observability-operator
+COPY catalog/coo-product-4.16 /configs/cluster-observability-operator
 
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 

diff --git a/Dockerfile-4.15.catalog b/Dockerfile-4.15.catalog
@@ -4,7 +4,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.15.0
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
-COPY catalog/coo-product /configs/cluster-observability-operator
+COPY catalog/coo-product-4.16 /configs/cluster-observability-operator
 
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 

diff --git a/Dockerfile-4.16.catalog b/Dockerfile-4.16.catalog
@@ -4,7 +4,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
-COPY catalog/coo-product /configs/cluster-observability-operator
+COPY catalog/coo-product-4.16 /configs/cluster-observability-operator
 
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 

diff --git a/Makefile b/Makefile
@@ -9,6 +9,8 @@ generate: generate-catalog
 .PHONY: generate-catalog
 generate-catalog: $(OPM)
 	$(OPM) alpha render-template basic --output yaml --migrate-level bundle-object-to-csv-metadata catalog/catalog-template.yaml > catalog/coo-product/catalog.yaml
+	# pre 4.17 the catalog should have bundle-object
+	$(OPM) alpha render-template basic --output yaml catalog/catalog-template.yaml > catalog/coo-product-4.16/catalog.yaml
 
 $(TOOLS_DIR):
 	@mkdir -p $(TOOLS_DIR)

diff --git a/README.md b/README.md
@@ -3,5 +3,8 @@
 ## Catalog resources:
 Catalog was generated via
 ```
-opm alpha render-template basic --output yaml --migrate-level bundle-object-to-csv-metadata catalog/catalog-template.yaml > catalog/coo-product-4.17/catalog.yaml
+opm alpha render-template basic --output yaml --migrate-level bundle-object-to-csv-metadata catalog/catalog-template.yaml > catalog/coo-product/catalog.yaml
+opm alpha render-template basic --output yaml --migrate-level catalog/catalog-template.yaml > catalog/coo-product-4.16/catalog.yaml
 ```
+
+or simply use `make generate`
diff --git a/catalog/coo-product-4.16/catalog.yaml b/catalog/coo-product-4.16/catalog.yaml