netobserv · jotak · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025
diff --git a/Makefile b/Makefile
@@ -66,11 +66,6 @@ IMAGE_TAG_BASE ?= $(REPO)/network-observability-operator
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMAGE=<some-registry>/<project-name-bundle>:<tag>)
 BUNDLE_IMAGE ?= $(IMAGE_TAG_BASE)-bundle:v$(BUNDLE_VERSION)
 
-
-# FBC_IMAGE defines the image:tag used for the file based catalog.
-# You can use it as an arg. (E.g make bundle-build FBC_IMAGE=<some-registry>/<project-name-fbc>:<tag>)
-FBC_IMAGE ?= $(IMAGE_TAG_BASE)-fbc:v$(FBC_VERSION)
-
 # BUNDLE_CONFIG is the config sources to use for OLM bundle - "config/openshift-olm" for OpenShift, or "config/k8s-olm" for upstream Kubernetes.
 BUNDLE_CONFIG ?= config/openshift-olm
 
@@ -434,14 +429,6 @@ bundle-build: ## Build the bundle image.
 bundle-push: ## Push the bundle image.
 	$(OCI_BIN) push ${BUNDLE_IMAGE};
 
-.PHONY: file-based-catalog-build
-file-based-catalog-build: ## Build the bundle image.
-	$(OCI_BIN) build $(OCI_BUILD_OPTS) -f catalog.Dockerfile -t $(FBC_IMAGE) .
-
-.PHONY: file-based-catalog-push
-file-based-catalog-push: ## Push the bundle image.
-	$(OCI_BIN) push ${FBC_IMAGE};
-
 # A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMAGES=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0).
 # These images MUST exist in a registry and be pull-able.
 BUNDLE_IMAGES ?= $(BUNDLE_IMAGE)
@@ -454,16 +441,17 @@ ifneq ($(origin CATALOG_BASE_IMAGE), undefined)
 FROM_INDEX_OPT := --from-index $(CATALOG_BASE_IMAGE)
 endif
 
+.PHONY: refresh-prod-catalogs
+refresh-prod-catalogs: opm YQ ## Refresh FBC from production catalogs. Set REGISTRY_AUTH_FILE=/path/to/pull-secret.json for authentication.
+	YQ=$(YQ) OPM=$(OPM) ./hack/refresh-redhat-catalog.sh
+
 # Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
 # This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog-build
 catalog-build: opm ## Build a catalog image.
-	$(OPM) index add --container-tool ${OCI_BIN} --mode semver --tag $(CATALOG_IMAGE) --bundles $(BUNDLE_IMAGES) $(FROM_INDEX_OPT) $(OPM_OPTS)
-
-.PHONY: file-based-catalog-update
-file-based-catalog-update: opm ## Build a catalog image.
-	OPM=$(OPM) BUNDLE_IMAGE=$(BUNDLE_IMAGE) BUNDLE_TAG="v$(BUNDLE_VERSION)" ./hack/update_fbc.sh
+	OPM=$(OPM) BUNDLE_IMAGE=$(BUNDLE_IMAGE) BUNDLE_TAG="v$(BUNDLE_VERSION)" IS_DOWNSTREAM=$(IS_DOWNSTREAM) ./hack/update_fbc.sh
+	$(OCI_BIN) build $(OCI_BUILD_OPTS) --build-arg CATALOG_PATH="catalog/unreleased/v$(BUNDLE_VERSION)" -f catalog.Dockerfile -t $(CATALOG_IMAGE) .
 
 shortlived-catalog-build: ## Build a temporary catalog image, expiring after 2 weeks on quay
 	$(MAKE) catalog-build CATALOG_IMAGE=temp-catalog

diff --git a/bundle.Dockerfile.downstream b/bundle.Dockerfile.downstream
@@ -2,7 +2,7 @@ ARG COMMIT
 
 FROM registry.access.redhat.com/ubi9/python-312 as builder
 
-COPY  --chown=default . .
+COPY --chown=default . .
 RUN pip install -r requirements.txt
 
 RUN COMMIT=$COMMIT ./hack/update-build.sh
@@ -14,8 +14,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=netobserv-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=latest,community
-LABEL operators.operatorframework.io.bundle.channel.default.v1=community
+LABEL operators.operatorframework.io.bundle.channels.v1=stable,v1.0.x
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.3
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
@@ -38,10 +38,9 @@ LABEL maintainer="[email protected]"
 LABEL io.openshift.tags="network-observability-operator-bundle"
 LABEL upstream-vcs-ref="$COMMIT"
 LABEL upstream-vcs-type="git"
-LABEL description="NetObserv Operator is a Kubernetes / OpenShift operator for network observability."
+LABEL description="Network Observability operator for OpenShift."
 LABEL distribution-scope=public
 LABEL release="1.9.0"
 LABEL version="1.9.0"
 LABEL url="https://github.com/netobserv/network-observability-operator"
 LABEL vendor="Red Hat, Inc."
-LABEL description="NetObserv Operator is a Kubernetes / OpenShift operator for network observability."
diff --git a/catalog.Dockerfile b/catalog.Dockerfile
@@ -1,11 +1,12 @@
 FROM quay.io/operator-framework/opm:v1.51.0
+ARG CATALOG_PATH=catalog
 
 # Configure the entrypoint and command
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
 # Copy declarative config root into image at /configs and pre-populate serve cache
-ADD catalog /configs
+ADD $CATALOG_PATH /configs
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 
 # Set DC-specific label for the location of the DC root directory

diff --git a/catalog.Dockerfile.downstream b/catalog.Dockerfile.downstream
@@ -15,7 +15,10 @@ ENTRYPOINT ["opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
 # Copy declarative config root into image at /configs and pre-populate serve cache
-COPY --from=builder /opt/app-root/src/catalog /configs/netobserv-operator
+COPY --from=builder /opt/app-root/src/catalog/released /configs/netobserv-operator
+COPY --from=builder /opt/app-root/src/catalog/unreleased/next/index.yaml /configs/netobserv-operator/
+COPY --from=builder /opt/app-root/src/catalog/unreleased/next/bundle.yaml /configs/netobserv-operator/
+
 RUN opm serve /configs --cache-dir=/tmp/cache --cache-only
 
 # Set DC-specific label for the location of the DC root directory
@@ -31,5 +34,5 @@ LABEL maintainer="[email protected]"
 LABEL io.openshift.tags="network-observability-operator-catalog"
 LABEL upstream-vcs-ref="$COMMIT"
 LABEL upstream-vcs-type="git"
-LABEL description="NetObserv Operator is a Kubernetes / OpenShift operator for network observability."
+LABEL description="Network Observability operator for OpenShift."
 LABEL version="1.9.0"
diff --git a/catalog/index.yaml b/catalog/index.yaml
diff --git a/catalog/released-legacy/bundles.yaml b/catalog/released-legacy/bundles.yaml
diff --git a/catalog/released-legacy/index.yaml b/catalog/released-legacy/index.yaml
@@ -0,0 +1,41 @@
+entries:
+  - name: network-observability-operator.v1.0.0-202301070345
+  - name: network-observability-operator.v1.1.0-202302110050
+    replaces: network-observability-operator.v1.0.0-202301070345
+  - name: network-observability-operator.v1.2.0
+    replaces: network-observability-operator.v1.1.0-202302110050
+  - name: network-observability-operator.v1.3.0
+    replaces: network-observability-operator.v1.2.0
+  - name: network-observability-operator.v1.4.0
+    replaces: network-observability-operator.v1.3.0
+  - name: network-observability-operator.v1.4.1
+    replaces: network-observability-operator.v1.4.0
+  - name: network-observability-operator.v1.4.2
+    replaces: network-observability-operator.v1.4.1
+  - name: network-observability-operator.v1.5.0
+    replaces: network-observability-operator.v1.4.2
+  - name: network-observability-operator.v1.6.0
+    replaces: network-observability-operator.v1.5.0
+  - name: network-observability-operator.v1.6.1
+    replaces: network-observability-operator.v1.6.0
+  - name: network-observability-operator.v1.6.2
+    replaces: network-observability-operator.v1.6.1
+  - name: network-observability-operator.v1.7.0
+    replaces: network-observability-operator.v1.6.2
+  - name: network-observability-operator.v1.8.0
+    replaces: network-observability-operator.v1.7.0
+name: stable
+package: netobserv-operator
+schema: olm.channel
+---
+entries:
+  - name: network-observability-operator.v1.0.0-202301070345
+  - name: network-observability-operator.v1.1.0-202302110050
+    replaces: network-observability-operator.v1.0.0-202301070345
+  - name: network-observability-operator.v1.2.0
+    replaces: network-observability-operator.v1.1.0-202302110050
+  - name: network-observability-operator.v1.3.0
+    replaces: network-observability-operator.v1.2.0
+name: v1.0.x
+package: netobserv-operator
+schema: olm.channel
diff --git a/catalog/released-legacy/other.yaml b/catalog/released-legacy/other.yaml
@@ -0,0 +1,7 @@
+---
+defaultChannel: stable
+icon:
+  base64data: PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI2LjAuMiwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAxMDAgMTAwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAxMDAgMTAwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGw6dXJsKCNTVkdJRF8xXyk7fQoJLnN0MXtmaWxsOiNGRkZGRkY7fQoJLnN0MntvcGFjaXR5OjAuNjt9Cgkuc3Qze29wYWNpdHk6MC41O30KCS5zdDR7b3BhY2l0eTowLjQ7fQo8L3N0eWxlPgo8Zz4KCTxnPgoJCTxnPgoJCQk8cmFkaWFsR3JhZGllbnQgaWQ9IlNWR0lEXzFfIiBjeD0iMTQuNzc1OCIgY3k9Ii0yLjk3NzEiIHI9IjkxLjYyNyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgoJCQkJPHN0b3AgIG9mZnNldD0iMCIgc3R5bGU9InN0b3AtY29sb3I6IzNDM0ZBNiIvPgoJCQkJPHN0b3AgIG9mZnNldD0iMSIgc3R5bGU9InN0b3AtY29sb3I6IzNCMDM0MCIvPgoJCQk8L3JhZGlhbEdyYWRpZW50PgoJCQk8cGF0aCBjbGFzcz0ic3QwIiBkPSJNNTAsOTljLTEzLjMsMC0yNS40LTUuMy0zNC4yLTEzLjlDNi43LDc2LjIsMSw2My43LDEsNTBDMSwyMi45LDIyLjksMSw1MCwxYzEzLjcsMCwyNi4yLDUuNywzNS4xLDE0LjgKCQkJCUM5My43LDI0LjYsOTksMzYuNyw5OSw1MEM5OSw3Ny4xLDc3LjEsOTksNTAsOTl6Ii8+CgkJPC9nPgoJCTxnPgoJCQk8Y2lyY2xlIGNsYXNzPSJzdDEiIGN4PSIzNy41IiBjeT0iODEuOSIgcj0iNSIvPgoJCTwvZz4KCQk8cGF0aCBjbGFzcz0ic3QxIiBkPSJNNDguNiw5MS45bDE4LjgtNDMuM2MtMi41LTAuMS01LTAuNy03LjItMkwzMy4yLDY4LjJsMS40LTEuOGwyMC0yNS4xYy0xLjUtMi40LTIuMy01LjEtMi4zLTcuOUw5LDUyLjIKCQkJbDQ3LjYtMjkuOWwwLDBjMC4xLTAuMSwwLjItMC4yLDAuMi0wLjJjNi4xLTYuMSwxNS45LTYuMSwyMiwwbDAuMSwwLjFjNiw2LjEsNiwxNS45LTAuMSwyMS45Yy0wLjEsMC4xLTAuMiwwLjItMC4yLDAuMmwwLDAKCQkJTDQ4LjYsOTEuOXoiLz4KCQk8ZyBjbGFzcz0ic3QyIj4KCQkJPGNpcmNsZSBjbGFzcz0ic3QxIiBjeD0iNTAuMyIgY3k9IjE0LjciIHI9IjMuMSIvPgoJCTwvZz4KCQk8ZyBjbGFzcz0ic3QzIj4KCQkJPGNpcmNsZSBjbGFzcz0ic3QxIiBjeD0iMjcuNyIgY3k9IjU4IiByPSIxLjciLz4KCQk8L2c+CgkJPGc+CgkJCTxjaXJjbGUgY2xhc3M9InN0MSIgY3g9Ijc3LjQiIGN5PSI2OS4zIiByPSIxLjciLz4KCQk8L2c+CgkJPGc+CgkJCTxjaXJjbGUgY2xhc3M9InN0MSIgY3g9IjE2LjMiIGN5PSIzNi42IiByPSIxLjciLz4KCQk8L2c+CgkJPGcgY2xhc3M9InN0NCI+CgkJCTxjaXJjbGUgY2xhc3M9InN0MSIgY3g9IjYzLjciIGN5PSI4NS45IiByPSIyLjIiLz4KCQk8L2c+CgkJPGc+CgkJCTxjaXJjbGUgY2xhc3M9InN0MSIgY3g9IjI5LjQiIGN5PSIxOS42IiByPSI0LjgiLz4KCQk8L2c+CgkJPGcgY2xhc3M9InN0MyI+CgkJCTxjaXJjbGUgY2xhc3M9InN0MSIgY3g9Ijg4IiBjeT0iNTAiIHI9IjQuOCIvPgoJCTwvZz4KCTwvZz4KPC9nPgo8L3N2Zz4K
+  mediatype: image/svg+xml
+name: netobserv-operator
+schema: olm.package