Skip to content

Allow injecting Knative Eventing images in CSV #1591

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 8 commits into from
Jun 7, 2022
Merged

Allow injecting Knative Eventing images in CSV #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
053aa3a
Allow injecting Knative Eventing images in CSV
pierDipi May 30, 2022
c09c39b
Allow overriding Kafka artifacts
pierDipi May 30, 2022
401992c
Allow overriding eventing core images
pierDipi May 30, 2022
d06cff8
Use midstream artifacts for eventing
pierDipi May 31, 2022
edbc6ef
Remove patches from SO and move them to midstream
pierDipi May 31, 2022
dea281c
Bump eventing core to 1.3.2
pierDipi May 31, 2022
389e9f6
Add install-tracing target
pierDipi May 31, 2022
7ebe642
Use correct midstream repository
pierDipi Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ install-all:
./hack/tracing.sh
INSTALL_KAFKA="true" ENABLE_TRACING=true ./hack/install.sh

install-tracing:
./hack/tracing.sh

install-serving:
INSTALL_EVENTING="false" ./hack/install.sh

Expand Down
78 changes: 52 additions & 26 deletions hack/generate/csv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,39 @@ source "$(dirname "${BASH_SOURCE[0]}")/../lib/metadata.bash"
registry_host='registry.ci.openshift.org'
registry="${registry_host}/openshift"
serving="${registry}/knative-v$(metadata.get dependencies.serving):knative-serving"
eventing="${registry}/knative-v$(metadata.get dependencies.eventing):knative-eventing"
eventing_kafka_broker="${registry}/knative-v$(metadata.get dependencies.eventing_kafka_broker):knative-eventing-kafka"
client_version="$(metadata.get dependencies.cli)"
kn_event="${registry_host}/knative/release-${client_version%.*}:client-plugin-event"
rbac_proxy="registry.ci.openshift.org/origin/4.7:kube-rbac-proxy"

function default_knative_eventing_images() {
local eventing
eventing="${registry}/knative-v$(metadata.get dependencies.eventing):knative-eventing"
export KNATIVE_EVENTING_CONTROLLER=${KNATIVE_EVENTING_CONTROLLER:-"${eventing}-controller"}
export KNATIVE_EVENTING_SUGAR_CONTROLLER=${KNATIVE_EVENTING_SUGAR_CONTROLLER:-"${eventing}-sugar-controller"}
export KNATIVE_EVENTING_WEBHOOK=${KNATIVE_EVENTING_WEBHOOK:-"${eventing}-webhook"}
export KNATIVE_EVENTING_STORAGE_VERSION_MIGRATION=${KNATIVE_EVENTING_STORAGE_VERSION_MIGRATION:-"${eventing}-storage-version-migration"}
export KNATIVE_EVENTING_MTBROKER_INGRESS=${KNATIVE_EVENTING_MTBROKER_INGRESS:-"${eventing}-mtbroker-ingress"}
export KNATIVE_EVENTING_MTBROKER_FILTER=${KNATIVE_EVENTING_MTBROKER_FILTER:-"${eventing}-mtbroker-filter"}
export KNATIVE_EVENTING_MTCHANNEL_BROKER=${KNATIVE_EVENTING_MTCHANNEL_BROKER:-"${eventing}-mtchannel-broker"}
export KNATIVE_EVENTING_MTPING=${KNATIVE_EVENTING_MTPING:-"${eventing}-mtping"}
export KNATIVE_EVENTING_CHANNEL_CONTROLLER=${KNATIVE_EVENTING_CHANNEL_CONTROLLER:-"${eventing}-channel-controller"}
export KNATIVE_EVENTING_CHANNEL_DISPATCHER=${KNATIVE_EVENTING_CHANNEL_DISPATCHER:-"${eventing}-channel-dispatcher"}
export KNATIVE_EVENTING_APISERVER_RECEIVE_ADAPTER=${KNATIVE_EVENTING_APISERVER_RECEIVE_ADAPTER:-"${eventing}-apiserver-receive-adapter"}
}

function default_knative_eventing_kafka_broker_images() {
local eventing_kafka_broker
eventing_kafka_broker="${registry}/knative-v$(metadata.get dependencies.eventing_kafka_broker):knative-eventing-kafka-broker"
export KNATIVE_EVENTING_KAFKA_BROKER_DISPATCHER=${KNATIVE_EVENTING_KAFKA_BROKER_DISPATCHER:-"${eventing_kafka_broker}-dispatcher"}
export KNATIVE_EVENTING_KAFKA_BROKER_RECEIVER=${KNATIVE_EVENTING_KAFKA_BROKER_RECEIVER:-"${eventing_kafka_broker}-receiver"}
export KNATIVE_EVENTING_KAFKA_BROKER_KAFKA_CONTROLLER=${KNATIVE_EVENTING_KAFKA_BROKER_KAFKA_CONTROLLER:-"${eventing_kafka_broker}-kafka-controller"}
export KNATIVE_EVENTING_KAFKA_BROKER_WEBHOOK_KAFKA=${KNATIVE_EVENTING_KAFKA_BROKER_WEBHOOK_KAFKA:-"${eventing_kafka_broker}-webhook-kafka"}
export KNATIVE_EVENTING_KAFKA_BROKER_POST_INSTALL=${KNATIVE_EVENTING_KAFKA_BROKER_POST_INSTALL:-"${eventing_kafka_broker}-post-install"}
}

default_knative_eventing_images
default_knative_eventing_kafka_broker_images

declare -a images
declare -A images_addresses

Expand Down Expand Up @@ -56,30 +83,29 @@ image "net-kourier-controller__controller" "${registry}/knative-v$(metadata.get
image "net-istio-controller__controller" "${registry}/knative-v$(metadata.get dependencies.net_istio):net-istio-controller"
image "net-istio-webhook__webhook" "${registry}/knative-v$(metadata.get dependencies.net_istio):net-istio-webhook"

image "eventing-controller__eventing-controller" "${eventing}-controller"
image "sugar-controller__controller" "${eventing}-sugar-controller"
image "eventing-webhook__eventing-webhook" "${eventing}-webhook"
image "storage-version-migration-eventing-eventing-$(metadata.get dependencies.eventing)__migrate" "${eventing}-storage-version-migration"
image "mt-broker-controller__mt-broker-controller" "${eventing}-mtchannel-broker"
image "mt-broker-filter__filter" "${eventing}-mtbroker-filter"
image "mt-broker-ingress__ingress" "${eventing}-mtbroker-ingress"
image "imc-controller__controller" "${eventing}-channel-controller"
image "imc-dispatcher__dispatcher" "${eventing}-channel-dispatcher"
image "pingsource-mt-adapter__dispatcher" "${eventing}-mtping"

image "APISERVER_RA_IMAGE" "${eventing}-apiserver-receive-adapter"
image "DISPATCHER_IMAGE" "${eventing}-channel-dispatcher"

kafka_image "kafka-broker-receiver__kafka-broker-receiver" "${eventing_kafka_broker}-broker-receiver"
kafka_image "kafka-broker-dispatcher__kafka-broker-dispatcher" "${eventing_kafka_broker}-broker-dispatcher"
kafka_image "kafka-channel-receiver__kafka-channel-receiver" "${eventing_kafka_broker}-broker-receiver"
kafka_image "kafka-channel-dispatcher__kafka-channel-dispatcher" "${eventing_kafka_broker}-broker-dispatcher"
kafka_image "kafka-controller__controller" "${eventing_kafka_broker}-broker-kafka-controller"
kafka_image "kafka-sink-receiver__kafka-sink-receiver" "${eventing_kafka_broker}-broker-receiver"
kafka_image "kafka-source-dispatcher__kafka-source-dispatcher" "${eventing_kafka_broker}-broker-dispatcher"
kafka_image "kafka-webhook-eventing__kafka-webhook-eventing" "${eventing_kafka_broker}-broker-webhook-kafka"
kafka_image "kafka-controller-post-install__post-install" "${eventing_kafka_broker}-broker-post-install"
kafka_image "knative-kafka-storage-version-migrator__migrate" "${eventing}-storage-version-migration" # Use eventing core image
image "eventing-controller__eventing-controller" "${KNATIVE_EVENTING_CONTROLLER}"
image "sugar-controller__controller" "${KNATIVE_EVENTING_SUGAR_CONTROLLER}"
image "eventing-webhook__eventing-webhook" "${KNATIVE_EVENTING_WEBHOOK}"
image "storage-version-migration-eventing-eventing-$(metadata.get dependencies.eventing)__migrate" "${KNATIVE_EVENTING_STORAGE_VERSION_MIGRATION}"
image "mt-broker-controller__mt-broker-controller" "${KNATIVE_EVENTING_MTCHANNEL_BROKER}"
image "mt-broker-filter__filter" "${KNATIVE_EVENTING_MTBROKER_FILTER}"
image "mt-broker-ingress__ingress" "${KNATIVE_EVENTING_MTBROKER_INGRESS}"
image "imc-controller__controller" "${KNATIVE_EVENTING_CHANNEL_CONTROLLER}"
image "imc-dispatcher__dispatcher" "${KNATIVE_EVENTING_CHANNEL_DISPATCHER}"
image "pingsource-mt-adapter__dispatcher" "${KNATIVE_EVENTING_MTPING}"
image "APISERVER_RA_IMAGE" "${KNATIVE_EVENTING_APISERVER_RECEIVE_ADAPTER}"
image "DISPATCHER_IMAGE" "${KNATIVE_EVENTING_CHANNEL_DISPATCHER}"

kafka_image "kafka-broker-receiver__kafka-broker-receiver" "${KNATIVE_EVENTING_KAFKA_BROKER_RECEIVER}"
kafka_image "kafka-broker-dispatcher__kafka-broker-dispatcher" "${KNATIVE_EVENTING_KAFKA_BROKER_DISPATCHER}"
kafka_image "kafka-channel-receiver__kafka-channel-receiver" "${KNATIVE_EVENTING_KAFKA_BROKER_RECEIVER}"
kafka_image "kafka-channel-dispatcher__kafka-channel-dispatcher" "${KNATIVE_EVENTING_KAFKA_BROKER_DISPATCHER}"
kafka_image "kafka-controller__controller" "${KNATIVE_EVENTING_KAFKA_BROKER_KAFKA_CONTROLLER}"
kafka_image "kafka-sink-receiver__kafka-sink-receiver" "${KNATIVE_EVENTING_KAFKA_BROKER_RECEIVER}"
kafka_image "kafka-source-dispatcher__kafka-source-dispatcher" "${KNATIVE_EVENTING_KAFKA_BROKER_DISPATCHER}"
kafka_image "kafka-webhook-eventing__kafka-webhook-eventing" "${KNATIVE_EVENTING_KAFKA_BROKER_WEBHOOK_KAFKA}"
kafka_image "kafka-controller-post-install__post-install" "${KNATIVE_EVENTING_KAFKA_BROKER_POST_INSTALL}"
kafka_image "knative-kafka-storage-version-migrator__migrate" "${KNATIVE_EVENTING_STORAGE_VERSION_MIGRATION}" # Use eventing core image

image 'KUBE_RBAC_PROXY' "${rbac_proxy}"
image 'KN_PLUGIN_EVENT_SENDER' "${kn_event}-sender"
Expand Down
19 changes: 11 additions & 8 deletions knative-operator/hack/update-manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ kafka_source_files=(eventing-kafka-source.yaml)
kafka_sink_files=(eventing-kafka-sink.yaml)
component_dir="$root/knative-operator/deploy/resources/knativekafka"

export KNATIVE_EVENTING_KAFKA_BROKER_MANIFESTS_DIR=${KNATIVE_EVENTING_KAFKA_BROKER_MANIFESTS_DIR:-""}

function download_kafka {
subdir=$1
shift
Expand All @@ -24,16 +26,17 @@ function download_kafka {
rm -rf "${component_dir:?}/${subdir}"
mkdir -p "${component_dir:?}/${subdir}"

for (( i=0; i<${#files[@]}; i++ ));
do
for ((i = 0; i < ${#files[@]}; i++)); do
file="${files[$i]}"
target_file="$component_dir/$subdir/$file"
branch=$(metadata.get dependencies.eventing_kafka_broker_artifacts_branch)
url="https://raw.githubusercontent.com/openshift-knative/eventing-kafka-broker/${branch}/openshift/release/artifacts/$file"

echo "Downloading file from ${url}"

wget --no-check-certificate "$url" -O "$target_file"
if [[ ${KNATIVE_EVENTING_KAFKA_BROKER_MANIFESTS_DIR} = "" ]]; then
branch=$(metadata.get dependencies.eventing_kafka_broker_artifacts_branch)
url="https://raw.githubusercontent.com/openshift-knative/eventing-kafka-broker/${branch}/openshift/release/artifacts/$file"
echo "Downloading file from ${url}"
wget --no-check-certificate "$url" -O "$target_file"
else
cp "${KNATIVE_EVENTING_KAFKA_BROKER_MANIFESTS_DIR}/${file}" "$target_file"
fi

# Break all image references so we know our overrides work correctly.
yaml.break_image_references "$target_file"
Expand Down
Loading