Skip to content

Commit

Permalink
chore: refactor developer guide (#101)
Browse files Browse the repository at this point in the history
Signed-off-by: a3hadi <[email protected]>
  • Loading branch information
ayildirim21 authored Mar 25, 2024
1 parent c838333 commit 502262f
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 88 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
username: ${{ secrets.NUMAIO_USERNAME }}
password: ${{ secrets.NUMAIO_PASSWORD }}
- name: Build, tag, and push images
run: ./update_examples.sh --build-push-example ${{ matrix.execution_ids }}
run: ./hack/update_examples.sh --build-push-example ${{ matrix.execution_ids }}
73 changes: 0 additions & 73 deletions development.md

This file was deleted.

63 changes: 63 additions & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Developer Guide

This document explains the development process for the Numaflow Java SDK.

### Testing

After you make certain changes to the Java SDK implementation, you would like to use it to build a
brand new UDF image, and run it on a pipeline to verify the image continues working well with the Numaflow platform.
In order to do this you can follow these steps:

1. Make the changes
2. Update your local repository using maven, to reflect your latest changes. This can be done in the root
directory by running: `mvn clean install` (make sure that the version in the `pom.xml` in the root and examples
directories match)
3. In the examples directory you can then run `mvn clean install -Ddocker.tag=<tag>`, which will build `numaflow-java-examples`, run unit tests,
and then build all example images. Now that the images are available locally,
you can take the desired image and test it in a pipeline

If you want to build and push all the example images at once, you can run:
```shell
./hack/update_examples -bp -t <tag>
```
The default tag is `stable`, but it is recommended you specify your own for testing purposes, as the Github Actions CI uses the `stable` tag.
This consistent tag name is used so that the tags in the [E2E test pipelines](https://github.com/numaproj/numaflow/tree/main/test) do not need to be
updated each time an SDK change is made.

You can alternatively build and push a specific example image by running the following:
```shell
./hack/update_examples -bpe <example-execution-id> -t <tag>
```
Both `-bpe` and `-bp` first build a local image with the naming convention
`numaflow-java-examples/<example-execution-id>:<tag>`, which then gets pushed as
`quay.io/numaio/numaflow-java/<example-execution-id>:<tag>`. If you want to build and tag all images locally,
without pushing to quay.io, as mentioned in step 3, run: `mvn clean install -Ddocker.tag=<tag>`.

Note: before running the script, ensure that through the CLI, you are logged into quay.io.

### Deploying

After confirming that your changes pass local testing:

1. Clean up testing artifacts
2. Create a PR. Once your PR has been merged, a Github Actions workflow (Docker Publish) will be triggered, to build, tag (with `stable`), and push
all example images. This ensures that all example images are using the most up-to-date version of the SDK, i.e. the one including your
changes

### Before Release

Before releasing a new SDK version, make sure to update all references from the old version to the new one.
For example, the version in the `pom.xml` in the root and example directories should be updated (for [reference
](https://github.com/numaproj/numaflow-java/pull/89/files#diff-9c5fb3d1b7e3b0f54bc5c4182965c4fe1f9023d449017cece3005d3f90e8e4d8)). After making these changes, create a PR. Once merged, it will trigger the Docker Publish workflow, and should be included in the release.
As a result, the correct SDK version will always be printed in the server information logs, and the example images will
always be using the latest changes (due to pointing to the local maven repository that is built).

### Adding a New Example

If you add a new example, there are a few steps to follow in order for it to be used by the update script and the Docker
Publish workflow:

1. Add the example to the `pom.xml` file in the examples directory, within an execution element. Note that the
`id` tag you specify must be exactly the same as the quay.io repository name for the example
2. Add the `id` tag you specified in step 1 to the `executionIDs` array in `update_examples.sh`
3. Add the `id` tag you specified in step 1 to the `execution_ids` matrix in `build-push.yaml`
20 changes: 6 additions & 14 deletions update_examples.sh → hack/update_examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ if (( (usingTag + usingHelp > 1) || (usingTag && usingBuildPush + usingBuildPush
exit 1
fi

if [ -n "$version" ]; then
echo "Using version: $version"
fi

if [ -n "$executionID" ]; then
echo "Updating example: $executionID"
fi
Expand All @@ -106,7 +102,7 @@ function dockerPublish () {
fi
}

if (( usingBuildPush )); then
function build () {
if ! mvn clean install; then
echo "Error: failed to mvn clean install in root directory" >&2
exit 1
Expand All @@ -116,20 +112,16 @@ if (( usingBuildPush )); then
echo "Error: failed to build images in examples directory" >&2
exit 1
fi
}

if (( usingBuildPush )); then
build
for id in "${executionIDs[@]}"
do
dockerPublish "$id"
done
elif (( usingBuildPushExample )); then
if ! mvn clean install; then
echo "Error: failed to mvn clean install in root directory" >&2
exit 1
fi
cd examples || exit
if ! mvn clean install jib:dockerBuild@"$executionID" -Ddocker.tag="$tag"; then
echo "Error: failed to build example image $executionID" >&2
exit 1
fi
build
dockerPublish "$executionID"
elif (( usingHelp )); then
show_help
Expand Down

0 comments on commit 502262f

Please sign in to comment.