Skip to content

Bump S-O version to next release 1.38 #3942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsimansk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump S-O version to next release 1.38 #3942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions must-gather/Dockerfile
View file
Open in desktop
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.0 \
version=1.38.0 \
summary="Red Hat OpenShift Serverless 1 Must Gather" \
maintainer="[email protected]" \
description="Red Hat OpenShift Serverless 1 Must Gather" \
Expand All @@ -33,6 +33,6 @@ LABEL \
io.openshift.tags="must-gather" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"

ENTRYPOINT /usr/bin/gather
6 changes: 3 additions & 3 deletions olm-catalog/serverless-operator-index/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/origin/scos-4.20:operator-registry AS opm
FROM registry.ci.openshift.org/origin/scos-4.21:operator-registry AS opm

FROM registry.access.redhat.com/ubi9/ubi-minimal as builder

Expand All @@ -16,11 +16,11 @@ COPY olm-catalog/serverless-operator-index/index-bundles.yaml /index-bundles.yam
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:18c5bc25aa7fd36f1433fe4920a843336517210c903c467b16f035e3a46f2d4e >> /configs/index.yaml
Copy link
Contributor

@Kaustubh-pande Kaustubh-pande Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need to replace with serverless-operator-138

>> /configs/index.yaml

# The base image is expected to contain
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
FROM registry.ci.openshift.org/origin/scos-4.20:operator-registry
FROM registry.ci.openshift.org/origin/scos-4.21:operator-registry

# Copy declarative config root into image at /configs
COPY --from=builder /configs /configs
Expand Down
22 changes: 11 additions & 11 deletions olm-catalog/serverless-operator-index/configs/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ schema: olm.channel
name: stable
package: serverless-operator
entries:
- name: "serverless-operator.v1.38.0"
replaces: "serverless-operator.v1.37.0"
skipRange: ">1.37.0 <1.38.0"
- name: "serverless-operator.v1.37.0"
replaces: "serverless-operator.v1.36.1"
skipRange: ">1.36.1 <1.37.0"
skipRange: ">=1.36.1 <1.37.0"
- name: "serverless-operator.v1.36.1"
replaces: "serverless-operator.v1.36.0"
skipRange: ">=1.36.0 <1.36.1"
- name: "serverless-operator.v1.36.0"
replaces: "serverless-operator.v1.35.0"
skipRange: ">=1.35.0 <1.36.0"
- name: serverless-operator.v1.35.0
- name: serverless-operator.v1.36.0
---
schema: olm.channel
name: stable-1.37
name: stable-1.38
package: serverless-operator
entries:
- name: "serverless-operator.v1.38.0"
replaces: "serverless-operator.v1.37.0"
skipRange: ">1.37.0 <1.38.0"
- name: "serverless-operator.v1.37.0"
replaces: "serverless-operator.v1.36.1"
skipRange: ">1.36.1 <1.37.0"
skipRange: ">=1.36.1 <1.37.0"
- name: "serverless-operator.v1.36.1"
replaces: "serverless-operator.v1.36.0"
skipRange: ">=1.36.0 <1.36.1"
- name: "serverless-operator.v1.36.0"
replaces: "serverless-operator.v1.35.0"
skipRange: ">=1.35.0 <1.36.0"
- name: serverless-operator.v1.35.0
- name: serverless-operator.v1.36.0
12 changes: 12 additions & 0 deletions olm-catalog/serverless-operator-index/v4.21/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ARG OPM_IMAGE=registry.ci.openshift.org/origin/scos-4.21: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"]
8 changes: 4 additions & 4 deletions olm-catalog/serverless-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=serverless-operator
LABEL operators.operatorframework.io.bundle.channel.default.v1="stable"
LABEL operators.operatorframework.io.bundle.channels.v1="stable,stable-1.37"
LABEL operators.operatorframework.io.bundle.channels.v1="stable,stable-1.38"

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.0" \
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" \
version="1.38.0" \
summary="Red Hat OpenShift Serverless Bundle" \
maintainer="[email protected]" \
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.0" \
release="1.38.0" \
io.openshift.tags="bundle" \
vendor="Red Hat, Inc."
6 changes: 3 additions & 3 deletions olm-catalog/serverless-operator/hack/004-eventing-drop-unsupported-sources.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml
index 298276ddd..f496f5ef5 100644
index a4e835a75..09e88f692 100644
--- a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml
+++ b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml
@@ -904,46 +904,6 @@ spec:
@@ -2212,46 +2212,6 @@ spec:
- type: string
description: An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".
description: An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".
x-kubernetes-int-or-string: true
- source:
- description: The source configuration for Knative Eventing
Expand Down
2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2196,7 +2196,7 @@ spec:
anyOf:
- type: integer
- type: string
description: An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".
description: An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".
x-kubernetes-int-or-string: true
sinkBindingSelectionMode:
description: Specifies the selection mode for the sinkbinding webhook.
Expand Down
2 changes: 1 addition & 1 deletion olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2207,7 +2207,7 @@ spec:
anyOf:
- type: integer
- type: string
description: An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".
description: An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".
x-kubernetes-int-or-string: true
ingress:
description: The ingress configuration for Knative Serving
Expand Down
Loading
Loading