Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hack/generate/dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ values[GOLANG_VERSION]="$(metadata.get requirements.golang)"
values[NODEJS_VERSION]="$(metadata.get requirements.nodejs)"
values[OCP_TARGET_VLIST]="$(metadata.get 'requirements.ocpVersion.label')"
values[OCP_MAX_VERSION]="$(metadata.get 'requirements.ocpVersion.list[-1]')"
values[OCP_BUILD_VERSION]="$(metadata.get 'requirements.ocpVersion.build')"
values[PREVIOUS_VERSION]="$(metadata.get olm.replaces)"
values[BUNDLE]="${SERVERLESS_BUNDLE}"

Expand Down
1 change: 1 addition & 0 deletions hack/lib/catalogsource.bash
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ function install_catalogsource {
# Replace bundle reference with previously built bundle
export SERVERLESS_BUNDLE="${bundle_image}"
"${rootdir}/hack/generate/dockerfile.sh" "${rootdir}/templates/index.Dockerfile" "${index_dorkerfile_path}"
sed -i "s|/bin/opm render -o yaml /bundle|/bin/opm render --skip-tls-verify -o yaml ${SERVERLESS_BUNDLE}|" "${index_dorkerfile_path}"

build_image "serverless-index" "${rootdir}" "${index_dorkerfile_path}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
review:
failedTaskHelp: >-
This task isn’t verified yet. Try the task again, or [read
more](https://docs.openshift.com/container-platform/4.21/applications/odc-viewing-application-composition-using-topology-view.html)
more](https://docs.openshift.com/container-platform/4.22/applications/odc-viewing-application-composition-using-topology-view.html)
about this topic.
instructions: >-
#### To verify the application was successfully created:
Expand Down Expand Up @@ -85,7 +85,7 @@ spec:
review:
failedTaskHelp: >-
This task isn’t verified yet. Try the task again, or [read
more](https://docs.openshift.com/container-platform/4.21/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
more](https://docs.openshift.com/container-platform/4.22/applications/odc-viewing-application-composition-using-topology-view.html#odc-scaling-application-pods-and-checking-builds-and-routes_viewing-application-composition-using-topology-view)
about this topic.
instructions: >-
#### To verify the application scaled down:
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
review:
failedTaskHelp: >-
This task isn’t verified yet. Try the task again, or [read
more](https://docs.openshift.com/container-platform/4.21/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
more](https://docs.openshift.com/container-platform/4.22/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource)
about this topic.
instructions: >-
#### To verify that the event connected to your Knative service:
Expand Down Expand Up @@ -178,7 +178,7 @@ spec:
review:
failedTaskHelp: >-
This task isn’t verified yet. Try the task again, or [read
more](https://docs.openshift.com/container-platform/4.21/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
more](https://docs.openshift.com/container-platform/4.22/serverless/knative-serving/traffic-splitting/traffic-splitting-revisions.html#odc-splitting-traffic-between-revisions-using-developer-perspective_traffic-splitting-revisions)
about this topic.
instructions: >-
#### To verify that you forced a new revision and set traffic
Expand Down Expand Up @@ -206,7 +206,7 @@ spec:
review:
failedTaskHelp: >-
This task is not verified yet. Try the task again, or [read
more](https://docs.openshift.com/container-platform/4.21/applications/odc-deleting-applications.html)
more](https://docs.openshift.com/container-platform/4.22/applications/odc-deleting-applications.html)
about this topic.
instructions: |-
#### To verify you deleted your application: :
Expand Down
2 changes: 1 addition & 1 deletion must-gather/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ USER 65532
LABEL \
com.redhat.component="openshift-serverless-1-serverless-must-gather-rhel9-container" \
name="openshift-serverless-1/serverless-must-gather-rhel9" \
version=1.37.1 \
version=1.37.2 \
summary="Red Hat OpenShift Serverless 1 Must Gather" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless 1 Must Gather" \
Expand Down
7 changes: 5 additions & 2 deletions olm-catalog/serverless-operator-index/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ COPY olm-catalog/serverless-operator-index/policy.json /etc/containers/policy.js
# Copy pre-generated yaml of bundles of the previous releases
COPY olm-catalog/serverless-operator-index/index-bundles.yaml /index-bundles.yaml

# Copy the current bundle directly instead of pulling the bundle image
COPY olm-catalog/serverless-operator/manifests /bundle/manifests
COPY olm-catalog/serverless-operator/metadata /bundle/metadata

RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> /configs/index.yaml
RUN cat /index-bundles.yaml >> /configs/index.yaml
RUN /bin/opm render --skip-tls-verify -o yaml \
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-bundle@sha256:6684c8ed063f2691d745f3a1739e2ef0821db77b625b43d519d691b5ff35d16b >> /configs/index.yaml
RUN /bin/opm render -o yaml /bundle >> /configs/index.yaml

# The base image is expected to contain
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
Expand Down
6 changes: 6 additions & 0 deletions olm-catalog/serverless-operator-index/configs/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ schema: olm.channel
name: stable
package: serverless-operator
entries:
- name: "serverless-operator.v1.37.2"
replaces: "serverless-operator.v1.37.1"
skipRange: ">1.37.1 <1.37.2"
- name: "serverless-operator.v1.37.1"
replaces: "serverless-operator.v1.37.0"
skipRange: ">1.37.0 <1.37.1"
Expand All @@ -21,6 +24,9 @@ schema: olm.channel
name: stable-1.37
package: serverless-operator
entries:
- name: "serverless-operator.v1.37.2"
replaces: "serverless-operator.v1.37.1"
skipRange: ">1.37.1 <1.37.2"
- name: "serverless-operator.v1.37.1"
replaces: "serverless-operator.v1.37.0"
skipRange: ">1.37.0 <1.37.1"
Expand Down
175 changes: 175 additions & 0 deletions olm-catalog/serverless-operator-index/index-bundles.yaml

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions olm-catalog/serverless-operator-index/v4.23/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.23:operator-registry

FROM $OPM_IMAGE

LABEL operators.operatorframework.io.index.configs.v1=/configs

COPY catalog/ /configs

RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]

ENTRYPOINT ["/bin/opm"]
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
12 changes: 12 additions & 0 deletions olm-catalog/serverless-operator-index/v5.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-5.0:operator-registry

FROM $OPM_IMAGE

LABEL operators.operatorframework.io.index.configs.v1=/configs

COPY catalog/ /configs

RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]

ENTRYPOINT ["/bin/opm"]
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
4 changes: 2 additions & 2 deletions olm-catalog/serverless-operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LABEL \
com.redhat.component="openshift-serverless-1-serverless-operator-bundle-container" \
name="openshift-serverless-1/serverless-operator-bundle" \
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9" \
version="1.37.1" \
version="1.37.2" \
summary="Red Hat OpenShift Serverless Bundle" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless Bundle" \
Expand All @@ -30,6 +30,6 @@ LABEL \
com.redhat.delivery.backport=false \
distribution-scope="authoritative-source-only" \
url="https://catalog.redhat.com/software/container-stacks/detail/5ec53fcb110f56bd24f2ddc5" \
release="1.37.1" \
release="1.37.2" \
io.openshift.tags="bundle" \
vendor="Red Hat, Inc."
Loading
Loading