diff --git a/go.mod b/go.mod index baead09b25..8d25bdb7dd 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/cloudevents/conformance v0.2.0 // indirect github.com/coreos/go-oidc/v3 v3.9.0 // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect - github.com/go-jose/go-jose/v3 v3.0.3 // indirect + github.com/go-jose/go-jose/v3 v3.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect diff --git a/go.sum b/go.sum index e3a76b89d5..6f9b64dd27 100644 --- a/go.sum +++ b/go.sum @@ -950,8 +950,8 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= -github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY= +github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= diff --git a/olm-catalog/serverless-operator-index/Dockerfile b/olm-catalog/serverless-operator-index/Dockerfile index 825dc92575..456fa9bd96 100644 --- a/olm-catalog/serverless-operator-index/Dockerfile +++ b/olm-catalog/serverless-operator-index/Dockerfile @@ -11,7 +11,7 @@ RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> RUN /bin/opm render --skip-tls-verify -o yaml \ registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle \ registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \ - quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:4cfa306d7c8228567b4519b40141ce3fdcad55f9e62bef9295571f9059ebd897 >> /configs/index.yaml + quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:88f3379dd38858009d8f0936d98d91f7359b8e2f072d94fda9e470515ea66867 >> /configs/index.yaml # The base image is expected to contain # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index c88c56506f..635a952326 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -72,7 +72,7 @@ metadata: repository: https://github.com/openshift-knative/serverless-operator support: Red Hat olm.skipRange: '>=1.35.0 <1.36.0' - operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:b2db3222074e1d20ed65c01d2e719a06d37e7f72568de8148174809bf6350f5f + operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:0165c782e20df165c39d69f196f83275de23210fc6218430a4fc7d82d74d7c0a labels: operatorframework.io/arch.amd64: supported operatorframework.io/arch.ppc64le: supported @@ -830,7 +830,7 @@ spec: serviceAccountName: knative-operator containers: - name: knative-operator - image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:b2d8b7a81ef0650d543ea40fdb9b10a802b1e51c6c3ae1e199db9ab67bba2dc4 + image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:ad8f53b22919a72d24bcacbf50483e541fec759e5450ef672784e3b327e7bda7 readinessProbe: periodSeconds: 1 httpGet: @@ -901,45 +901,45 @@ spec: - name: "IMAGE_net-kourier-controller__controller" value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:02dda870185898a5e1a68908e4422754644b8cee72ce7b0e4d3c1237e655b5a5" - name: "IMAGE_net-istio-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:a8cbbbf39abbde166a4d33aebcee7f1567b88bf5aa40989b420db7320279e46e" + value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:57a4a0c3ecd5fde6fcd258240596a6a6115a0fff0707551c71b0b128c8e85a56" - name: "IMAGE_net-istio-webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:f6954a10ffc1b90d3f3148395589cf6abdd3bf639bd6bab078f1e6e4c454074c" + value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:0e78d72fc95edaec51c333e0f4a3358fdc5c7fc311ec24c7c3a4c4d97ab2c099" - name: "IMAGE_eventing-controller__eventing-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:1faf91bb7ad2ae1c1fc4c25e8383a9d0dda686ffaa273c6220470a6c3eeffb55" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:3126a1463aa2dbfd698be75f9317c434bd08b25093a5606ec3ab945bb2c48786" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:2dbd2c3ca7911caa1d702d7325558166f969e8ad96ac6ed72cef291f638ef7a4" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:63d66d4c0f2e8c24eec8a3abc1c6a3b2a16f52b5b2cbd7179fa6160c87239aa3" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:d5dd239b7259618059ae5ab394b8b80c33801fed3243fd81cc89e9e75b32b6cc" - name: "IMAGE_storage-version-migration-eventing-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:64eb2ef26f816fce7eca875a20dcf8eb3da7c5302cb9ce9279fd84c01ff81713" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:0005157076fa8d66788ef09b278ae80898524adc6bd913839a1b6de2d89457b0" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:63dcf61f32b43e9d54749f0653cbacfeeff67288a211e8bf5884ad0691c620b5" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:3e2fb69b67a882b8328a51b869f22e1feba272257116aeb824feee0ebdf7748f" - name: "IMAGE_mt-broker-filter__filter" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:9a52aef16f7e845a507a52982d811e756212424f8af643fe141e97f3df8ad526" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:1ec61af53a7a78a7b5bcb680fdde359dfc5ad81ac9ed5f4a045eee84db7f2f2f" - name: "IMAGE_mt-broker-ingress__ingress" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:af0b3b284593f3591d4c865d23b8f865cf5e93af7bfea8021102596044201b87" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:872a9e118c3cd5a49e9879a3b70645ed369184a617829819711224e340572a51" - name: "IMAGE_imc-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:c6e3c9205f40a137cc36529cfce0d0b0676ff371e41cd5a25a02721478f59de1" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:f824059727daed35c3b822415a9b04ab0985928e198a377ba944100b04bc43ef" - name: "IMAGE_imc-dispatcher__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:4c6df8a9e8f3228012e61605305851b62cec2e065d9167204bbceda799d6d250" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:a42f62c5ce1f849ba0642d7db7fa344a9bd98ab4455577cdd0054e21153d0758" - name: "IMAGE_pingsource-mt-adapter__dispatcher" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:f72a2d212323cad2f92263d65cc51efe978909ee6a4654963c2e0fce12d552c9" - name: "IMAGE_APISERVER_RA_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:5aac1c81e64392a57be60dd9b0bff9a9787afdb54f88deae7b056b6e4f826b08" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:ec9a23d2f2af5f03ab3ca298e3b362b80a77d54918149cd69bd251e63ad1289a" - name: "IMAGE_DISPATCHER_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:4c6df8a9e8f3228012e61605305851b62cec2e065d9167204bbceda799d6d250" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:a42f62c5ce1f849ba0642d7db7fa344a9bd98ab4455577cdd0054e21153d0758" - name: "IMAGE_job-sink__job-sink" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:b8eccfd384feecef5ebc4152ecd098a594dd3fb07ae1fdd816f0b4b85e6ca84d" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:8ded4bd28d21ea5787f18db70af38bf815e46accbe4935801b646b7b22cf8182" - name: "IMAGE_eventmesh-backend__controller" value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:5ddea659e101f60f173c5c8c7ae3a89c2a4c3170f5a7c5efbb6374048f6102c7" - name: "IMAGE_KUBE_RBAC_PROXY" - value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5b67b8c6cb34967feb1c504007f4f5914b0ebb2898e5ff725b14386af9752533" + value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:777353be80c0d22834cb1abb5162b48fdacbd488e10d69d99ccc4573e63ef07b" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:6734d00ca57488775cc7bfe386d2cc072f19828bdf95e37acedefe621f22daa6" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:58e3ccea5c558575fe4adc6f5f6d570ebec0934de1ba1110bc32fe76fb379c7e" - name: "IMAGE_KN_CLIENT" value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:cf4b9a3527442ab27cce1caac9c2884a752928b0592c2e400b7e6d356de09926" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:c98b5fc5a281e123f4a25a94c188ebeced3e8760b9d1a8a1b0741b97e0f60d3d" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:c8388a5d8b37c7e87909848c2d655d56642fed7b791e4e3be9ecf19f216d4f50" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" value: "registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74" - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL" @@ -993,7 +993,7 @@ spec: - ALL containers: - name: knative-openshift - image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:e226da53ddd7c63cf538359135018e9db5ac7be8ba42a02114da770b137114e7 + image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:06b9850c6c8c99808e54baa358c4b6346a3fe0311910d8197ff56126a3925ead imagePullPolicy: Always readinessProbe: httpGet: @@ -1073,45 +1073,45 @@ spec: - name: "IMAGE_net-kourier-controller__controller" value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:02dda870185898a5e1a68908e4422754644b8cee72ce7b0e4d3c1237e655b5a5" - name: "IMAGE_net-istio-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:a8cbbbf39abbde166a4d33aebcee7f1567b88bf5aa40989b420db7320279e46e" + value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:57a4a0c3ecd5fde6fcd258240596a6a6115a0fff0707551c71b0b128c8e85a56" - name: "IMAGE_net-istio-webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:f6954a10ffc1b90d3f3148395589cf6abdd3bf639bd6bab078f1e6e4c454074c" + value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:0e78d72fc95edaec51c333e0f4a3358fdc5c7fc311ec24c7c3a4c4d97ab2c099" - name: "IMAGE_eventing-controller__eventing-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:1faf91bb7ad2ae1c1fc4c25e8383a9d0dda686ffaa273c6220470a6c3eeffb55" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:3126a1463aa2dbfd698be75f9317c434bd08b25093a5606ec3ab945bb2c48786" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:2dbd2c3ca7911caa1d702d7325558166f969e8ad96ac6ed72cef291f638ef7a4" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:63d66d4c0f2e8c24eec8a3abc1c6a3b2a16f52b5b2cbd7179fa6160c87239aa3" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:d5dd239b7259618059ae5ab394b8b80c33801fed3243fd81cc89e9e75b32b6cc" - name: "IMAGE_storage-version-migration-eventing-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:64eb2ef26f816fce7eca875a20dcf8eb3da7c5302cb9ce9279fd84c01ff81713" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:0005157076fa8d66788ef09b278ae80898524adc6bd913839a1b6de2d89457b0" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:63dcf61f32b43e9d54749f0653cbacfeeff67288a211e8bf5884ad0691c620b5" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:3e2fb69b67a882b8328a51b869f22e1feba272257116aeb824feee0ebdf7748f" - name: "IMAGE_mt-broker-filter__filter" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:9a52aef16f7e845a507a52982d811e756212424f8af643fe141e97f3df8ad526" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:1ec61af53a7a78a7b5bcb680fdde359dfc5ad81ac9ed5f4a045eee84db7f2f2f" - name: "IMAGE_mt-broker-ingress__ingress" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:af0b3b284593f3591d4c865d23b8f865cf5e93af7bfea8021102596044201b87" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:872a9e118c3cd5a49e9879a3b70645ed369184a617829819711224e340572a51" - name: "IMAGE_imc-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:c6e3c9205f40a137cc36529cfce0d0b0676ff371e41cd5a25a02721478f59de1" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:f824059727daed35c3b822415a9b04ab0985928e198a377ba944100b04bc43ef" - name: "IMAGE_imc-dispatcher__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:4c6df8a9e8f3228012e61605305851b62cec2e065d9167204bbceda799d6d250" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:a42f62c5ce1f849ba0642d7db7fa344a9bd98ab4455577cdd0054e21153d0758" - name: "IMAGE_pingsource-mt-adapter__dispatcher" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:f72a2d212323cad2f92263d65cc51efe978909ee6a4654963c2e0fce12d552c9" - name: "IMAGE_APISERVER_RA_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:5aac1c81e64392a57be60dd9b0bff9a9787afdb54f88deae7b056b6e4f826b08" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:ec9a23d2f2af5f03ab3ca298e3b362b80a77d54918149cd69bd251e63ad1289a" - name: "IMAGE_DISPATCHER_IMAGE" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:4c6df8a9e8f3228012e61605305851b62cec2e065d9167204bbceda799d6d250" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:a42f62c5ce1f849ba0642d7db7fa344a9bd98ab4455577cdd0054e21153d0758" - name: "IMAGE_job-sink__job-sink" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:b8eccfd384feecef5ebc4152ecd098a594dd3fb07ae1fdd816f0b4b85e6ca84d" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:8ded4bd28d21ea5787f18db70af38bf815e46accbe4935801b646b7b22cf8182" - name: "IMAGE_eventmesh-backend__controller" value: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:5ddea659e101f60f173c5c8c7ae3a89c2a4c3170f5a7c5efbb6374048f6102c7" - name: "IMAGE_KUBE_RBAC_PROXY" - value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5b67b8c6cb34967feb1c504007f4f5914b0ebb2898e5ff725b14386af9752533" + value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:777353be80c0d22834cb1abb5162b48fdacbd488e10d69d99ccc4573e63ef07b" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:6734d00ca57488775cc7bfe386d2cc072f19828bdf95e37acedefe621f22daa6" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:58e3ccea5c558575fe4adc6f5f6d570ebec0934de1ba1110bc32fe76fb379c7e" - name: "IMAGE_KN_CLIENT" value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:cf4b9a3527442ab27cce1caac9c2884a752928b0592c2e400b7e6d356de09926" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:c98b5fc5a281e123f4a25a94c188ebeced3e8760b9d1a8a1b0741b97e0f60d3d" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:c8388a5d8b37c7e87909848c2d655d56642fed7b791e4e3be9ecf19f216d4f50" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" value: "registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74" - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL" @@ -1139,7 +1139,7 @@ spec: - name: "KAFKA_IMAGE_kafka-controller-post-install__post-install" value: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:0f37899e1cd639df2fc7a6af92191bb294753412628c92a57bee30580d5177ea" - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:64eb2ef26f816fce7eca875a20dcf8eb3da7c5302cb9ce9279fd84c01ff81713" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:0005157076fa8d66788ef09b278ae80898524adc6bd913839a1b6de2d89457b0" - name: "CURRENT_VERSION" value: "1.36.0" - name: "KNATIVE_SERVING_VERSION" @@ -1173,7 +1173,7 @@ spec: serviceAccountName: knative-openshift-ingress containers: - name: knative-openshift-ingress - image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:0dafb61ac0c9bfe4871434c25187821a0d5c05668d28cce219847e51ad1ca60d + image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:8e248e0d38062e24eb0d987f35a59641aa0a693eb2d51cfceebd805af55881fd imagePullPolicy: Always ports: - containerPort: 9090 @@ -1324,11 +1324,11 @@ spec: - knativeeventings.operator.knative.dev relatedImages: - name: "knative-operator" - image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:b2d8b7a81ef0650d543ea40fdb9b10a802b1e51c6c3ae1e199db9ab67bba2dc4" + image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:ad8f53b22919a72d24bcacbf50483e541fec759e5450ef672784e3b327e7bda7" - name: "knative-openshift" - image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:e226da53ddd7c63cf538359135018e9db5ac7be8ba42a02114da770b137114e7" + image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:06b9850c6c8c99808e54baa358c4b6346a3fe0311910d8197ff56126a3925ead" - name: "knative-openshift-ingress" - image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:0dafb61ac0c9bfe4871434c25187821a0d5c05668d28cce219847e51ad1ca60d" + image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:8e248e0d38062e24eb0d987f35a59641aa0a693eb2d51cfceebd805af55881fd" - name: "IMAGE_queue-proxy" image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:4395305e06fb3de572dcc3d6b0f3070b61e6221f20228bac1175ff9355c6b372" - name: "IMAGE_activator" @@ -1348,45 +1348,45 @@ spec: - name: "IMAGE_net-kourier-controller__controller" image: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:02dda870185898a5e1a68908e4422754644b8cee72ce7b0e4d3c1237e655b5a5" - name: "IMAGE_net-istio-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:a8cbbbf39abbde166a4d33aebcee7f1567b88bf5aa40989b420db7320279e46e" + image: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:57a4a0c3ecd5fde6fcd258240596a6a6115a0fff0707551c71b0b128c8e85a56" - name: "IMAGE_net-istio-webhook__webhook" - image: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:f6954a10ffc1b90d3f3148395589cf6abdd3bf639bd6bab078f1e6e4c454074c" + image: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:0e78d72fc95edaec51c333e0f4a3358fdc5c7fc311ec24c7c3a4c4d97ab2c099" - name: "IMAGE_eventing-controller__eventing-controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:1faf91bb7ad2ae1c1fc4c25e8383a9d0dda686ffaa273c6220470a6c3eeffb55" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:3126a1463aa2dbfd698be75f9317c434bd08b25093a5606ec3ab945bb2c48786" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:2dbd2c3ca7911caa1d702d7325558166f969e8ad96ac6ed72cef291f638ef7a4" - name: "IMAGE_eventing-webhook__eventing-webhook" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:63d66d4c0f2e8c24eec8a3abc1c6a3b2a16f52b5b2cbd7179fa6160c87239aa3" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:d5dd239b7259618059ae5ab394b8b80c33801fed3243fd81cc89e9e75b32b6cc" - name: "IMAGE_storage-version-migration-eventing-__migrate" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:64eb2ef26f816fce7eca875a20dcf8eb3da7c5302cb9ce9279fd84c01ff81713" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:0005157076fa8d66788ef09b278ae80898524adc6bd913839a1b6de2d89457b0" - name: "IMAGE_mt-broker-controller__mt-broker-controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:63dcf61f32b43e9d54749f0653cbacfeeff67288a211e8bf5884ad0691c620b5" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtchannel-broker-rhel8@sha256:3e2fb69b67a882b8328a51b869f22e1feba272257116aeb824feee0ebdf7748f" - name: "IMAGE_mt-broker-filter__filter" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:9a52aef16f7e845a507a52982d811e756212424f8af643fe141e97f3df8ad526" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-filter-rhel8@sha256:1ec61af53a7a78a7b5bcb680fdde359dfc5ad81ac9ed5f4a045eee84db7f2f2f" - name: "IMAGE_mt-broker-ingress__ingress" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:af0b3b284593f3591d4c865d23b8f865cf5e93af7bfea8021102596044201b87" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-ingress-rhel8@sha256:872a9e118c3cd5a49e9879a3b70645ed369184a617829819711224e340572a51" - name: "IMAGE_imc-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:c6e3c9205f40a137cc36529cfce0d0b0676ff371e41cd5a25a02721478f59de1" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-controller-rhel8@sha256:f824059727daed35c3b822415a9b04ab0985928e198a377ba944100b04bc43ef" - name: "IMAGE_imc-dispatcher__dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:4c6df8a9e8f3228012e61605305851b62cec2e065d9167204bbceda799d6d250" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:a42f62c5ce1f849ba0642d7db7fa344a9bd98ab4455577cdd0054e21153d0758" - name: "IMAGE_pingsource-mt-adapter__dispatcher" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:f72a2d212323cad2f92263d65cc51efe978909ee6a4654963c2e0fce12d552c9" - name: "IMAGE_APISERVER_RA_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:5aac1c81e64392a57be60dd9b0bff9a9787afdb54f88deae7b056b6e4f826b08" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:ec9a23d2f2af5f03ab3ca298e3b362b80a77d54918149cd69bd251e63ad1289a" - name: "IMAGE_DISPATCHER_IMAGE" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:4c6df8a9e8f3228012e61605305851b62cec2e065d9167204bbceda799d6d250" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:a42f62c5ce1f849ba0642d7db7fa344a9bd98ab4455577cdd0054e21153d0758" - name: "IMAGE_job-sink__job-sink" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:b8eccfd384feecef5ebc4152ecd098a594dd3fb07ae1fdd816f0b4b85e6ca84d" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-jobsink-rhel8@sha256:8ded4bd28d21ea5787f18db70af38bf815e46accbe4935801b646b7b22cf8182" - name: "IMAGE_eventmesh-backend__controller" image: "registry.redhat.io/openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel8@sha256:5ddea659e101f60f173c5c8c7ae3a89c2a4c3170f5a7c5efbb6374048f6102c7" - name: "IMAGE_KUBE_RBAC_PROXY" - image: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5b67b8c6cb34967feb1c504007f4f5914b0ebb2898e5ff725b14386af9752533" + image: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:777353be80c0d22834cb1abb5162b48fdacbd488e10d69d99ccc4573e63ef07b" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" - image: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:6734d00ca57488775cc7bfe386d2cc072f19828bdf95e37acedefe621f22daa6" + image: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:58e3ccea5c558575fe4adc6f5f6d570ebec0934de1ba1110bc32fe76fb379c7e" - name: "IMAGE_KN_CLIENT" image: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:cf4b9a3527442ab27cce1caac9c2884a752928b0592c2e400b7e6d356de09926" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" - image: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:c98b5fc5a281e123f4a25a94c188ebeced3e8760b9d1a8a1b0741b97e0f60d3d" + image: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:c8388a5d8b37c7e87909848c2d655d56642fed7b791e4e3be9ecf19f216d4f50" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" image: "registry.redhat.io/rhel8/buildah@sha256:3d505d9c0f5d4cd5a4ec03b8d038656c6cdbdf5191e00ce6388f7e0e4d2f1b74" - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_20_MINIMAL" @@ -1414,9 +1414,9 @@ spec: - name: "KAFKA_IMAGE_kafka-controller-post-install__post-install" image: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:0f37899e1cd639df2fc7a6af92191bb294753412628c92a57bee30580d5177ea" - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:64eb2ef26f816fce7eca875a20dcf8eb3da7c5302cb9ce9279fd84c01ff81713" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:0005157076fa8d66788ef09b278ae80898524adc6bd913839a1b6de2d89457b0" - name: "IMAGE_MUST_GATHER" - image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:b2db3222074e1d20ed65c01d2e719a06d37e7f72568de8148174809bf6350f5f" + image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:0165c782e20df165c39d69f196f83275de23210fc6218430a4fc7d82d74d7c0a" - name: "IMAGE_KN_CLIENT_CLI_ARTIFACTS" image: "registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8@sha256:18465b70c7c98bef43defb3156640aa0efacde9fe63c8575a98d9dc5c8eca6b1" replaces: serverless-operator.v1.35.0 diff --git a/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/2-eventing-core.yaml b/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/2-eventing-core.yaml index 997484ebc0..6389720cc9 100644 --- a/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/2-eventing-core.yaml +++ b/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/2-eventing-core.yaml @@ -684,6 +684,32 @@ rules: - "delete" - "patch" - "watch" + + - apiGroups: + - "cert-manager.io" + resources: + - "certificates" + verbs: + - "get" + - "list" + - "create" + - "update" + - "delete" + - "patch" + - "watch" + + - apiGroups: + - "acme.cert-manager.io" + resources: + - "challenges" + verbs: + - "get" + - "list" + - "create" + - "update" + - "delete" + - "patch" + - "watch" --- # Copyright 2024 The Knative Authors # @@ -6760,6 +6786,23 @@ data: backoffPolicy: exponential backoffDelay: PT0.2S --- +apiVersion: v1 +kind: ConfigMap +metadata: + name: eventing-integrations-images + namespace: knative-eventing + labels: + app.kubernetes.io/version: "v20250220-98eb037" +data: + aws-s3-sink: gcr.io/knative-nightly/aws-s3-sink@sha256:c14c49821ccf59b8584a13523ea04a164c418fdb899e584809a2d4cb5de1ef76 + aws-sqs-source: gcr.io/knative-nightly/aws-sqs-source@sha256:03c355c8d91db9dbc97b076734a61c0ccc283f84b67e03541fec675c9e5f899d + aws-sns-sink: gcr.io/knative-nightly/aws-sns-sink@sha256:4c8972ccea48ac2823bbc6e44f3b0b9a1daeb0b5727c08fe25e8992a0c9673c2 + timer-source: gcr.io/knative-nightly/timer-source@sha256:4270869170ab6a0d717d7a904f47fdd7899b1fc8d9a1457b68de5ff8e667a4ed + aws-ddb-streams-source: gcr.io/knative-nightly/aws-ddb-streams-source@sha256:9670cc0ab31113d244176f3490082e5ea155d64ab7d3dcaeb5027e40cb9c9859 + aws-s3-source: gcr.io/knative-nightly/aws-s3-source@sha256:1d6bdd165da87126cfb6a9f9e90e7343a6a4a768415627ef060d2727e46b4f59 + log-sink: gcr.io/knative-nightly/log-sink@sha256:15be39524a6467367c5d21a15642a972047d929555f79b4d26f0188060cc03cd + aws-sqs-sink: gcr.io/knative-nightly/aws-sqs-sink@sha256:d6d962fc3d6af2ec0456319785ed97f22399fbeff562f8bb1a5bce71be1b6970 +--- # Copyright 2021 The Knative Authors # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -7091,6 +7134,54 @@ spec: fieldPath: metadata.name + - name: INTEGRATION_SOURCE_TIMER_IMAGE + valueFrom: + configMapKeyRef: + key: timer-source + name: eventing-integrations-images + + - name: INTEGRATION_SOURCE_AWS_S3_IMAGE + valueFrom: + configMapKeyRef: + key: aws-s3-source + name: eventing-integrations-images + + - name: INTEGRATION_SOURCE_AWS_SQS_IMAGE + valueFrom: + configMapKeyRef: + key: aws-sqs-source + name: eventing-integrations-images + + - name: INTEGRATION_SOURCE_AWS_DDB_STREAMS_IMAGE + valueFrom: + configMapKeyRef: + key: aws-ddb-streams-source + name: eventing-integrations-images + + - name: INTEGRATION_SINK_LOG_IMAGE + valueFrom: + configMapKeyRef: + key: log-sink + name: eventing-integrations-images + + - name: INTEGRATION_SINK_AWS_S3_IMAGE + valueFrom: + configMapKeyRef: + key: aws-s3-sink + name: eventing-integrations-images + + - name: INTEGRATION_SINK_AWS_SQS_IMAGE + valueFrom: + configMapKeyRef: + key: aws-sqs-sink + name: eventing-integrations-images + + - name: INTEGRATION_SINK_AWS_SNS_IMAGE + valueFrom: + configMapKeyRef: + key: aws-sns-sink + name: eventing-integrations-images + ## Adapter settings # - name: K_LOGGING_CONFIG # value: '' diff --git a/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/6-eventing-tls-networking.yaml b/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/6-eventing-tls-networking.yaml index 510950dc1b..87861c0419 100644 --- a/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/6-eventing-tls-networking.yaml +++ b/openshift-knative-operator/cmd/openshift-knative-operator/kodata/knative-eventing/latest/6-eventing-tls-networking.yaml @@ -13,55 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: integration-sink-server-tls - namespace: knative-eventing -spec: - # Secret names are always required. - secretName: integration-sink-server-tls - - secretTemplate: - labels: - app.kubernetes.io/component: integration-sink - app.kubernetes.io/name: knative-eventing - - # Use 0m0s so that we don't run into https://github.com/cert-manager/cert-manager/issues/6408 on the operator - duration: 2160h0m0s # 90d - renewBefore: 360h0m0s # 15d - subject: - organizations: - - local - privateKey: - algorithm: RSA - encoding: PKCS1 - size: 2048 - rotationPolicy: Always - - dnsNames: - - integration-sink.knative-eventing.svc.cluster.local - - integration-sink.knative-eventing.svc - - issuerRef: - name: knative-eventing-ca-issuer - kind: ClusterIssuer - group: cert-manager.io ---- -# Copyright 2023 The Knative Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: cert-manager.io/v1 kind: Certificate metadata: diff --git a/rpms.lock.yaml b/rpms.lock.yaml index c1bfc87871..464652c2db 100644 --- a/rpms.lock.yaml +++ b/rpms.lock.yaml @@ -67,13 +67,13 @@ arches: name: socat evr: 1.7.4.1-1.el8 sourcerpm: socat-1.7.4.1-1.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/r/rsync-3.1.3-20.el8_10.ppc64le.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/r/rsync-3.1.3-21.el8_10.ppc64le.rpm repoid: ubi-8-baseos-rpms - size: 442812 - checksum: sha256:1429409eee3a0ebca5a83925f0faebcc7f224702f028402199f3aef740af3af6 + size: 443544 + checksum: sha256:13fc835eb33dbf991d34cc204f79fb84938176ea53442073187178818823e373 name: rsync - evr: 3.1.3-20.el8_10 - sourcerpm: rsync-3.1.3-20.el8_10.src.rpm + evr: 3.1.3-21.el8_10 + sourcerpm: rsync-3.1.3-21.el8_10.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-9.el8.ppc64le.rpm repoid: ubi-8-baseos-rpms size: 878620 @@ -95,12 +95,12 @@ arches: checksum: sha256:fde85ccbec9a4dabe98d7cf695d394f43fad1ec9b03c167f97430d6eb724b946 name: socat evr: 1.7.4.1-1.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/r/rsync-3.1.3-20.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/r/rsync-3.1.3-21.el8_10.src.rpm repoid: ubi-8-baseos-source - size: 1146276 - checksum: sha256:5b263e146671b0e3e3869a9c04e187b317d40cf71942df47711810402f85f516 + size: 1149684 + checksum: sha256:8dd8cd91786a1a30835e61c75f2f56b0449680583cff5be4e396fd82bfaab7c1 name: rsync - evr: 3.1.3-20.el8_10 + evr: 3.1.3-21.el8_10 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.30-9.el8.src.rpm repoid: ubi-8-baseos-source size: 2169236 @@ -179,13 +179,13 @@ arches: name: socat evr: 1.7.4.1-1.el8 sourcerpm: socat-1.7.4.1-1.el8.src.rpm - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/r/rsync-3.1.3-20.el8_10.x86_64.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/r/rsync-3.1.3-21.el8_10.x86_64.rpm repoid: ubi-8-baseos-rpms - size: 420268 - checksum: sha256:724036dda8f8d1df70f19e56bff6d5a19b5b5c48f7ebcb266c7ec82e65a876d2 + size: 420856 + checksum: sha256:c65fc8397e47b5c9a3e3ca8b1aca7136a1534ecbfb76884bdc0dde075e1f990b name: rsync - evr: 3.1.3-20.el8_10 - sourcerpm: rsync-3.1.3-20.el8_10.src.rpm + evr: 3.1.3-21.el8_10 + sourcerpm: rsync-3.1.3-21.el8_10.src.rpm - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-9.el8.x86_64.rpm repoid: ubi-8-baseos-rpms size: 858812 @@ -207,12 +207,12 @@ arches: checksum: sha256:fde85ccbec9a4dabe98d7cf695d394f43fad1ec9b03c167f97430d6eb724b946 name: socat evr: 1.7.4.1-1.el8 - - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/r/rsync-3.1.3-20.el8_10.src.rpm + - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/r/rsync-3.1.3-21.el8_10.src.rpm repoid: ubi-8-baseos-source - size: 1146276 - checksum: sha256:5b263e146671b0e3e3869a9c04e187b317d40cf71942df47711810402f85f516 + size: 1149684 + checksum: sha256:8dd8cd91786a1a30835e61c75f2f56b0449680583cff5be4e396fd82bfaab7c1 name: rsync - evr: 3.1.3-20.el8_10 + evr: 3.1.3-21.el8_10 - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS/Packages/t/tar-1.30-9.el8.src.rpm repoid: ubi-8-baseos-source size: 2169236 diff --git a/test/images-rekt.yaml b/test/images-rekt.yaml index 99192ec7a3..85473cddd8 100644 --- a/test/images-rekt.yaml +++ b/test/images-rekt.yaml @@ -1,2 +1,2 @@ knative.dev/reconciler-test/cmd/eventshub: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-eventing-test-eventshub@sha256:e3540f829a0bc162e50e5785cf5d728bfaf7c1222ad5f6a98b06287996bab7af -knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-eventing-heartbeats@sha256:cc7ca5fafda0c368f42ce521187f2868bb0a9be4ff9ef9793c24d1bb452b54dd +knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/kn-eventing-heartbeats@sha256:0c799b3140a9401e73afc96f82b239c23fc0e6994c15a7e03501cd24cf9e9722 diff --git a/vendor/github.com/go-jose/go-jose/v3/jwe.go b/vendor/github.com/go-jose/go-jose/v3/jwe.go index 4267ac7502..1ba4ae0c00 100644 --- a/vendor/github.com/go-jose/go-jose/v3/jwe.go +++ b/vendor/github.com/go-jose/go-jose/v3/jwe.go @@ -202,10 +202,11 @@ func (parsed *rawJSONWebEncryption) sanitized() (*JSONWebEncryption, error) { // parseEncryptedCompact parses a message in compact format. func parseEncryptedCompact(input string) (*JSONWebEncryption, error) { - parts := strings.Split(input, ".") - if len(parts) != 5 { + // Five parts is four separators + if strings.Count(input, ".") != 4 { return nil, fmt.Errorf("go-jose/go-jose: compact JWE format must have five parts") } + parts := strings.SplitN(input, ".", 5) rawProtected, err := base64URLDecode(parts[0]) if err != nil { diff --git a/vendor/github.com/go-jose/go-jose/v3/jws.go b/vendor/github.com/go-jose/go-jose/v3/jws.go index e37007dbb8..401fc18ac4 100644 --- a/vendor/github.com/go-jose/go-jose/v3/jws.go +++ b/vendor/github.com/go-jose/go-jose/v3/jws.go @@ -275,10 +275,11 @@ func (parsed *rawJSONWebSignature) sanitized() (*JSONWebSignature, error) { // parseSignedCompact parses a message in compact format. func parseSignedCompact(input string, payload []byte) (*JSONWebSignature, error) { - parts := strings.Split(input, ".") - if len(parts) != 3 { + // Three parts is two separators + if strings.Count(input, ".") != 2 { return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts") } + parts := strings.SplitN(input, ".", 3) if parts[1] != "" && payload != nil { return nil, fmt.Errorf("go-jose/go-jose: payload is not detached") diff --git a/vendor/modules.txt b/vendor/modules.txt index feab0ee437..3a6b57dcfa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -96,7 +96,7 @@ github.com/evanphx/json-patch/v5/internal/json # github.com/fsnotify/fsnotify v1.7.0 ## explicit; go 1.17 github.com/fsnotify/fsnotify -# github.com/go-jose/go-jose/v3 v3.0.3 +# github.com/go-jose/go-jose/v3 v3.0.4 ## explicit; go 1.12 github.com/go-jose/go-jose/v3 github.com/go-jose/go-jose/v3/cipher