diff --git a/must-gather/Dockerfile b/must-gather/Dockerfile index e478722532..4962b3a17f 100755 --- a/must-gather/Dockerfile +++ b/must-gather/Dockerfile @@ -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="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Must Gather" \ @@ -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 diff --git a/olm-catalog/serverless-operator-index/Dockerfile b/olm-catalog/serverless-operator-index/Dockerfile index 8dea38bafa..72db5487c5 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/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 @@ -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 + >> /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 diff --git a/olm-catalog/serverless-operator-index/configs/index.yaml b/olm-catalog/serverless-operator-index/configs/index.yaml index 8b25c876b6..61bd4edcc0 100644 --- a/olm-catalog/serverless-operator-index/configs/index.yaml +++ b/olm-catalog/serverless-operator-index/configs/index.yaml @@ -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 diff --git a/olm-catalog/serverless-operator-index/v4.21/Dockerfile b/olm-catalog/serverless-operator-index/v4.21/Dockerfile new file mode 100644 index 0000000000..a873982a65 --- /dev/null +++ b/olm-catalog/serverless-operator-index/v4.21/Dockerfile @@ -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"] diff --git a/olm-catalog/serverless-operator/Dockerfile b/olm-catalog/serverless-operator/Dockerfile index a208a9cd7d..90f5b3e93a 100644 --- a/olm-catalog/serverless-operator/Dockerfile +++ b/olm-catalog/serverless-operator/Dockerfile @@ -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="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless Bundle" \ @@ -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." diff --git a/olm-catalog/serverless-operator/hack/004-eventing-drop-unsupported-sources.patch b/olm-catalog/serverless-operator/hack/004-eventing-drop-unsupported-sources.patch index 336d98bf4b..4f934e7d12 100644 --- a/olm-catalog/serverless-operator/hack/004-eventing-drop-unsupported-sources.patch +++ b/olm-catalog/serverless-operator/hack/004-eventing-drop-unsupported-sources.patch @@ -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 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 52951f00a3..950c2ba68c 100644 --- a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml +++ b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeeventing_crd.yaml @@ -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. diff --git a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml index 21bc0a70b5..f1f8385d73 100644 --- a/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml +++ b/olm-catalog/serverless-operator/manifests/operator_v1beta1_knativeserving_crd.yaml @@ -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 diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index 9a0b5db85e..cbeb0d40c0 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -77,14 +77,14 @@ metadata: Deploy and manage event-driven serverless applications and functions using Knative. repository: https://github.com/openshift-knative/serverless-operator support: Red Hat - olm.skipRange: '>1.36.1 <1.37.0' - operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:f9923816229a2c745246dd6bd90c69c0c03c7b0f7e44b8a34ff01be6098dcd73 + olm.skipRange: '>1.37.0 <1.38.0' + operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:bd42a1be5ddc5f45c3e982da5d8c04fc5cbf63eeb8d1f90103c3603e5f740689 labels: operatorframework.io/arch.amd64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/arch.arm64: supported - name: serverless-operator.v1.37.0 + name: serverless-operator.v1.38.0 namespace: placeholder spec: # User-facing metadata @@ -104,7 +104,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://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.37/html/serving/getting-started-with-knative-serving#serverless-applications). + with OpenShift Serverless](https://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.38/html/serving/getting-started-with-knative-serving#serverless-applications). # Supported Features - **Easy to get started:** Provides a simplified developer experience to deploy @@ -172,8 +172,8 @@ spec: # Further Information For documentation on OpenShift Serverless, see: - [Installation - Guide](https://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.37/html/installing_openshift_serverless/index) - - [Develop Serverless Applications](https://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.37/html/serving/getting-started-with-knative-serving#serverless-applications) + Guide](https://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.38/html/installing_openshift_serverless/index) + - [Develop Serverless Applications](https://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.38/html/serving/getting-started-with-knative-serving#serverless-applications) icon: - base64data: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzOCIgaGVpZ2h0PSIzOCIgdmlld0JveD0iMCAwIDM4IDM4Ij48ZGVmcz48c3R5bGU+LmF7ZmlsbDojZmZmO30uYntmaWxsOiNlMDA7fTwvc3R5bGU+PC9kZWZzPjxwYXRoIGNsYXNzPSJhIiBkPSJNMjgsMUgxMGE5LDksMCwwLDAtOSw5VjI4YTksOSwwLDAsMCw5LDlIMjhhOSw5LDAsMCwwLDktOVYxMGE5LDksMCwwLDAtOS05WiIvPjxwYXRoIGQ9Ik0yOCwyLjI1QTcuNzU4Nyw3Ljc1ODcsMCwwLDEsMzUuNzUsMTBWMjhBNy43NTg3LDcuNzU4NywwLDAsMSwyOCwzNS43NUgxMEE3Ljc1ODcsNy43NTg3LDAsMCwxLDIuMjUsMjhWMTBBNy43NTg3LDcuNzU4NywwLDAsMSwxMCwyLjI1SDI4TTI4LDFIMTBhOSw5LDAsMCwwLTksOVYyOGE5LDksMCwwLDAsOSw5SDI4YTksOSwwLDAsMCw5LTlWMTBhOSw5LDAsMCwwLTktOVoiLz48cGF0aCBjbGFzcz0iYiIgZD0iTTE0LDIzLjQ3NjZIMTBhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNCwyMy40NzY2Wm0tMy4zNzUtMS4yNWgyLjc1di0yLjc1aC0yLjc1WiIvPjxwYXRoIGNsYXNzPSJiIiBkPSJNMjEsMjMuNDc2NkgxN2EuNjI1My42MjUzLDAsMCwxLS42MjUtLjYyNXYtNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUtLjYyNWg0YS42MjUyLjYyNTIsMCwwLDEsLjYyNS42MjV2NEEuNjI1My42MjUzLDAsMCwxLDIxLDIzLjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0xNy41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNy41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yNC41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwyNC41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yOCwyMy40NzY2SDI0YS42MjUzLjYyNTMsMCwwLDEtLjYyNS0uNjI1di00YS42MjUyLjYyNTIsMCwwLDEsLjYyNS0uNjI1aDRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LjYyNXY0QS42MjUzLjYyNTMsMCwwLDEsMjgsMjMuNDc2NlptLTMuMzc1LTEuMjVoMi43NXYtMi43NWgtMi43NVoiLz48cGF0aCBkPSJNMjksMjYuNDc2Nkg5YS42MjUuNjI1LDAsMCwxLDAtMS4yNUgyOWEuNjI1LjYyNSwwLDAsMSwwLDEuMjVaIi8+PC9zdmc+ mediatype: image/svg+xml @@ -197,7 +197,7 @@ spec: - kafka links: - name: Documentation - url: https://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.37/html/installing_openshift_serverless/index + url: https://docs.redhat.com/en/documentation/red_hat_openshift_serverless/1.38/html/installing_openshift_serverless/index - name: Source Repository url: https://github.com/openshift-knative/serverless-operator maintainers: @@ -836,7 +836,7 @@ spec: serviceAccountName: knative-operator containers: - name: knative-operator - image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:23e10eb061828568dc06cf4d4b3485e8fbd5fe8b711b2424ea954b7e1dd2534f + image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:f27d1657026cb6f8f0d13162a10226412683c37a9c816eaa5486767789c9a6a3 readinessProbe: periodSeconds: 1 httpGet: @@ -965,15 +965,15 @@ spec: - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:13db3b2ff6284a4c41dcc15b720d9f462fcc08086202d112fab1a7b19a9ff6b4" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" - value: "registry.redhat.io/rhel9/buildah@sha256:a3978b1b626897c19e834e27f49e7cd07a3947fc27fd4f6e6a0850d6cc2e0511" + value: "registry.redhat.io/rhel9/buildah@sha256:0bb077206aefdf1cfff4e18428f179903805b0398578746827d353613d1f73ae" - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL" - value: "registry.access.redhat.com/ubi9/nodejs-20-minimal@sha256:badc5c47327f1af2ca2c0d9c68bac4c0a5e3f42bea398fc9654effbefc40b40b" + value: "registry.access.redhat.com/ubi9/nodejs-20-minimal@sha256:af1b05b89e826582445f32c2c656b172b7799511aafc71a09d41ec51b9ac22c7" - name: "IMAGE_KN_PLUGIN_FUNC_OPENJDK_21" - value: "registry.access.redhat.com/ubi9/openjdk-21@sha256:b4f4010269b9783e01dc07ae9461c96f33a20d075b501f131b85e0e604c568ab" + value: "registry.access.redhat.com/ubi9/openjdk-21@sha256:05e7e5b8d2e20f01ddda871f0e41460eaf82aa1bf6c6799ce2e7bdcc638b60f1" - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39" - value: "registry.access.redhat.com/ubi9/python-39@sha256:1985fef5119fbecf1e9746f8e9ae023df82a33c75aaf5b4d6ce570b6a712a267" + value: "registry.access.redhat.com/ubi9/python-39@sha256:6c9426e868f2d5a271054db13a71276c3812afb93ae3096cb66b3e9a03cb3f2a" - name: "CURRENT_VERSION" - value: "1.37.0" + value: "1.38.0" - name: "KNATIVE_SERVING_VERSION" value: "1.17" - name: "KNATIVE_EVENTING_VERSION" @@ -1017,7 +1017,7 @@ spec: - ALL containers: - name: knative-openshift - image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:4d0d56d1ad5c9e958cca5e6f9f77408e2beede8e779f4b8f9f6ed596658f7534 + image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:64e0b8f0b9d8bcc4a116054d2cba55e46761d132fd2c26903af73921bf0d8a9f imagePullPolicy: Always readinessProbe: httpGet: @@ -1155,13 +1155,13 @@ spec: - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:13db3b2ff6284a4c41dcc15b720d9f462fcc08086202d112fab1a7b19a9ff6b4" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" - value: "registry.redhat.io/rhel9/buildah@sha256:a3978b1b626897c19e834e27f49e7cd07a3947fc27fd4f6e6a0850d6cc2e0511" + value: "registry.redhat.io/rhel9/buildah@sha256:0bb077206aefdf1cfff4e18428f179903805b0398578746827d353613d1f73ae" - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL" - value: "registry.access.redhat.com/ubi9/nodejs-20-minimal@sha256:badc5c47327f1af2ca2c0d9c68bac4c0a5e3f42bea398fc9654effbefc40b40b" + value: "registry.access.redhat.com/ubi9/nodejs-20-minimal@sha256:af1b05b89e826582445f32c2c656b172b7799511aafc71a09d41ec51b9ac22c7" - name: "IMAGE_KN_PLUGIN_FUNC_OPENJDK_21" - value: "registry.access.redhat.com/ubi9/openjdk-21@sha256:b4f4010269b9783e01dc07ae9461c96f33a20d075b501f131b85e0e604c568ab" + value: "registry.access.redhat.com/ubi9/openjdk-21@sha256:05e7e5b8d2e20f01ddda871f0e41460eaf82aa1bf6c6799ce2e7bdcc638b60f1" - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39" - value: "registry.access.redhat.com/ubi9/python-39@sha256:1985fef5119fbecf1e9746f8e9ae023df82a33c75aaf5b4d6ce570b6a712a267" + value: "registry.access.redhat.com/ubi9/python-39@sha256:6c9426e868f2d5a271054db13a71276c3812afb93ae3096cb66b3e9a03cb3f2a" - name: "KAFKA_IMAGE_kafka-broker-receiver__kafka-broker-receiver" value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel9@sha256:108488c416e2cb5a3bfb8d5c82f58ec8400e0062048046ec60ee93f22046d287" - name: "KAFKA_IMAGE_kafka-broker-dispatcher__kafka-broker-dispatcher" @@ -1183,7 +1183,7 @@ spec: - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel9@sha256:10bb3cfdc955b2f8684f9258d9980730685d6fa7feada66ef3667acb7bd4cd69" - name: "CURRENT_VERSION" - value: "1.37.0" + value: "1.38.0" - name: "KNATIVE_SERVING_VERSION" value: "1.17" - name: "KNATIVE_EVENTING_VERSION" @@ -1215,7 +1215,7 @@ spec: serviceAccountName: knative-openshift-ingress containers: - name: knative-openshift-ingress - image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:5697cb7c13c4131e33ca73acf47636c9cff5a4adf81a034293d54a63a9c070df + image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:c2c1b5920dcacf078c386aafa90979eb7fc055d6cd49c81a02cbe4d0274de3e8 imagePullPolicy: Always ports: - containerPort: 9090 @@ -1366,11 +1366,11 @@ spec: - knativeeventings.operator.knative.dev relatedImages: - name: "knative-operator" - image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:23e10eb061828568dc06cf4d4b3485e8fbd5fe8b711b2424ea954b7e1dd2534f" + image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:f27d1657026cb6f8f0d13162a10226412683c37a9c816eaa5486767789c9a6a3" - name: "knative-openshift" - image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:4d0d56d1ad5c9e958cca5e6f9f77408e2beede8e779f4b8f9f6ed596658f7534" + image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:64e0b8f0b9d8bcc4a116054d2cba55e46761d132fd2c26903af73921bf0d8a9f" - name: "knative-openshift-ingress" - image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:5697cb7c13c4131e33ca73acf47636c9cff5a4adf81a034293d54a63a9c070df" + image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:c2c1b5920dcacf078c386aafa90979eb7fc055d6cd49c81a02cbe4d0274de3e8" - name: "IMAGE_queue-proxy" image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel9@sha256:ab2c338d505e53dc59b0480e8b1b369bd0808c93ff2a6a9b2600bcdc0d4e98dd" - name: "IMAGE_activator" @@ -1448,13 +1448,13 @@ spec: - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" image: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:13db3b2ff6284a4c41dcc15b720d9f462fcc08086202d112fab1a7b19a9ff6b4" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" - image: "registry.redhat.io/rhel9/buildah@sha256:a3978b1b626897c19e834e27f49e7cd07a3947fc27fd4f6e6a0850d6cc2e0511" + image: "registry.redhat.io/rhel9/buildah@sha256:0bb077206aefdf1cfff4e18428f179903805b0398578746827d353613d1f73ae" - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL" - image: "registry.access.redhat.com/ubi9/nodejs-20-minimal@sha256:badc5c47327f1af2ca2c0d9c68bac4c0a5e3f42bea398fc9654effbefc40b40b" + image: "registry.access.redhat.com/ubi9/nodejs-20-minimal@sha256:af1b05b89e826582445f32c2c656b172b7799511aafc71a09d41ec51b9ac22c7" - name: "IMAGE_KN_PLUGIN_FUNC_OPENJDK_21" - image: "registry.access.redhat.com/ubi9/openjdk-21@sha256:b4f4010269b9783e01dc07ae9461c96f33a20d075b501f131b85e0e604c568ab" + image: "registry.access.redhat.com/ubi9/openjdk-21@sha256:05e7e5b8d2e20f01ddda871f0e41460eaf82aa1bf6c6799ce2e7bdcc638b60f1" - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39" - image: "registry.access.redhat.com/ubi9/python-39@sha256:1985fef5119fbecf1e9746f8e9ae023df82a33c75aaf5b4d6ce570b6a712a267" + image: "registry.access.redhat.com/ubi9/python-39@sha256:6c9426e868f2d5a271054db13a71276c3812afb93ae3096cb66b3e9a03cb3f2a" - name: "KAFKA_IMAGE_kafka-broker-receiver__kafka-broker-receiver" image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel9@sha256:108488c416e2cb5a3bfb8d5c82f58ec8400e0062048046ec60ee93f22046d287" - name: "KAFKA_IMAGE_kafka-broker-dispatcher__kafka-broker-dispatcher" @@ -1476,8 +1476,8 @@ spec: - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel9@sha256:10bb3cfdc955b2f8684f9258d9980730685d6fa7feada66ef3667acb7bd4cd69" - name: "IMAGE_MUST_GATHER" - image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:f9923816229a2c745246dd6bd90c69c0c03c7b0f7e44b8a34ff01be6098dcd73" + image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:bd42a1be5ddc5f45c3e982da5d8c04fc5cbf63eeb8d1f90103c3603e5f740689" - name: "IMAGE_KN_CLIENT_CLI_ARTIFACTS" image: "registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel9@sha256:22766600fde62f23742c1edd50b8e25b8ca1b7f396c2edfe16c5d50dffdeadac" - replaces: serverless-operator.v1.36.1 - version: 1.37.0 + replaces: serverless-operator.v1.37.0 + version: 1.38.0 diff --git a/olm-catalog/serverless-operator/metadata/annotations.yaml b/olm-catalog/serverless-operator/metadata/annotations.yaml index 97b1b12494..92793e59b4 100644 --- a/olm-catalog/serverless-operator/metadata/annotations.yaml +++ b/olm-catalog/serverless-operator/metadata/annotations.yaml @@ -1,6 +1,6 @@ annotations: operators.operatorframework.io.bundle.channel.default.v1: stable - operators.operatorframework.io.bundle.channels.v1: stable,stable-1.37 + operators.operatorframework.io.bundle.channels.v1: stable,stable-1.38 operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.mediatype.v1: registry+v1 operators.operatorframework.io.bundle.metadata.v1: metadata/ diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml index 4db0d5a77e..9fb8512c7c 100644 --- a/olm-catalog/serverless-operator/project.yaml +++ b/olm-catalog/serverless-operator/project.yaml @@ -4,10 +4,10 @@ project: # all components in `dependencies.previous` to the same versions as `dependencies` in the same PR. # Otherwise, the upgrade tests will not pass, as we have a different SO version with the same bundle contents. # Also make sure to update values under `olm.previous` by copying from `olm.replaces` and `olm.skipRange`. - version: 1.37.0 + version: 1.38.0 olm: - replaces: 1.36.1 - skipRange: '>1.36.1 <1.37.0' + replaces: 1.37.0 + skipRange: '>1.37.0 <1.38.0' channels: # The "global" operator default, used as "operators.operatorframework.io.bundle.channels.v1" annotation operator_default: stable @@ -15,18 +15,18 @@ olm: default: stable list: - stable - - stable-1.37 + - stable-1.38 previousBundles: # List of previous bundles to add to the generated index, also used in upgrade tests + - version: 1.37.0 + replaces: 1.36.1 + skipRange: ">=1.36.1 <1.37.0" - version: 1.36.1 replaces: 1.36.0 skipRange: ">=1.36.0 <1.36.1" - version: 1.36.0 replaces: 1.35.0 skipRange: ">=1.35.0 <1.36.0" - - version: 1.35.0 - replaces: 1.34.0 - skipRange: ">=1.34.0 <1.35.0" requirements: kube: # The min version validation in `vendor/knative.dev/pkg/version/version.go` @@ -37,13 +37,12 @@ requirements: nodejs: 20.x ocpVersion: list: - - "4.14" - - "4.15" - "4.16" - "4.17" - "4.18" - "4.19" - "4.20" + - "4.21" min: '4.14' # Version to use for OCP docs links (in CSV or Quickstarts) doc: '4.19' @@ -91,9 +90,9 @@ dependencies: nodejs_20_minimal: registry.access.redhat.com/ubi9/nodejs-20-minimal@sha256:af1b05b89e826582445f32c2c656b172b7799511aafc71a09d41ec51b9ac22c7 openjdk_21: registry.access.redhat.com/ubi9/openjdk-21@sha256:05e7e5b8d2e20f01ddda871f0e41460eaf82aa1bf6c6799ce2e7bdcc638b60f1 python-39: registry.access.redhat.com/ubi9/python-39@sha256:6c9426e868f2d5a271054db13a71276c3812afb93ae3096cb66b3e9a03cb3f2a - operator: 1.17.8 + operator: 1.20.0 # Previous versions required for downgrade testing previous: - serving: knative-v1.16 - eventing: knative-v1.16 - eventing_kafka_broker: knative-v1.16 + serving: knative-v1.17 + eventing: knative-v1.17 + eventing_kafka_broker: knative-v1.17 diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile index 3ba9f50e98..f9b2a2267f 100644 --- a/openshift/ci-operator/source-image/Dockerfile +++ b/openshift/ci-operator/source-image/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/origin/scos-4.20:cli-artifacts AS oc-image +FROM registry.ci.openshift.org/origin/scos-4.21:cli-artifacts AS oc-image FROM src diff --git a/rpms.lock.yaml b/rpms.lock.yaml index bddbf6d5a4..26319cac2d 100644 --- a/rpms.lock.yaml +++ b/rpms.lock.yaml @@ -4,13 +4,13 @@ lockfileVendor: redhat arches: - arch: aarch64 packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.aarch64.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/os/Packages/s/socat-1.7.4.1-8.el9.aarch64.rpm repoid: ubi-9-for-aarch64-appstream-rpms - size: 307871 - checksum: sha256:9f0e56543ef34d3e71895daa16b1b46412d98809ea41046d44c9e1be80fe7966 + size: 307483 + checksum: sha256:4c98bfb9ce0f972e133e7f1ec547e0f87dd901f5213b7e59eafd9befed843884 name: socat - evr: 1.7.4.1-6.el9_6.1 - sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + evr: 1.7.4.1-8.el9 + sourcerpm: socat-1.7.4.1-8.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/r/rsync-3.2.5-3.el9.aarch64.rpm repoid: ubi-9-for-aarch64-baseos-rpms size: 416293 @@ -25,20 +25,20 @@ arches: name: tar evr: 2:1.34-7.el9 sourcerpm: tar-1.34-7.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/t/tzdata-2025b-2.el9.noarch.rpm repoid: ubi-9-for-aarch64-baseos-rpms - size: 862160 - checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 + size: 922567 + checksum: sha256:a1f5f4835bbc277c81e5a2bd0f1639bbb522c6d7029ad707955a0ebe66c41fe6 name: tzdata - evr: 2025b-1.el9 - sourcerpm: tzdata-2025b-1.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/u/unzip-6.0-58.el9_5.aarch64.rpm + evr: 2025b-2.el9 + sourcerpm: tzdata-2025b-2.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/u/unzip-6.0-59.el9.aarch64.rpm repoid: ubi-9-for-aarch64-baseos-rpms - size: 186875 - checksum: sha256:edc9b5c0adcfbe04cbfd4cc6a23d326c82ab816eb1fc521f7e483add8bb2b8cd + size: 182284 + checksum: sha256:dc0b3bbb5e028ae1473afac598705038bb166bf848a3b80e632950746c111ba0 name: unzip - evr: 6.0-58.el9_5 - sourcerpm: unzip-6.0-58.el9_5.src.rpm + evr: 6.0-59.el9 + sourcerpm: unzip-6.0-59.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/z/zip-3.0-35.el9.aarch64.rpm repoid: ubi-9-for-aarch64-baseos-rpms size: 269791 @@ -47,12 +47,12 @@ arches: evr: 3.0-35.el9 sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-8.el9.src.rpm repoid: ubi-9-for-aarch64-appstream-source-rpms - size: 664341 - checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 + size: 664676 + checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83 name: socat - evr: 1.7.4.1-6.el9_6.1 + evr: 1.7.4.1-8.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm repoid: ubi-9-for-aarch64-baseos-source-rpms size: 1306931 @@ -65,18 +65,18 @@ arches: checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar evr: 2:1.34-7.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/t/tzdata-2025b-2.el9.src.rpm repoid: ubi-9-for-aarch64-baseos-source-rpms - size: 904607 - checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 + size: 900065 + checksum: sha256:9324e3b4fa3223e9c42a0185a873c670566b3c656f8492f19d3d5d605a9b921f name: tzdata - evr: 2025b-1.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + evr: 2025b-2.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/u/unzip-6.0-59.el9.src.rpm repoid: ubi-9-for-aarch64-baseos-source-rpms - size: 1436757 - checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + size: 1433595 + checksum: sha256:299d7451195ccb37d8eb90f1870e00eb5ff4c12716c933d4c1657949f0d6aaf8 name: unzip - evr: 6.0-58.el9_5 + evr: 6.0-59.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm repoid: ubi-9-for-aarch64-baseos-source-rpms size: 1137410 @@ -86,13 +86,13 @@ arches: module_metadata: [] - arch: ppc64le packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.ppc64le.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/appstream/os/Packages/s/socat-1.7.4.1-8.el9.ppc64le.rpm repoid: ubi-9-for-ppc64le-appstream-rpms - size: 320029 - checksum: sha256:93b2c5e9fb6987a6658763469ecce247fef2bed03a2b973249cf8134dda8a3c0 + size: 319998 + checksum: sha256:224f47b0e5a9757cc7df97d56910d3bbe9580bbedf7e1d20dd965cabdc5c7b58 name: socat - evr: 1.7.4.1-6.el9_6.1 - sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + evr: 1.7.4.1-8.el9 + sourcerpm: socat-1.7.4.1-8.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/r/rsync-3.2.5-3.el9.ppc64le.rpm repoid: ubi-9-for-ppc64le-baseos-rpms size: 449938 @@ -107,20 +107,20 @@ arches: name: tar evr: 2:1.34-7.el9 sourcerpm: tar-1.34-7.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/t/tzdata-2025b-2.el9.noarch.rpm repoid: ubi-9-for-ppc64le-baseos-rpms - size: 862160 - checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 + size: 922567 + checksum: sha256:a1f5f4835bbc277c81e5a2bd0f1639bbb522c6d7029ad707955a0ebe66c41fe6 name: tzdata - evr: 2025b-1.el9 - sourcerpm: tzdata-2025b-1.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/u/unzip-6.0-58.el9_5.ppc64le.rpm + evr: 2025b-2.el9 + sourcerpm: tzdata-2025b-2.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/u/unzip-6.0-59.el9.ppc64le.rpm repoid: ubi-9-for-ppc64le-baseos-rpms - size: 195024 - checksum: sha256:7b2b6dfa5eb402f02bbec69c096f12404223dab040cda6ae55a927d104d607bb + size: 190400 + checksum: sha256:08da7102308f1ad028360ccdf78d0de9c3ff16c9cdb2aab71d7182f600f933be name: unzip - evr: 6.0-58.el9_5 - sourcerpm: unzip-6.0-58.el9_5.src.rpm + evr: 6.0-59.el9 + sourcerpm: unzip-6.0-59.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/z/zip-3.0-35.el9.ppc64le.rpm repoid: ubi-9-for-ppc64le-baseos-rpms size: 282944 @@ -129,12 +129,12 @@ arches: evr: 3.0-35.el9 sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-8.el9.src.rpm repoid: ubi-9-for-ppc64le-appstream-source-rpms - size: 664341 - checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 + size: 664676 + checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83 name: socat - evr: 1.7.4.1-6.el9_6.1 + evr: 1.7.4.1-8.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm repoid: ubi-9-for-ppc64le-baseos-source-rpms size: 1306931 @@ -147,18 +147,18 @@ arches: checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar evr: 2:1.34-7.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/t/tzdata-2025b-2.el9.src.rpm repoid: ubi-9-for-ppc64le-baseos-source-rpms - size: 904607 - checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 + size: 900065 + checksum: sha256:9324e3b4fa3223e9c42a0185a873c670566b3c656f8492f19d3d5d605a9b921f name: tzdata - evr: 2025b-1.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + evr: 2025b-2.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/u/unzip-6.0-59.el9.src.rpm repoid: ubi-9-for-ppc64le-baseos-source-rpms - size: 1436757 - checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + size: 1433595 + checksum: sha256:299d7451195ccb37d8eb90f1870e00eb5ff4c12716c933d4c1657949f0d6aaf8 name: unzip - evr: 6.0-58.el9_5 + evr: 6.0-59.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm repoid: ubi-9-for-ppc64le-baseos-source-rpms size: 1137410 @@ -168,13 +168,13 @@ arches: module_metadata: [] - arch: s390x packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.s390x.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/appstream/os/Packages/s/socat-1.7.4.1-8.el9.s390x.rpm repoid: ubi-9-for-s390x-appstream-rpms - size: 304533 - checksum: sha256:a253a1f53e95847ee879cda007ad471eeb4d4a6f01b526f5b819bcbf339cd12a + size: 304464 + checksum: sha256:78b7afbffcd7072e7389cfa8a42131da19beaaac1c19af264c7d8a0150ae5077 name: socat - evr: 1.7.4.1-6.el9_6.1 - sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + evr: 1.7.4.1-8.el9 + sourcerpm: socat-1.7.4.1-8.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/r/rsync-3.2.5-3.el9.s390x.rpm repoid: ubi-9-for-s390x-baseos-rpms size: 418877 @@ -189,20 +189,20 @@ arches: name: tar evr: 2:1.34-7.el9 sourcerpm: tar-1.34-7.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/t/tzdata-2025b-2.el9.noarch.rpm repoid: ubi-9-for-s390x-baseos-rpms - size: 862160 - checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 + size: 922567 + checksum: sha256:a1f5f4835bbc277c81e5a2bd0f1639bbb522c6d7029ad707955a0ebe66c41fe6 name: tzdata - evr: 2025b-1.el9 - sourcerpm: tzdata-2025b-1.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/u/unzip-6.0-58.el9_5.s390x.rpm + evr: 2025b-2.el9 + sourcerpm: tzdata-2025b-2.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/u/unzip-6.0-59.el9.s390x.rpm repoid: ubi-9-for-s390x-baseos-rpms - size: 185386 - checksum: sha256:b772da82fd038a447b98428d31ed3d3c3208a4c37960f5d2fadd0070df64d157 + size: 180857 + checksum: sha256:0c4ec86b4b30a4309f6c8649ab3f23d8a351ea82d301e036e27b8dbb08349c13 name: unzip - evr: 6.0-58.el9_5 - sourcerpm: unzip-6.0-58.el9_5.src.rpm + evr: 6.0-59.el9 + sourcerpm: unzip-6.0-59.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/z/zip-3.0-35.el9.s390x.rpm repoid: ubi-9-for-s390x-baseos-rpms size: 276776 @@ -211,12 +211,12 @@ arches: evr: 3.0-35.el9 sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-8.el9.src.rpm repoid: ubi-9-for-s390x-appstream-source-rpms - size: 664341 - checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 + size: 664676 + checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83 name: socat - evr: 1.7.4.1-6.el9_6.1 + evr: 1.7.4.1-8.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm repoid: ubi-9-for-s390x-baseos-source-rpms size: 1306931 @@ -229,18 +229,18 @@ arches: checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar evr: 2:1.34-7.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/t/tzdata-2025b-2.el9.src.rpm repoid: ubi-9-for-s390x-baseos-source-rpms - size: 904607 - checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 + size: 900065 + checksum: sha256:9324e3b4fa3223e9c42a0185a873c670566b3c656f8492f19d3d5d605a9b921f name: tzdata - evr: 2025b-1.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + evr: 2025b-2.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/u/unzip-6.0-59.el9.src.rpm repoid: ubi-9-for-s390x-baseos-source-rpms - size: 1436757 - checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + size: 1433595 + checksum: sha256:299d7451195ccb37d8eb90f1870e00eb5ff4c12716c933d4c1657949f0d6aaf8 name: unzip - evr: 6.0-58.el9_5 + evr: 6.0-59.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm repoid: ubi-9-for-s390x-baseos-source-rpms size: 1137410 @@ -250,13 +250,13 @@ arches: module_metadata: [] - arch: x86_64 packages: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/os/Packages/s/socat-1.7.4.1-6.el9_6.1.x86_64.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/os/Packages/s/socat-1.7.4.1-8.el9.x86_64.rpm repoid: ubi-9-for-x86_64-appstream-rpms - size: 310772 - checksum: sha256:9ac9ded656ee3afbdbf3ac00f5f678101b3461df626998a7bd92f10546345396 + size: 310557 + checksum: sha256:eca1948f706239e3716f721ec077f94afb733c42976fba6e475924a4e3b603aa name: socat - evr: 1.7.4.1-6.el9_6.1 - sourcerpm: socat-1.7.4.1-6.el9_6.1.src.rpm + evr: 1.7.4.1-8.el9 + sourcerpm: socat-1.7.4.1-8.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/r/rsync-3.2.5-3.el9.x86_64.rpm repoid: ubi-9-for-x86_64-baseos-rpms size: 421930 @@ -271,20 +271,20 @@ arches: name: tar evr: 2:1.34-7.el9 sourcerpm: tar-1.34-7.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/t/tzdata-2025b-1.el9.noarch.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/t/tzdata-2025b-2.el9.noarch.rpm repoid: ubi-9-for-x86_64-baseos-rpms - size: 862160 - checksum: sha256:0687e5a1115ba679137404c8d37a45141a31968ffd01677455530d24c126a0d2 + size: 922567 + checksum: sha256:a1f5f4835bbc277c81e5a2bd0f1639bbb522c6d7029ad707955a0ebe66c41fe6 name: tzdata - evr: 2025b-1.el9 - sourcerpm: tzdata-2025b-1.el9.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/u/unzip-6.0-58.el9_5.x86_64.rpm + evr: 2025b-2.el9 + sourcerpm: tzdata-2025b-2.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/u/unzip-6.0-59.el9.x86_64.rpm repoid: ubi-9-for-x86_64-baseos-rpms - size: 190785 - checksum: sha256:009698f3b4432b9df219fd2f894234aad1cee8c4e4e61384b4e293ef8e28e9c2 + size: 186130 + checksum: sha256:1142b2ba41dc0a6d919052337e6c82c07ee1021fa2ed93c7b5e87f986eef41d8 name: unzip - evr: 6.0-58.el9_5 - sourcerpm: unzip-6.0-58.el9_5.src.rpm + evr: 6.0-59.el9 + sourcerpm: unzip-6.0-59.el9.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/z/zip-3.0-35.el9.x86_64.rpm repoid: ubi-9-for-x86_64-baseos-rpms size: 276200 @@ -293,12 +293,12 @@ arches: evr: 3.0-35.el9 sourcerpm: zip-3.0-35.el9.src.rpm source: - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-6.el9_6.1.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/source/SRPMS/Packages/s/socat-1.7.4.1-8.el9.src.rpm repoid: ubi-9-for-x86_64-appstream-source-rpms - size: 664341 - checksum: sha256:cc4dafb6691824cae1db6f8c99baba2e9af74fdab06334f14558272cb3e92832 + size: 664676 + checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83 name: socat - evr: 1.7.4.1-6.el9_6.1 + evr: 1.7.4.1-8.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-3.el9.src.rpm repoid: ubi-9-for-x86_64-baseos-source-rpms size: 1306931 @@ -311,18 +311,18 @@ arches: checksum: sha256:d002c400d29e7305fe8a982ab6b9f49ee7a8780e4574b86fc0c5b3d5510ecb22 name: tar evr: 2:1.34-7.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/t/tzdata-2025b-1.el9.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/t/tzdata-2025b-2.el9.src.rpm repoid: ubi-9-for-x86_64-baseos-source-rpms - size: 904607 - checksum: sha256:a2668d1f6b053545a5824a428755484895d72475a9d3833cbfbec9e08660aba2 + size: 900065 + checksum: sha256:9324e3b4fa3223e9c42a0185a873c670566b3c656f8492f19d3d5d605a9b921f name: tzdata - evr: 2025b-1.el9 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/u/unzip-6.0-58.el9_5.src.rpm + evr: 2025b-2.el9 + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/u/unzip-6.0-59.el9.src.rpm repoid: ubi-9-for-x86_64-baseos-source-rpms - size: 1436757 - checksum: sha256:49de0234c5e8f588c94b435c35225bcccd4cc94bb19cac94110d9aa0c5060f69 + size: 1433595 + checksum: sha256:299d7451195ccb37d8eb90f1870e00eb5ff4c12716c933d4c1657949f0d6aaf8 name: unzip - evr: 6.0-58.el9_5 + evr: 6.0-59.el9 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/z/zip-3.0-35.el9.src.rpm repoid: ubi-9-for-x86_64-baseos-source-rpms size: 1137410 diff --git a/serving/metadata-webhook/config/webhook.yaml b/serving/metadata-webhook/config/webhook.yaml index 443d70cd67..d924720512 100644 --- a/serving/metadata-webhook/config/webhook.yaml +++ b/serving/metadata-webhook/config/webhook.yaml @@ -31,7 +31,7 @@ spec: serviceAccountName: controller containers: - name: webhook - image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/serverless-metadata-webhook:latest + image: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/serverless-metadata-webhook:latest resources: requests: cpu: 20m