diff --git a/Makefile b/Makefile index dd482c054c8..ad6a0c6d92f 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ ENVTEST_K8S_VERSION = 1.32 #refers to the version of kubebuilder assets to be do GOLANGCI_LINT_VERSION ?= v2.9.0 KUSTOMIZE_VERSION ?= v5.2.1 CONTROLLER_TOOLS_VERSION ?= v0.16.5 -OPM_VERSION ?= v1.23.0 +OPM_VERSION ?= v1.68.0 BRANCH_VERSION = oadp-dev PREVIOUS_CHANNEL ?= oadp-1.5 PREVIOUS_CHANNEL_GO_VERSION ?= 1.23 diff --git a/build/Dockerfile.catalog b/build/Dockerfile.catalog new file mode 100644 index 00000000000..c3f0d3e860a --- /dev/null +++ b/build/Dockerfile.catalog @@ -0,0 +1,58 @@ +# FBC (File-Based Catalog) image for OLM operator installation. +# Renders a bundle image into an FBC catalog servable via gRPC CatalogSource. +# +# Usage: +# podman build -f build/Dockerfile.catalog \ +# --build-arg BUNDLE_IMG= \ +# -t . +# +# ci-operator: set BUNDLE_IMG via build_args in the ci-operator config. +# The bundle image must be pushed to a registry accessible during the build. +# +# Reference: networking-incubator/coraza-kubernetes-operator catalog/Dockerfile + +ARG OPM_VERSION=v1.68.0 + +FROM quay.io/operator-framework/opm:${OPM_VERSION} AS opm + +FROM registry.access.redhat.com/ubi9/ubi-minimal AS builder + +COPY --from=opm /bin/opm /bin/opm + +# Allow opm to pull bundle images from CI registries without signature verification +RUN mkdir -p /etc/containers && \ + echo '{"default":[{"type":"insecureAcceptAnything"}]}' > /etc/containers/policy.json + +ARG BUNDLE_IMG +ARG VERSION=99.0.0 +ARG DEFAULT_CHANNEL=dev + +RUN test -n "${BUNDLE_IMG}" || (echo "BUNDLE_IMG build-arg is required" >&2; exit 1) && \ + mkdir -p /configs/oadp-operator && \ + /bin/opm render "${BUNDLE_IMG}" -o yaml > /configs/oadp-operator/index.yaml && \ + cat >> /configs/oadp-operator/index.yaml <