Break out in several modules (core, services, cli) (#504)

* rebase from master * break out in modules * fix nightbuild and other jobs for the new structure * small cleanup and documentation for the julieops controller * rename cli module to right name julie-ops-cli * github flows cleanup * rebase the newly introduced ResourceFilter * ammend merge issue
kafka-ops · Aug 5, 2022 · 033ce72 · 033ce72
1 parent 1991611
commit 033ce72
Show file tree

Hide file tree

Showing 412 changed files with 1,874 additions and 642 deletions.
diff --git a/.github/workflows/ci-integration-test-legacy.yml b/.github/workflows/ci-integration-test-legacy.yml
diff --git a/.github/workflows/ci-unit-test-legacy.yml b/.github/workflows/ci-unit-test-legacy.yml
diff --git a/.github/workflows/nightly-artifacts-build.yml b/.github/workflows/nightly-artifacts-build.yml
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/release-artifacts-build-legacy.yml b/.github/workflows/release-artifacts-build-legacy.yml
@@ -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:
@@ -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
@@ -56,4 +73,4 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: FAT jar
-          path: target/julie-ops.jar
+          path: target/julie-ops.jar
diff --git a/.github/workflows/release-artifacts-build.yml b/.github/workflows/release-artifacts-build.yml
@@ -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:
@@ -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
diff --git a/.github/workflows/release-docker-legacy.yml b/.github/workflows/release-docker-legacy.yml
@@ -2,7 +2,8 @@ name: Docker publish (legacy)
 on:
   push:
     tags:
-      - 'v2.*.*'
+      - 'v3.*.*'
+      - 'v4.*.*'
 jobs:
   ktb_docker_build:
     if: github.repository == 'kafka-ops/julie'
@@ -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:
@@ -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 }}
diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -2,8 +2,7 @@ name: Docker publish
 on:
   push:
     tags:
-      - 'v3.*.*'
-      - 'v4.*.*'
+      - 'v5.*.*'
 jobs:
   ktb_docker_build:
     if: github.repository == 'kafka-ops/julie'
@@ -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

diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,7 @@
 .DS_Store
-project/*
 .idea
-target/*
-logs/*
+target
+logs
 .cluster-state
 *.iml
 _build
@@ -13,4 +12,5 @@ example/topology-builder-with-schema-cloud.properties
 release/
 private.key
 rpm-gen-key
-.s3/
+.s3/
+/julie-ops/service/logs/