Skip to content

Commit 4537ccf

Browse files
pierDipipierDipi
authored
Inject eventing-integration images references (#3543)
* Inject eventing-integration images references Signed-off-by: Pierangelo Di Pilato <[email protected]> * Run make generated-files Signed-off-by: Pierangelo Di Pilato <[email protected]> --------- Signed-off-by: Pierangelo Di Pilato <[email protected]>
1 parent 6d20f62 commit 4537ccf

File tree

13 files changed

+321
-182
lines changed

13 files changed

+321
-182
lines changed

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ require (
2929
k8s.io/client-go v0.31.0
3030
knative.dev/eventing v0.44.0
3131
knative.dev/eventing-kafka-broker v0.37.0
32-
knative.dev/hack v0.0.0-20250117112405-6cb0feb3ac46
32+
knative.dev/hack v0.0.0-20250220110655-b5e4ff820460
3333
knative.dev/networking v0.0.0-20241022012959-60e29ff520dc
34-
knative.dev/operator v0.43.1
34+
knative.dev/operator v0.43.3-0.20250312021337-6b0f076ba7ae
3535
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad
36-
knative.dev/serving v0.43.1
36+
knative.dev/serving v0.43.2
3737
sigs.k8s.io/controller-runtime v0.19.0
3838
sigs.k8s.io/yaml v1.4.0
3939
)
@@ -170,7 +170,7 @@ require (
170170
github.com/go-logr/logr v1.4.2
171171
go.uber.org/atomic v1.11.0 // indirect
172172
k8s.io/apiextensions-apiserver v0.31.0
173-
knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364
173+
knative.dev/reconciler-test v0.0.0-20250217113355-f4bd4f5199d4
174174
)
175175

176176
replace (

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2593,8 +2593,8 @@ knative.dev/hack v0.0.0-20250117112405-6cb0feb3ac46 h1:UWX4qXgehoigmCH/db5ZldJ9V
25932593
knative.dev/hack v0.0.0-20250117112405-6cb0feb3ac46/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
25942594
knative.dev/networking v0.0.0-20241022012959-60e29ff520dc h1:0d9XXRLlyuHfINZLlYqo/BYe/+chqqNBMLKJldjTbtw=
25952595
knative.dev/networking v0.0.0-20241022012959-60e29ff520dc/go.mod h1:G56j6VCLzfaN9yZ4IqfNyN4c3U1czvhUmKeZX4UjQ8Q=
2596-
knative.dev/operator v0.43.1 h1:P7yZeGvmjbq44IV8wkaiJ/Of4DMi0igzPXXq0X8IJgI=
2597-
knative.dev/operator v0.43.1/go.mod h1:vKN27BuPGIafr9fJy/MOoMACxV0oySI4lkWdldiHQK0=
2596+
knative.dev/operator v0.43.3-0.20250312021337-6b0f076ba7ae h1:GtHRzhWCPbBq51FLPpKcTnmK7dxR1ZmHN9jIcXFtEao=
2597+
knative.dev/operator v0.43.3-0.20250312021337-6b0f076ba7ae/go.mod h1:0WF/rDMqu7koe4ODC2vyjLd80Kw5NqIYoLwi+S+YERk=
25982598
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad h1:Nrjtr2H168rJeamH4QdyLMV1lEKHejNhaj1ymgQMfLk=
25992599
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo=
26002600
knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364 h1:DIc+vbaFKOSGktPXJ1MaXIXoDjlmUIXQkHiZaPcYGbQ=

‎hack/generate/csv.sh

+14-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if [[ ${USE_RELEASE_NEXT:-} == "true" ]]; then
2424
knative_eventing_images_release
2525
knative_eventing_istio_images_release
2626
knative_eventing_kafka_broker_images_release
27+
knative_eventing_integrations_images_release
2728
knative_backstage_plugins_images_release
2829
knative_serving_images_release
2930
knative_kn_plugin_func_images_release
@@ -33,6 +34,7 @@ else
3334
default_knative_eventing_images
3435
default_knative_eventing_istio_images
3536
default_knative_eventing_kafka_broker_images
37+
default_knative_eventing_integrations_images
3638
default_knative_backstage_plugins_images
3739
default_knative_serving_images
3840
default_knative_kn_plugin_func_images
@@ -107,11 +109,20 @@ image "mt-broker-ingress__ingress"
107109
image "imc-controller__controller" "${KNATIVE_EVENTING_CHANNEL_CONTROLLER}"
108110
image "imc-dispatcher__dispatcher" "${KNATIVE_EVENTING_CHANNEL_DISPATCHER}"
109111
image "pingsource-mt-adapter__dispatcher" "${KNATIVE_EVENTING_MTPING}"
112+
image "job-sink__job-sink" "${KNATIVE_EVENTING_JOBSINK}"
113+
114+
# The first param need to match the env variable name expected by the controllers, the second param is defined in `images.bash`.
110115
image "APISERVER_RA_IMAGE" "${KNATIVE_EVENTING_APISERVER_RECEIVE_ADAPTER}"
111116
image "DISPATCHER_IMAGE" "${KNATIVE_EVENTING_CHANNEL_DISPATCHER}"
112-
if [ "${KNATIVE_EVENTING_JOBSINK}" != "" ]; then
113-
image "job-sink__job-sink" "${KNATIVE_EVENTING_JOBSINK}"
114-
fi
117+
image "EVENT_TRANSFORM_JSONATA_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_TRANSFORM_JSONATA}"
118+
image "INTEGRATION_SOURCE_TIMER_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_TIMER_SOURCE}"
119+
image "INTEGRATION_SOURCE_AWS_S3_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_AWS_S3_SOURCE}"
120+
image "INTEGRATION_SOURCE_AWS_SQS_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_AWS_SQS_SOURCE}"
121+
image "INTEGRATION_SOURCE_AWS_DDB_STREAMS_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_AWS_DDB_STREAMS_SOURCE}"
122+
image "INTEGRATION_SINK_LOG_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_LOG_SINK}"
123+
image "INTEGRATION_SINK_AWS_S3_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_AWS_S3_SINK}"
124+
image "INTEGRATION_SINK_AWS_SQS_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_AWS_SQS_SINK}"
125+
image "INTEGRATION_SINK_AWS_SNS_IMAGE" "${KNATIVE_EVENTING_INTEGRATIONS_AWS_SNS_SINK}"
115126

116127
image "eventmesh-backend__controller" "${KNATIVE_BACKSTAGE_PLUGINS_EVENTMESH}"
117128

‎hack/lib/images.bash

+29
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,35 @@ function knative_eventing_kafka_broker_images() {
217217
export KNATIVE_EVENTING_KAFKA_BROKER_TEST_KAFKA_CONSUMER=${KNATIVE_EVENTING_KAFKA_BROKER_TEST_KAFKA_CONSUMER:-$(latest_konflux_image_sha "${eventing_kafka_broker}-test-kafka-consumer")}
218218
}
219219

220+
function knative_eventing_integrations_images_release() {
221+
knative_eventing_integrations_images "${USE_IMAGE_RELEASE_TAG}"
222+
}
223+
224+
function default_knative_eventing_integrations_images() {
225+
knative_eventing_integrations_images "$(metadata.get dependencies.eventing_integrations)"
226+
}
227+
228+
function knative_eventing_integrations_images() {
229+
local eventing_kafka_broker tag app_version
230+
tag=${1:?"Provide tag for Eventing Integrations images"}
231+
232+
app_version=$(get_app_version_from_tag "${tag}")
233+
eventing_integrations="${registry_prefix_quay}${app_version}/kn-eventing-integrations"
234+
235+
# EventTransform
236+
export KNATIVE_EVENTING_INTEGRATIONS_TRANSFORM_JSONATA=${KNATIVE_EVENTING_INTEGRATIONS_TRANSFORM_JSONATA:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-transform-jsonata:${tag}")}
237+
# IntegrationSource
238+
export KNATIVE_EVENTING_INTEGRATIONS_TIMER_SOURCE=${KNATIVE_EVENTING_INTEGRATIONS_TIMER_SOURCE:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-timer-source:${tag}")}
239+
export KNATIVE_EVENTING_INTEGRATIONS_AWS_S3_SOURCE=${KNATIVE_EVENTING_INTEGRATIONS_AWS_S3_SOURCE:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-aws-s3-source:${tag}")}
240+
export KNATIVE_EVENTING_INTEGRATIONS_AWS_SQS_SOURCE=${KNATIVE_EVENTING_INTEGRATIONS_AWS_SQS_SOURCE:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-aws-sqs-source:${tag}")}
241+
export KNATIVE_EVENTING_INTEGRATIONS_AWS_DDB_STREAMS_SOURCE=${KNATIVE_EVENTING_INTEGRATIONS_AWS_DDB_STREAMS_SOURCE:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-aws-ddb-streams-source:${tag}")}
242+
# IntegrationSink
243+
export KNATIVE_EVENTING_INTEGRATIONS_LOG_SINK=${KNATIVE_EVENTING_INTEGRATIONS_LOG_SINK:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-log-sink:${tag}")}
244+
export KNATIVE_EVENTING_INTEGRATIONS_AWS_S3_SINK=${KNATIVE_EVENTING_INTEGRATIONS_AWS_S3_SINK:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-aws-s3-sink:${tag}")}
245+
export KNATIVE_EVENTING_INTEGRATIONS_AWS_SQS_SINK=${KNATIVE_EVENTING_INTEGRATIONS_AWS_SQS_SINK:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-aws-sqs-sink:${tag}")}
246+
export KNATIVE_EVENTING_INTEGRATIONS_AWS_SNS_SINK=${KNATIVE_EVENTING_INTEGRATIONS_AWS_SNS_SINK:-$(latest_registry_redhat_io_image_sha "${eventing_integrations}-aws-sns-sink:${tag}")}
247+
}
248+
220249
function knative_kn_plugin_func_images_release() {
221250
knative_kn_plugin_func_images "${USE_IMAGE_RELEASE_TAG}"
222251
}

‎olm-catalog/serverless-operator-index/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >>
1111
RUN /bin/opm render --skip-tls-verify -o yaml \
1212
registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle \
1313
registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \
14-
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:4cfa306d7c8228567b4519b40141ce3fdcad55f9e62bef9295571f9059ebd897 >> /configs/index.yaml
14+
quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-136/serverless-bundle@sha256:e9e679787ab1a98060dfe783982baf6ed31eb57383cd0863a8c77938e6f0bd0c >> /configs/index.yaml
1515

1616
# The base image is expected to contain
1717
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe

0 commit comments

Comments
 (0)