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.

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

build(snap): upgrade kuiper to 1.4.2 #3867

Merged
merged 5 commits into from
Feb 3, 2022
Merged

build(snap): upgrade kuiper to 1.4.2 #3867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e66c6ed
build(snap): upgrade kuiper to 1.4.2
MonicaisHer Jan 21, 2022
f7a1ce5
build: upgrade kuiper to 1.4.2
MonicaisHer Jan 21, 2022
9eb2afa
build(snap): remove unused kuiper configuration scripts
MonicaisHer Jan 24, 2022
f0522f4
build(snap): remove unused kuiper install scripts `rm *.zip`
MonicaisHer Jan 24, 2022
e1f6ea4
build(snap): remove unused comment
MonicaisHer Jan 25, 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
2 changes: 1 addition & 1 deletion internal/security/secretstore/secure-messagebus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ default:
port: 6379
protocol: redis
server: localhost
serviceServer: http://localhost:48080
connectionSelector: edgex.redisMsgBus
farshidtz marked this conversation as resolved.
Show resolved Hide resolved
topic: rules-events
type: redis
mqtt_conf:
Expand Down
8 changes: 6 additions & 2 deletions snap/local/runtime-helpers/bin/install-setup-kuiper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ if [ ! -f "$SNAP_DATA/kuiper/data" ]; then
mkdir -p "$SNAP_DATA/kuiper/etc/services"
mkdir -p "$SNAP_DATA/kuiper/etc/sinks"
mkdir -p "$SNAP_DATA/kuiper/etc/sources"
mkdir -p "$SNAP_DATA/kuiper/etc/connections"
mkdir -p "$SNAP_DATA/kuiper/plugins/functions"
mkdir -p "$SNAP_DATA/kuiper/plugins/sinks"
mkdir -p "$SNAP_DATA/kuiper/plugins/sources"
mkdir -p "$SNAP_DATA/kuiper/plugins/portable"

for cfg in client kuiper; do
cp "$SNAP/etc/$cfg.yaml" "$SNAP_DATA/kuiper/etc"
Expand All @@ -26,14 +28,16 @@ if [ ! -f "$SNAP_DATA/kuiper/data" ]; then

cp "$SNAP/etc/services/"*.proto "$SNAP_DATA/kuiper/etc/services"

for sink in file edgex influx log nop; do
for sink in file edgex influx log nop mqtt; do
cp "$SNAP/etc/sinks/$sink.json" "$SNAP_DATA/kuiper/etc/sinks"
done

for src in edgex random; do
for src in edgex; do
cp "$SNAP/etc/sources/$src.json" "$SNAP_DATA/kuiper/etc/sources"
cp "$SNAP/etc/sources/$src.yaml" "$SNAP_DATA/kuiper/etc/sources"
done

cp "$SNAP/etc/connections/connection.yaml" "$SNAP_DATA/kuiper/etc/connections"

cp "$SNAP/etc/multilingual/"*.ini "$SNAP_DATA/kuiper/etc/multilingual"
fi
17 changes: 3 additions & 14 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ parts:

kuiper:
source: https://github.com/lf-edge/ekuiper.git
source-tag: 1.3.1
source-tag: 1.4.2
source-depth: 1
plugin: make
after: [go-build-helper]
Expand All @@ -875,9 +875,9 @@ parts:
make build_with_edgex
make real_pkg
cd $SNAPCRAFT_PART_INSTALL
# TODO: SIMPLIFY THIS!!!

tar -xvf kuiper*.tar.gz --strip-components=1
rm *.zip *.gz
rm *.gz

# configure logging & restrict to localhost
# configure REST API service port to 59720
Expand All @@ -888,17 +888,6 @@ parts:
-e 's@restPort\: 9081@restPort\: 59720@' \
$SNAPCRAFT_PART_INSTALL/etc/kuiper.yaml

# update the edgex source's port to 5566 to match
# app-service-configurable's message bus publish port
sed -i -e 's@port\: 5563@port\: 5566@' \
$SNAPCRAFT_PART_INSTALL/etc/sources/edgex.yaml

# update the edgex sink's port to 5567 so that it
# doesn't collide with the default port used by
# app-service-configurable
sed -i -e 's@"default": 5563@"default": 5567@' \
$SNAPCRAFT_PART_INSTALL/etc/sinks/edgex.json

install -DT "$SNAPCRAFT_PART_SRC/LICENSE" \
"$SNAPCRAFT_PART_INSTALL/usr/share/doc/kuiper/LICENSE"
stage:
Expand Down