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

Introduction of multiple aggregate modules for building JulieOps #524

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Introduction of multiple aggregate modules for building JulieOps #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fb24d50
rebase from master
purbon Jul 29, 2022
1f50f58
break out in modules
purbon Jul 21, 2022
366217a
small cleanup and documentation for the julieops controller
purbon Jul 30, 2022
575a1a2
rename cli module to right name julie-ops-cli
purbon Aug 5, 2022
a79d686
github flows cleanup
purbon Aug 5, 2022
9df219d
rebase the newly introduced ResourceFilter
purbon Aug 5, 2022
3eae774
ammend merge issue
purbon Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
41 changes: 0 additions & 41 deletions .github/workflows/ci-integration-test-legacy.yml
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/ci-unit-test-legacy.yml
View file
Open in desktop

This file was deleted.

19 changes: 12 additions & 7 deletions .github/workflows/nightly-artifacts-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: copy fat jar
run: cp ./target/julie-ops.jar release/docker
run: cp ./julie-ops-cli/target/julie-ops-cli.jar release/docker
- name: copy runner file
run: cp ./src/main/scripts/julie-ops-cli.sh release/docker
run: cp ./julie-ops-cli/src/main/scripts/julie-ops-cli.sh release/docker
- name: list files (release dir)
run: ls -l
working-directory: release/docker
Expand All @@ -48,6 +48,8 @@ jobs:
if: github.repository == 'kafka-ops/julie'
name: Build rpm/deb packages (using maven)
runs-on: ubuntu-latest
env:
working-directory: ./julie-ops-cli
steps:
- uses: actions/checkout@v2
- name: Set up the JDK
Expand Down Expand Up @@ -88,29 +90,32 @@ jobs:
run: rpm --import release/keys/public.key
- name: Build the rpm
run: mvn rpm:rpm
working-directory: ${{ env.working-directory }}
- name: Sign rpm
run: |
rpm --define "_gpg_name ${{ steps.import_gpg.outputs.keyid }}" --addsign target/rpm/julie-ops/RPMS/noarch/*.rpm
rpm --checksig target/rpm/julie-ops/RPMS/noarch/*.rpm
rpm --define "_gpg_name ${{ steps.import_gpg.outputs.keyid }}" --addsign target/rpm/julie-ops-cli/RPMS/noarch/*.rpm
rpm --checksig target/rpm/julie-ops-cli/RPMS/noarch/*.rpm
working-directory: ${{ env.working-directory }}
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_NAME: ${{ steps.import_gpg.outputs.email }}
- name: Sign deb
run: |
sudo apt-get install dpkg-sig -y
dpkg-sig -k ${{ steps.import_gpg.outputs.keyid }} --sign builder $FILE target/*.deb
working-directory: ${{ env.working-directory }}
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_NAME: ${{ steps.import_gpg.outputs.email }}
- uses: actions/upload-artifact@v2
with:
name: RPM package
path: target/rpm/julie-ops/RPMS/noarch/*.rpm
path: ./julie-ops-cli/target/rpm/julie-ops-cli/RPMS/noarch/*.rpm
- uses: actions/upload-artifact@v2
with:
name: DEB package
path: target/*.deb
path: ./julie-ops-cli/target/*.deb
- uses: actions/upload-artifact@v2
with:
name: FAT jar
path: target/julie-ops.jar
path: ./julie-ops-cli/target/julie-ops-cli.jar
41 changes: 29 additions & 12 deletions .github/workflows/release-artifacts-build-legacy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,28 @@ name: Release Builds (legacy)
on:
push:
tags:
- v2*
- v4*
jobs:
package_build:
if: github.repository == 'kafka-ops/julie'
name: Build rpm/deb packages (using maven)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Import private GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true
- name: Import public GPG Key
run: rpm --import release/keys/public.key
- name: Set up the JDK
uses: actions/setup-java@v1
with:
java-version: 8
java-version: 11
- name: Cache dependencies
uses: actions/cache@v2
with:
Expand All @@ -22,22 +32,29 @@ jobs:
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Import private GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v4
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true
- name: Import public GPG Key
run: rpm --import release/keys/public.key
java-version: '11'
distribution: 'adopt'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Publish package
run: mvn verify -Dgpg.passphrase="$GPG_PASSPHRASE" --batch-mode deploy
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: Build the rpm
run: mvn rpm:rpm
- name: Sign rpm
run: |
rpm --define "_gpg_name ${{ steps.import_gpg.outputs.keyid }}" --addsign target/rpm/julie-ops/RPMS/noarch/*.rpm
rpm --checksig target/rpm/julie-ops/RPMS/noarch/*.rpm
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_NAME: ${{ steps.import_gpg.outputs.email }}
- name: Sign deb
run: |
sudo apt-get install dpkg-sig -y
Expand All @@ -56,4 +73,4 @@ jobs:
- uses: actions/upload-artifact@v2
with:
name: FAT jar
path: target/julie-ops.jar
path: target/julie-ops.jar
38 changes: 21 additions & 17 deletions .github/workflows/release-artifacts-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,16 @@ name: Release Builds
on:
push:
tags:
- v3*
- v4*
- v5*
jobs:
package_build:
if: github.repository == 'kafka-ops/julie'
name: Build rpm/deb packages (using maven)
runs-on: ubuntu-latest
env:
working-directory: ./julie-ops-cli
steps:
- uses: actions/checkout@v2
- name: Import private GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true
- name: Import public GPG Key
run: rpm --import release/keys/public.key
- name: Set up the JDK
uses: actions/setup-java@v1
with:
Expand All @@ -41,37 +32,50 @@ jobs:
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Import private GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true
- name: Publish package
run: mvn verify -Dgpg.passphrase="$GPG_PASSPHRASE" --batch-mode deploy
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: Import public GPG Key
run: rpm --import release/keys/public.key
- name: Build the rpm
run: mvn rpm:rpm
working-directory: ${{ env.working-directory }}
- name: Sign rpm
run: |
rpm --define "_gpg_name ${{ steps.import_gpg.outputs.keyid }}" --addsign target/rpm/julie-ops/RPMS/noarch/*.rpm
rpm --checksig target/rpm/julie-ops/RPMS/noarch/*.rpm
rpm --define "_gpg_name ${{ steps.import_gpg.outputs.keyid }}" --addsign target/rpm/julie-ops-cli/RPMS/noarch/*.rpm
rpm --checksig target/rpm/julie-ops-cli/RPMS/noarch/*.rpm
working-directory: ${{ env.working-directory }}
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_NAME: ${{ steps.import_gpg.outputs.email }}
- name: Sign deb
run: |
sudo apt-get install dpkg-sig -y
dpkg-sig -k ${{ steps.import_gpg.outputs.keyid }} --sign builder $FILE target/*.deb
working-directory: ${{ env.working-directory }}
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_NAME: ${{ steps.import_gpg.outputs.email }}
- uses: actions/upload-artifact@v2
with:
name: RPM package
path: target/rpm/julie-ops/RPMS/noarch/*.rpm
path: ./julie-ops-cli/target/rpm/julie-ops-cli/RPMS/noarch/*.rpm
- uses: actions/upload-artifact@v2
with:
name: DEB package
path: target/*.deb
path: ./julie-ops-cli/target/*.deb
- uses: actions/upload-artifact@v2
with:
name: FAT jar
path: target/julie-ops.jar
path: ./julie-ops-cli/target/julie-ops-cli.jar
11 changes: 6 additions & 5 deletions .github/workflows/release-docker-legacy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Docker publish (legacy)
on:
push:
tags:
- 'v2.*.*'
- 'v3.*.*'
- 'v4.*.*'
jobs:
ktb_docker_build:
if: github.repository == 'kafka-ops/julie'
Expand All @@ -18,12 +19,12 @@ jobs:
images: purbon/kafka-topology-builder # list of Docker images to use as base name for tags
tag-sha: true
tag-semver: |
{{version}}
{{major}}.{{minor}}
{{version}}
{{major}}.{{minor}}
- name: Set up the JDK
uses: actions/setup-java@v1
with:
java-version: 8
java-version: 11
- name: Cache dependencies
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -51,4 +52,4 @@ jobs:
file: release/docker/Dockerfile
push: true
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
labels: ${{ steps.docker_meta.outputs.labels }}
7 changes: 3 additions & 4 deletions .github/workflows/release-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: Docker publish
on:
push:
tags:
- 'v3.*.*'
- 'v4.*.*'
- 'v5.*.*'
jobs:
ktb_docker_build:
if: github.repository == 'kafka-ops/julie'
Expand Down Expand Up @@ -34,9 +33,9 @@ jobs:
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: copy fat jar
run: cp ./target/julie-ops.jar release/docker
run: cp ./julie-ops-cli/target/julie-ops-cli.jar release/docker
- name: copy runner file
run: cp ./src/main/scripts/julie-ops-cli.sh release/docker
run: cp ./julie-ops-cli/src/main/scripts/julie-ops-cli.sh release/docker
- name: list files (release dir)
run: ls -l
working-directory: release/docker
Expand Down
8 changes: 4 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.DS_Store
project/*
.idea
target/*
logs/*
target
logs
.cluster-state
*.iml
_build
Expand All @@ -13,4 +12,5 @@ example/topology-builder-with-schema-cloud.properties
release/
private.key
rpm-gen-key
.s3/
.s3/
/julie-ops/service/logs/
Loading