wip: attempt to simplify workflows handling

.github/workflows/build.yml

@@ -0,0 +1,49 @@
+name: Build
+
+env:
+  MAVEN_ARGS: -V -ntp -e
+
+on:
+  workflow_call:
+
+jobs:
+  integration_tests:
+    strategy:
+      matrix:
+        java: [ 17, 21 ]
+        kubernetes: [ 'v1.28.14', 'v1.29.9','1.30.5', '1.31.1' ]
+        it-category: [ 'baseapi', 'dependent', 'workflow' ]
+    uses: ./.github/workflows/integration-tests.yml
+    with:
+      java-version: ${{ matrix.java }}
+      kube-version: ${{ matrix.kubernetes }}
+      it-category: ${{ matrix.it-category }}
+
+  http_client_tests:
+    strategy:
+      matrix:
+        java: [ 17, 21 ]
+        kubernetes: [ 'v1.28.14', 'v1.29.9','1.30.5', '1.31.1' ]
+        it-category: [ 'baseapi' ]
+        httpclient: [ 'vertx', 'jdk', 'jetty' ]
+    uses: ./.github/workflows/integration-tests.yml
+    with:
+      java-version: ${{ matrix.java }}
+      kube-version: ${{ matrix.kubernetes }}
+      it-category: ${{ matrix.it-category }}
+      http-client: ${{ matrix.httpclient }}
+
+  special_integration_tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 17, 21 ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Java and Maven
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+      - name: Run Special Integration Tests
+        run: ./mvnw ${MAVEN_ARGS} -B package -P minimal-watch-timeout-dependent-it --file pom.xml

.github/workflows/e2e-test.yml

@@ -19,7 +19,7 @@ jobs:
   sample_operators_tests:
     strategy:
       matrix:
-        sample_dir:
+        sample:
           - "sample-operators/mysql-schema"
           - "sample-operators/tomcat-operator"
           - "sample-operators/webpage"
@@ -48,12 +48,10 @@ jobs:
         run: mvn install -DskipTests
 
       - name: Run integration tests in local mode
-        working-directory: ${{ matrix.sample_dir }}
         run: |
-          mvn test -P end-to-end-tests
+          mvn test -P end-to-end-tests -pl ${{ matrix.sample }}
 
       - name: Run E2E tests as a deployment
-        working-directory: ${{ matrix.sample_dir }}
         run: |
           eval $(minikube -p minikube docker-env)
-          mvn jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote
+          mvn jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote -pl ${{ matrix.sample }}

.github/workflows/fabric8-next-version-schedule.yml

@@ -23,46 +23,8 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
-          cache: 'maven'
       - name: Run unit tests
         run: ./mvnw ${MAVEN_ARGS} clean install --file pom.xml
 
-  integration_tests:
-    strategy:
-      matrix:
-        java: [ 11, 17 ]
-        kubernetes: ['v1.28.12', 'v1.29.7','1.30.3', '1.31.0']
-    uses: ./.github/workflows/integration-tests.yml
-    with:
-      java-version: ${{ matrix.java }}
-      kube-version: ${{ matrix.kubernetes }}
-
-  httpclient-tests:
-    strategy:
-      matrix:
-        httpclient: [ 'vertx', 'jdk', 'jetty' ]
-    uses: ./.github/workflows/integration-tests.yml
-    with:
-      java-version: 17
-      kube-version: 'v1.29.1'
-      http-client: ${{ matrix.httpclient }}
-      experimental: true
-      checkout-ref: 'fabric8-next-version'
-
-  special_integration_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ 11, 17 ]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: 'fabric8-next-version'
-      - name: Set up Java and Maven
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Run Special Integration Tests
-        run: ./mvnw ${MAVEN_ARGS} -B package -P minimal-watch-timeout-dependent-it --file pom.xml
+  build:
+    uses: ./.github/workflows/build.yml

.github/workflows/hugo.yaml

@@ -49,7 +49,7 @@ jobs:
         id: pages
         uses: actions/configure-pages@v5
       - name: Install Node.js dependencies
-        working-directory: ./docsy
+        working-directory: ./docs
         run: |          
           [[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true
           npm install -D autoprefixer
@@ -61,7 +61,7 @@ jobs:
           HUGO_ENVIRONMENT: production
           HUGO_ENV: production
           TZ: America/Los_Angeles
-        working-directory: ./docsy
+        working-directory: ./docs
         run: |
           hugo \
             --gc \
@@ -70,7 +70,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: ./docsy/public
+          path: ./docs/public
 
   # Deployment job
   deploy:

.github/workflows/integration-tests.yml

@@ -12,7 +12,7 @@ on:
       http-client:
         type: string
         required: false
-        default: 'okhttp'
+        default: 'vertx'
       experimental:
         type: boolean
         required: false
@@ -21,6 +21,10 @@ on:
         type: string
         required: false
         default: ''
+      it-category:
+        type: string
+        required: false
+        default: ''
 
 jobs:
   integration_tests:
@@ -42,9 +46,17 @@ jobs:
       - name: Set up Minikube
         uses: manusa/[email protected]
         with:
-          minikube version: v1.33.0
-          kubernetes version: ${{ inputs.kube-version }}
+          minikube version: 'v1.33.0'
+          kubernetes version: '${{ inputs.kube-version }}'
           driver: 'docker'
           github token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run integration tests
-        run: ./mvnw ${MAVEN_ARGS} -B package -P no-unit-tests -Dfabric8-httpclient-impl.name=${{inputs.http-client}} --file pom.xml
+      - name: "${{inputs.it-category}} integration tests (kube: ${{ inputs.kube-version }} / java: ${{ inputs.java-version }} / client: ${{ inputs.http-client }})"
+        run: |
+          if [ -z "${{inputs.it-category}}" ]; then
+            it_profile="integration-tests"
+          else
+            it_profile="integration-tests-${{inputs.it-category}}"
+          fi
+          echo "Using profile: ${it_profile}"
+          ./mvnw ${MAVEN_ARGS} -T1C -B install -DskipTests -Pno-apt --file pom.xml
+          ./mvnw ${MAVEN_ARGS} -T1C -B package -P${it_profile} -Dfabric8-httpclient-impl.name=${{inputs.http-client}} --file pom.xml

.github/workflows/pr.yml

@@ -26,44 +26,9 @@ jobs:
           cache: 'maven'
       - name: Check code format
         run: |
-          ./mvnw ${MAVEN_ARGS} formatter:validate -Dconfigfile=$PWD/contributing/eclipse-google-style.xml -pl '!operator-framework-bom' --file pom.xml
-          ./mvnw ${MAVEN_ARGS} impsort:check -pl '!operator-framework-bom' --file pom.xml
+          ./mvnw ${MAVEN_ARGS} spotless:check --file pom.xml
       - name: Run unit tests
-        run: ./mvnw ${MAVEN_ARGS} clean install --file pom.xml
+        run: ./mvnw ${MAVEN_ARGS} clean install -Pno-apt --file pom.xml
 
-  integration_tests:
-    strategy:
-      matrix:
-        java: [ 11, 17 ]
-        kubernetes: [ 'v1.28.12', 'v1.29.7','1.30.3', '1.31.0' ]
-    uses: ./.github/workflows/integration-tests.yml
-    with:
-      java-version: ${{ matrix.java }}
-      kube-version: ${{ matrix.kubernetes }}
-
-  httpclient-tests:
-    strategy:
-      matrix:
-        httpclient: [ 'vertx', 'jdk', 'jetty' ]
-    uses: ./.github/workflows/integration-tests.yml
-    with:
-      java-version: 17
-      kube-version: 'v1.29.1'
-      http-client: ${{ matrix.httpclient }}
-      experimental: true
-
-  special_integration_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ 11, 17 ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Java and Maven
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Run Special Integration Tests
-        run: ./mvnw ${MAVEN_ARGS} -B package -P minimal-watch-timeout-dependent-it --file pom.xml
+  build:
+    uses: ./.github/workflows/build.yml

.github/workflows/release-project-in-dir.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Java and Maven
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'maven'
 
@@ -61,7 +61,7 @@ jobs:
       - name: Set up Java and Maven
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'maven'
 

.github/workflows/snapshot-releases.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: 'maven'
       - name: Build and test project
         run: ./mvnw ${MAVEN_ARGS} clean install --file pom.xml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: 'maven'
       - name: Release Maven package
         uses: samuelmeuli/action-maven-publish@v1

README.md

@@ -1,4 +1,4 @@
-# ![java-operator-sdk](docsy/static/images/full_logo.png)
+# ![java-operator-sdk](docs/static/images/full_logo.png)
 
 ![Java CI with Maven](https://github.com/operator-framework/java-operator-sdk/actions/workflows/snapshot-releases.yml/badge.svg)
 [![Slack](https://img.shields.io/badge/Slack-4A154B?style=flat-square&logo=slack&logoColor=white)](https://kubernetes.slack.com/archives/CAW0GV7A5 "get invite here: https://communityinviter.com/apps/kubernetes/community" )
@@ -40,7 +40,6 @@ It makes it easy to implement best practices and patterns for an Operator. Featu
 * Handling dependent resources, related events, and caching.
 * Automatic Retries
 * Smart event scheduling
-* Handling Observed Generations automatically
 * Easy to use Error Handling
 * ... and everything that a batteries included framework needs 
 

bootstrapper-maven-plugin/pom.xml

@@ -1,11 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>java-operator-sdk</artifactId>
     <groupId>io.javaoperatorsdk</groupId>
-    <version>4.9.6-SNAPSHOT</version>
+    <artifactId>java-operator-sdk</artifactId>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>bootstrapper</artifactId>
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -72,29 +72,29 @@
   </dependencies>
 
   <build>
-  <plugins>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-plugin-plugin</artifactId>
-      <version>${maven-plugin-plugin.version}</version>
-      <configuration>
-        <goalPrefix>josdk-bootstrapper</goalPrefix>
-      </configuration>
-    </plugin>
-    <plugin>
-      <groupId>org.codehaus.mojo</groupId>
-      <artifactId>templating-maven-plugin</artifactId>
-      <version>${templating-maven-plugin.version}</version>
-      <executions>
-        <execution>
-          <id>filtering-java-templates</id>
-          <goals>
-            <goal>filter-sources</goal>
-          </goals>
-        </execution>
-      </executions>
-    </plugin>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>${maven-plugin-plugin.version}</version>
+        <configuration>
+          <goalPrefix>josdk-bootstrapper</goalPrefix>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>templating-maven-plugin</artifactId>
+        <version>${templating-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>filtering-java-templates</id>
+            <goals>
+              <goal>filter-sources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
-  </plugins>
+    </plugins>
   </build>
 </project>

bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java

@@ -21,7 +21,7 @@ public class Bootstrapper {
 
   private static final Logger log = LoggerFactory.getLogger(Bootstrapper.class);
 
-  private MustacheFactory mustacheFactory = new DefaultMustacheFactory();
+  private final MustacheFactory mustacheFactory = new DefaultMustacheFactory();
 
   // .gitignore gets excluded from resource, using here a prefixed version
   private static final Map<String, String> TOP_LEVEL_STATIC_FILES =