Skip to content
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.

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

Revert "RHCLOUD-29056 Upgrade debezium to 2.5 (#356)" #358

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion deploy/connect-msk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ objects:
slot.name: debezium
plugin.name: pgoutput
slot.max.retries: 999999999
topic.prefix: playbook-dispatcher
database.server.name: playbook-dispatcher
table.include.list: public.runs,public.run_hosts
tombstones.on.delete: false

Expand Down
2 changes: 1 addition & 1 deletion deploy/connect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ objects:
slot.name: debezium
plugin.name: pgoutput
slot.max.retries: 999999999
topic.prefix: playbook-dispatcher
database.server.name: playbook-dispatcher
table.include.list: public.runs,public.run_hosts
tombstones.on.delete: false

Expand Down
6 changes: 3 additions & 3 deletions event-streams/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ USER root

ENV EXTRA_PLUGINS=/deps/plugins \
EXTRA_LIBS=/deps/libs \
DEBEZIUM_VERSION=2.5.3.Final \
DEBEZIUM_CHECKSUM=0e119e8fac1a0bc0c35c009786110508 \
DEBEZIUM_VERSION=1.9.7.Final \
DEBEZIUM_CHECKSUM=161e362568163639fcde39da27e29456 \
CONFIG_PROVIDERS_VERSION=0.1.0 \
CONFIG_PROVIDERS_CHECKSUM=108e0bf4148a37676bed866ff45e1199

Expand All @@ -16,7 +16,7 @@ ADD schema/run.host.event.yaml /src
RUN microdnf install gzip

# Taken from https://github.com/debezium/docker-images/blob/master/connect-base/1.9/docker-maven-download.sh
# Debezium PostgreSQL checksum from https://github.com/debezium/container-images/blob/main/connect/2.5/Dockerfile
# Debezium PostgreSQL checksum from https://github.com/debezium/container-images/blob/main/connect/1.9/Dockerfile
RUN mkdir -p $EXTRA_PLUGINS $EXTRA_LIBS && \
MAVEN_DEP_DESTINATION=$EXTRA_PLUGINS /src/docker-maven-download.sh debezium postgres ${DEBEZIUM_VERSION} ${DEBEZIUM_CHECKSUM} && \
MAVEN_DEP_DESTINATION=$EXTRA_LIBS /src/docker-maven-download.sh central com/redhat/insights/kafka config-providers ${CONFIG_PROVIDERS_VERSION} ${CONFIG_PROVIDERS_CHECKSUM}
Expand Down
2 changes: 1 addition & 1 deletion event-streams/connector.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"slot.name": "debezium",
"plugin.name": "pgoutput",
"slot.max.retries": 999999999,
"topic.prefix": "playbook-dispatcher",
"database.server.name": "playbook-dispatcher",
"table.include.list": "public.runs,public.run_hosts",
"tombstones.on.delete": false,

Expand Down
21 changes: 1 addition & 20 deletions event-streams/docker-maven-download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,11 @@ maven_apicurio_converter() {
return
fi
APICURIO_CONVERTER_PACKAGE="apicurio-registry-distro-connect-converter"
maven_dep $MAVEN_REPO_CENTRAL "io/apicurio" "$APICURIO_CONVERTER_PACKAGE" "$1" "$APICURIO_CONVERTER_PACKAGE-$1.tar.gz" "$2"
maven_dep $MAVEN_REPO_CENTRAL "io/apicurio" "$APICURIO_CONVERTER_PACKAGE" "$1" "$APICURIO_CONVERTER_PACKAGE-$1-converter.tar.gz" "$2"
mkdir "$EXTERNAL_LIBS_DIR/apicurio"
tar -xzf "$DOWNLOAD_FILE" -C "$EXTERNAL_LIBS_DIR/apicurio" && rm "$DOWNLOAD_FILE"
}

maven_otel_libs() {
if [[ -z "$EXTERNAL_LIBS_DIR" ]] ; then
echo "WARNING: EXTERNAL_LIBS_DIR is not set. Skipping loading OTEL libraries ..."
return
fi
if [[ ! -d "$EXTERNAL_LIBS_DIR" ]] ; then
echo "WARNING: EXTERNAL_LIBS_DIR is not a directory. Skipping loading OTEL libraries ..."
return
fi
if [[ ! -d "$EXTERNAL_LIBS_DIR/otel" ]] ; then
mkdir "$EXTERNAL_LIBS_DIR/otel"
fi
maven_dep $MAVEN_REPO_CENTRAL $1 $2 $3 "$2-$3.jar" $4
mv "$DOWNLOAD_FILE" $EXTERNAL_LIBS_DIR/otel
}

case $1 in
"central" ) shift
maven_central_dep ${@}
Expand All @@ -127,7 +111,4 @@ case $1 in
"apicurio" ) shift
maven_apicurio_converter ${@}
;;
"otel" ) shift
maven_otel_libs ${@}
;;
esac
2 changes: 1 addition & 1 deletion examples/connector-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"slot.name": "debezium",
"plugin.name": "pgoutput",
"slot.max.retries": 999999999,
"topic.prefix": "playbook-dispatcher",
"database.server.name": "playbook-dispatcher",
"table.include.list": "public.runs,public.run_hosts",

"key.converter": "org.apache.kafka.connect.storage.StringConverter",
Expand Down
Loading