Skip to content

Commit 799554f

Browse files
Merge pull request openshift-kni#1458 from yanirq/konflux_4_20_fbc
[release-4.20]: Konflux: Catalog configuration for 4.20
2 parents db544e2 + ce5e2d1 commit 799554f

13 files changed

+1313
-734
lines changed

.konflux/Dockerfile.catalog

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# The opm image is expected to contain /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
2+
ARG OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19
3+
ARG BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
4+
5+
# build the catalog
6+
FROM ${BUILDER_IMAGE} AS builder
7+
8+
# create dir structure to generate the catalog
9+
RUN mkdir -p /app/hack /app/.konflux/catalog
10+
COPY Makefile /app
11+
COPY hack/ /app/hack/
12+
COPY .konflux/catalog/ /app/.konflux/catalog/
13+
14+
# generate the catalog
15+
16+
# debug
17+
RUN echo "root dir" && ls -lra $HOME
18+
19+
WORKDIR /app
20+
RUN --mount=type=secret,id=telco-5g-redhat-pull-secret/.dockerconfigjson \
21+
mkdir -p $HOME/.docker/ && \
22+
cp /run/secrets/telco-5g-redhat-pull-secret/.dockerconfigjson $HOME/.docker/config.json
23+
24+
# debug
25+
RUN echo "run secrets" && ls -lra /run/secrets/ && echo "docker dir" && ls -lra $HOME/.docker/ && cat $HOME/.docker/config.json
26+
27+
ENV REGISTRY_AUTH_FILE=$HOME/.docker/config.json
28+
# The fbc build is not hermetic, so make will download yq and opm
29+
RUN make konflux-generate-catalog-production && \
30+
rm $HOME/.docker/config.json
31+
32+
# run the catalog
33+
FROM ${OPM_IMAGE}
34+
35+
ENTRYPOINT ["/bin/opm"]
36+
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
37+
38+
# ensure this correponds to olm.package name
39+
ENV PACKAGE_NAME=numaresources-operator
40+
41+
COPY --from=builder /app/.konflux/catalog/$PACKAGE_NAME/ /configs/$PACKAGE_NAME
42+
# RUN ["/bin/opm", "validate", "/configs/numaresources-operator"]
43+
RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
44+
45+
LABEL operators.operatorframework.io.index.configs.v1=/configs
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
# When we are ready to ship the first Konflux release, replace this with the nudge to the quay build
3+
quay: quay.io/redhat-user-workloads/telco-5g-tenant/numaresources-operator-bundle-4-20:9e221802d01f35006ba4af01bdab5c9e9e74ace0
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
schema: olm.template.basic
3+
entries:
4+
# Default data
5+
- defaultChannel: "4.20"
6+
icon:
7+
base64data: iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAYNJREFUWIXt1T9rlEEQx/HPnecJGoKJhY+NEgW5VrCxSZpr0oWUKcRgYSoLGwv1RfgWfAnWFlZWKQIRJE00V6XwTxQsdSwygWV5DEeaS/EMLDPP/Gaf/e7swz49hBlaf5aLdwAdQAfQAZwfgLa7OP4TT6tPMw/6TQaPK+EAcxhlXNs3NDngaaUvpx8XuRv4g+clAOzjBRZaFprGPuN1ldtoqXuEXWzWAEdYwvczAiylH6W/iCctdZt4hit4UAJcwDAT984IsYVPGa+26CsY4D3e4MOJ0BA7x99GjIkgesQXYo4YZawaX4nrRJNzFoi9nBvE/fTjrI8ciDvEEXGZGJSU79I/xN+Mf2Gx2s0lzOMnrmbuB+4Wu98u6ufxGxPsZG6A9boDiJtJOskOILYL+n7Gb/O5KbQ14iPxqtj1mNgqaqg6UgMgXqZ4AnArn/fzOIK41gIwzKO5XQEEsVqtMSQOj49MBHpVm+tcfYHUWu+UuO39tT4zOx//gg6gA+gAOoBZ2j82IbSJZWt9tAAAAABJRU5ErkJggg==
8+
mediatype: image/png
9+
name: numaresources-operator
10+
schema: olm.package
11+
# Channel entries should contain all the releases
12+
- entries:
13+
- name: numaresources-operator.v4.20.0
14+
skipRange: '>=4.19.0 <4.20.0'
15+
# After 4.20.0 is released, add 4.20.1 back using the quay nudged bundle
16+
# - name: numaresources-operator.v4.20.1
17+
# replaces: numaresources-operator.v4.20.0
18+
# skipRange: '>=4.19.0 <4.20.1'
19+
name: "4.20"
20+
package: numaresources-operator
21+
schema: olm.channel
22+
# v4.19.0 bundle
23+
# - image: registry.redhat.io/openshift4/numaresources-operator-bundle@sha256:placeholder-update-me-after-release
24+
# schema: olm.bundle
25+
- image: quay.io/redhat-user-workloads/telco-5g-tenant/numaresources-operator-bundle-4-20:9e221802d01f35006ba4af01bdab5c9e9e74ace0
26+
# The url for this last entry is updated by hack/konflux-update-catalog-template.sh automatically
27+
28+
schema: olm.bundle

0 commit comments

Comments
 (0)