diff --git a/knative-operator/deploy/resources/quickstart/serverless-application-quickstart.yaml b/knative-operator/deploy/resources/quickstart/serverless-application-quickstart.yaml index 41fe6e9b8b..e12616ccad 100644 --- a/knative-operator/deploy/resources/quickstart/serverless-application-quickstart.yaml +++ b/knative-operator/deploy/resources/quickstart/serverless-application-quickstart.yaml @@ -46,7 +46,7 @@ spec: review: failedTaskHelp: >- This task isn’t verified yet. Try the task again, or [read - more](https://docs.openshift.com/container-platform/4.14/applications/odc-viewing-application-composition-using-topology-view.html) + more](https://docs.openshift.com/container-platform/4.15/applications/odc-viewing-application-composition-using-topology-view.html) about this topic. instructions: >- #### To verify the application was successfully created: @@ -83,7 +83,7 @@ spec: review: failedTaskHelp: >- This task isn’t verified yet. Try the task again, or [read - more](https://docs.openshift.com/container-platform/4.14/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.15/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: @@ -124,7 +124,7 @@ spec: review: failedTaskHelp: >- This task isn’t verified yet. Try the task again, or [read - more](https://docs.openshift.com/container-platform/4.14/serverless/eventing/event-sources/serverless-pingsource.html#serverless-pingsource-odc_serverless-pingsource) + more](https://docs.openshift.com/container-platform/4.15/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: @@ -176,7 +176,7 @@ spec: review: failedTaskHelp: >- This task isn’t verified yet. Try the task again, or [read - more](https://docs.openshift.com/container-platform/4.14/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.15/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 @@ -204,7 +204,7 @@ spec: review: failedTaskHelp: >- This task is not verified yet. Try the task again, or [read - more](https://docs.openshift.com/container-platform/4.14/applications/odc-deleting-applications.html) + more](https://docs.openshift.com/container-platform/4.15/applications/odc-deleting-applications.html) about this topic. instructions: |- #### To verify you deleted your application: : diff --git a/olm-catalog/serverless-operator/Dockerfile b/olm-catalog/serverless-operator/Dockerfile index 6f992859e5..a9ad5297b7 100644 --- a/olm-catalog/serverless-operator/Dockerfile +++ b/olm-catalog/serverless-operator/Dockerfile @@ -18,6 +18,6 @@ LABEL \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless Bundle" \ io.k8s.display-name="Red Hat OpenShift Serverless Bundle" \ - com.redhat.openshift.versions="v4.11" \ + com.redhat.openshift.versions="v4.12" \ com.redhat.delivery.operator.bundle=true \ com.redhat.delivery.backport=false diff --git a/olm-catalog/serverless-operator/index/Dockerfile b/olm-catalog/serverless-operator/index/Dockerfile index 5d160fcf25..4f2895cf4b 100644 --- a/olm-catalog/serverless-operator/index/Dockerfile +++ b/olm-catalog/serverless-operator/index/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/origin/4.14:operator-registry AS opm +FROM registry.ci.openshift.org/origin/4.15:operator-registry AS opm FROM registry.access.redhat.com/ubi9/ubi-minimal as builder @@ -17,7 +17,7 @@ RUN /bin/opm render --skip-tls-verify -o yaml registry.ci.openshift.org/knative/ # The base image is expected to contain # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe -FROM quay.io/openshift/origin-operator-registry:4.14 +FROM quay.io/openshift/origin-operator-registry:4.15 # Copy declarative config root into image at /configs COPY --from=builder /configs /configs diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index 530bda6723..e6ed072c5e 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -87,7 +87,7 @@ spec: The components provided with the OpenShift Serverless operator require minimum cluster sizes on OpenShift Container Platform. For more information, see the documentation on [Getting started - with OpenShift Serverless](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/serverless/installing-serverless#install-serverless-operator). + with OpenShift Serverless](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/serverless/installing-serverless#install-serverless-operator). # Supported Features - **Easy to get started:** Provides a simplified developer experience to deploy @@ -155,8 +155,8 @@ spec: # Further Information For documentation on OpenShift Serverless, see: - [Installation - Guide](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/serverless/installing-serverless) - - [Develop Serverless Applications](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/serverless/serving#serverless-applications) + Guide](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/serverless/installing-serverless) + - [Develop Serverless Applications](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/serverless/serving#serverless-applications) icon: - base64data: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzOCIgaGVpZ2h0PSIzOCIgdmlld0JveD0iMCAwIDM4IDM4Ij48ZGVmcz48c3R5bGU+LmF7ZmlsbDojZmZmO30uYntmaWxsOiNlMDA7fTwvc3R5bGU+PC9kZWZzPjxwYXRoIGNsYXNzPSJhIiBkPSJNMjgsMUgxMGE5LDksMCwwLDAtOSw5VjI4YTksOSwwLDAsMCw5LDlIMjhhOSw5LDAsMCwwLDktOVYxMGE5LDksMCwwLDAtOS05WiIvPjxwYXRoIGQ9Ik0yOCwyLjI1QTcuNzU4Nyw3Ljc1ODcsMCwwLDEsMzUuNzUsMTBWMjhBNy43NTg3LDcuNzU4NywwLDAsMSwyOCwzNS43NUgxMEE3Ljc1ODcsNy43NTg3LDAsMCwxLDIuMjUsMjhWMTBBNy43NTg3LDcuNzU4NywwLDAsMSwxMCwyLjI1SDI4TTI4LDFIMTBhOSw5LDAsMCwwLTksOVYyOGE5LDksMCwwLDAsOSw5SDI4YTksOSwwLDAsMCw5LTlWMTBhOSw5LDAsMCwwLTktOVoiLz48cGF0aCBjbGFzcz0iYiIgZD0iTTE0LDIzLjQ3NjZIMTBhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNCwyMy40NzY2Wm0tMy4zNzUtMS4yNWgyLjc1di0yLjc1aC0yLjc1WiIvPjxwYXRoIGNsYXNzPSJiIiBkPSJNMjEsMjMuNDc2NkgxN2EuNjI1My42MjUzLDAsMCwxLS42MjUtLjYyNXYtNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUtLjYyNWg0YS42MjUyLjYyNTIsMCwwLDEsLjYyNS42MjV2NEEuNjI1My42MjUzLDAsMCwxLDIxLDIzLjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0xNy41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNy41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yNC41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwyNC41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yOCwyMy40NzY2SDI0YS42MjUzLjYyNTMsMCwwLDEtLjYyNS0uNjI1di00YS42MjUyLjYyNTIsMCwwLDEsLjYyNS0uNjI1aDRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LjYyNXY0QS42MjUzLjYyNTMsMCwwLDEsMjgsMjMuNDc2NlptLTMuMzc1LTEuMjVoMi43NXYtMi43NWgtMi43NVoiLz48cGF0aCBkPSJNMjksMjYuNDc2Nkg5YS42MjUuNjI1LDAsMCwxLDAtMS4yNUgyOWEuNjI1LjYyNSwwLDAsMSwwLDEuMjVaIi8+PC9zdmc+ mediatype: image/svg+xml @@ -180,7 +180,7 @@ spec: - kafka links: - name: Documentation - url: https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/serverless/index + url: https://access.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/serverless/index - name: Source Repository url: https://github.com/openshift-knative/serverless-operator maintainers: @@ -189,7 +189,7 @@ spec: maturity: stable provider: name: Red Hat - minKubeVersion: 1.24.0 + minKubeVersion: 1.25.0 customresourcedefinitions: owned: - description: A platform for streamlined application deployment, traffic-based auto-scaling from zero to N, and traffic-split rollouts @@ -917,7 +917,7 @@ spec: - name: "IMAGE_DISPATCHER_IMAGE" value: "registry.ci.openshift.org/openshift/knative-eventing-channel-dispatcher:knative-v1.11" - name: "IMAGE_KUBE_RBAC_PROXY" - value: "registry.ci.openshift.org/origin/4.14:kube-rbac-proxy" + value: "registry.ci.openshift.org/origin/4.15:kube-rbac-proxy" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" value: "registry.ci.openshift.org/knative/release-1.11:client-plugin-event-sender" - name: "IMAGE_KN_CLIENT" @@ -1079,7 +1079,7 @@ spec: - name: "IMAGE_DISPATCHER_IMAGE" value: "registry.ci.openshift.org/openshift/knative-eventing-channel-dispatcher:knative-v1.11" - name: "IMAGE_KUBE_RBAC_PROXY" - value: "registry.ci.openshift.org/origin/4.14:kube-rbac-proxy" + value: "registry.ci.openshift.org/origin/4.15:kube-rbac-proxy" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" value: "registry.ci.openshift.org/knative/release-1.11:client-plugin-event-sender" - name: "IMAGE_KN_CLIENT" @@ -1348,7 +1348,7 @@ spec: - name: "IMAGE_DISPATCHER_IMAGE" image: "registry.ci.openshift.org/openshift/knative-eventing-channel-dispatcher:knative-v1.11" - name: "IMAGE_KUBE_RBAC_PROXY" - image: "registry.ci.openshift.org/origin/4.14:kube-rbac-proxy" + image: "registry.ci.openshift.org/origin/4.15:kube-rbac-proxy" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" image: "registry.ci.openshift.org/knative/release-1.11:client-plugin-event-sender" - name: "IMAGE_KN_CLIENT" diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml index cd4e9d6862..a82e97cd69 100644 --- a/olm-catalog/serverless-operator/project.yaml +++ b/olm-catalog/serverless-operator/project.yaml @@ -23,13 +23,13 @@ requirements: # The min version validation in `vendor/knative.dev/pkg/version/version.go` # is ignored as it is overridden by fake version via KUBERNETES_MIN_VERSION. # This value is used for CSV's min version validation. - minVersion: 1.24.0 + minVersion: 1.25.0 golang: '1.21' nodejs: 16.x ocpVersion: - min: '4.11' - max: '4.14' - label: 'v4.11' + min: '4.12' + max: '4.15' + label: 'v4.12' dependencies: serving: knative-v1.11 # serving midstream branch name diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile index 1d7d5ec7bc..e1ca47136e 100644 --- a/openshift/ci-operator/source-image/Dockerfile +++ b/openshift/ci-operator/source-image/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/4.14:cli AS oc-image +FROM registry.ci.openshift.org/ocp/4.15:cli AS oc-image FROM src