Merge branch 'main' into dependabot/maven/org.slf4j-slf4j-api-2.0.17

Author: csviri

.github/workflows/build.yml

@@ -5,73 +5,35 @@ env:
 
 on:
   workflow_call:
-    inputs:
-      kube-version:
-        type: string
-        required: true
 
 jobs:
-  set_up_kubernetes:
-    name: Set up Kubernetes ${{ inputs.kube-version }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Minikube
-        uses: manusa/[email protected]
-        with:
-          minikube version: 'v1.34.0'
-          kubernetes version: '${{ inputs.kube-version }}'
-          driver: 'docker'
-          github token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Save minikube directory
-        id: minikube
-        run: |
-          echo "minikube-dir=$MINIKUBE_HOME" >> $GITHUB_OUTPUT
-
-      - name: Upload minikube
-        uses: actions/upload-artifact@v4
-        with:
-          name: minikube-${{ inputs.kube-version }}
-          path: ${{ steps.minikube.outputs.minikube-dir }}
-          include-hidden-files: true
-
   integration_tests:
-    name: "JDK: ${{ matrix.java }}, IT category: ${{ matrix.it-category }}"
-    needs: set_up_kubernetes
     strategy:
       matrix:
-        java: [ 17, 21 ]
-        it-category: [ 'baseapi', 'dependent', 'workflow' ]
+        java: [ 17, 21, 24 ]
+        kubernetes: [ '1.30.12', '1.31.8', '1.32.4','1.33.0' ]
     uses: ./.github/workflows/integration-tests.yml
     with:
-      kube-version: ${{ inputs.kube-version }}
       java-version: ${{ matrix.java }}
-      it-category: ${{ matrix.it-category }}
+      kube-version: ${{ matrix.kubernetes }}
 
-  http_client_tests:
-    name: "JDK: ${{ matrix.java }}, IT category: ${{ matrix.it-category }}, HTTP client: ${{ matrix.httpclient }}"
-    needs: set_up_kubernetes
+  httpclient-tests:
     strategy:
       matrix:
-        java: [ 17, 21 ]
-        it-category: [ 'baseapi' ]
         httpclient: [ 'vertx', 'jdk', 'jetty' ]
     uses: ./.github/workflows/integration-tests.yml
     with:
-      kube-version: ${{ inputs.kube-version }}
-      java-version: ${{ matrix.java }}
-      it-category: ${{ matrix.it-category }}
+      java-version: 24
+      kube-version: '1.32.0'
       http-client: ${{ matrix.httpclient }}
+      experimental: true
 
   special_integration_tests:
     name: "Special integration tests (${{ matrix.java }})"
-    needs: set_up_kubernetes
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 17, 21 ]
+        java: [ 17, 21, 24 ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Java and Maven
@@ -81,13 +43,3 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Run Special Integration Tests
         run: ./mvnw ${MAVEN_ARGS} -B package -P minimal-watch-timeout-dependent-it --file pom.xml
-
-  delete_kubernetes:
-    needs: [ integration_tests, http_client_tests, special_integration_tests ]
-    if: always()
-    name: Delete Kubernetes ${{ inputs.kube-version }} artifact
-    runs-on: ubuntu-latest
-    steps:
-      - uses: geekyeggo/delete-artifact@v5
-        with:
-          name: minikube-${{ inputs.kube-version }}

.github/workflows/e2e-test.yml

@@ -30,10 +30,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Minikube-Kubernetes
-        uses: manusa/actions-setup-minikube@v2.13.1
+        uses: manusa/actions-setup-minikube@v2.14.0
         with:
           minikube version: v1.34.0
-          kubernetes version: v1.32.0
+          kubernetes version: v1.33.0
           github token: ${{ secrets.GITHUB_TOKEN }}
           driver: docker
 

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

@@ -32,7 +32,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      HUGO_VERSION: 0.125.4
+      HUGO_VERSION: 0.145.0
     steps:
       - name: Install Hugo CLI
         run: |

.github/workflows/hugo.yaml

@@ -21,20 +21,14 @@ on:
         type: string
         required: false
         default: ''
-      it-category:
-        type: string
-        required: false
-        default: ''
 
 jobs:
   integration_tests:
-    name: "Experimental: ${{ inputs.experimental }}, Checkout ref: ${{ inputs.checkout-ref }}"
+    name: Integration tests (${{ inputs.java-version }}, ${{ inputs.kube-version }}, ${{ inputs.http-client }})
     runs-on: ubuntu-latest
     continue-on-error: ${{ inputs.experimental }}
     timeout-minutes: 40
     steps:
-      - name: Output test information
-        run: echo "Running ITs with ${{ inputs.http-client }}, ${{ inputs.kube-version }}, ${{ inputs.java-version }}"
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.checkout-ref }}
@@ -44,18 +38,13 @@ jobs:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
           cache: 'maven'
-      - name: Download minikube artifact for Kubernetes ${{ inputs.kube-version }}
-        uses: actions/download-artifact@v4
+      - name: Set up Minikube
+        uses: manusa/[email protected]
         with:
-          name: minikube-${{inputs.kube-version}}
-          path: minikube
-      - name: Start minikube with Kubernetes ${{ inputs.kube-version }}
-        run: |
-          # wait for docker
-          docker version -f '{{.Server.Version}} - {{.Client.Version}}'
-          export MINIKUBE_HOME=$PWD/minikube
-          minikube start --driver=docker
-          kubectl version
+          minikube version: 'v1.34.0'
+          kubernetes version: '${{ inputs.kube-version }}'
+          driver: 'docker'
+          github token: ${{ secrets.GITHUB_TOKEN }}
       - 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

.github/workflows/integration-tests.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'maven'
       - name: Check code format
         run: |
@@ -31,10 +31,4 @@ jobs:
         run: ./mvnw ${MAVEN_ARGS} clean install -Pno-apt --file pom.xml
 
   build:
-    name: Integration tests with Kubernetes ${{ matrix.kubernetes }}
-    strategy:
-      matrix:
-        kubernetes: [ 'v1.29.12','1.30.8', '1.31.4', '1.32.0' ]
     uses: ./.github/workflows/build.yml
-    with:
-      kube-version: ${{ matrix.kubernetes }}

.github/workflows/pr.yml

@@ -1,5 +1,5 @@
 {
-    "java.format.settings.url": "contributing/eclipse-google-style.xml",
+    "java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml",
     "java.completion.importOrder": [
         "java",
         "javax",

.vscode/settings.json

@@ -62,10 +62,10 @@ The SDK modules and samples are formatted to follow the Java Google code style.
 On every `compile` the code gets formatted automatically, 
 however, to make things simpler (i.e. avoid getting a PR rejected simply because of code style issues), you can import one of the following code style schemes based on the IDE you use:
 
-- for *IntelliJ IDEA*:
-    - Install the [Eclipse Code Formatter plugin](https://github.com/krasa/EclipseCodeFormatter#instructions)
-    - Use [contributing/eclipse-google-style.xml](contributing/eclipse-google-style.xml) for the Eclipse formatter config file
-- for *Eclipse* import [contributing/eclipse-google-style.xml](contributing/eclipse-google-style.xml)
+- for *Intellij IDEA*
+  install [google-java-format](https://plugins.jetbrains.com/plugin/8527-google-java-format) plugin
+- for *Eclipse*
+  follow [these intructions](https://github.com/google/google-java-format?tab=readme-ov-file#eclipse)
 
 ## Thanks
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.javaoperatorsdk</groupId>
     <artifactId>java-operator-sdk</artifactId>
-    <version>5.0.4-SNAPSHOT</version>
+    <version>5.1.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>bootstrapper</artifactId>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.18.0</version>
+      <version>2.19.0</version>
     </dependency>
     <dependency>
       <groupId>com.github.spullara.mustache.java</groupId>

bootstrapper-maven-plugin/pom.xml

@@ -27,8 +27,7 @@ public class Bootstrapper {
   private static final Map<String, String> TOP_LEVEL_STATIC_FILES =
       Map.of("_.gitignore", ".gitignore", "README.md", "README.md");
   private static final List<String> JAVA_FILES =
-      List.of("CustomResource.java", "Reconciler.java",
-          "Spec.java", "Status.java");
+      List.of("CustomResource.java", "Reconciler.java", "Spec.java", "Status.java");
 
   public void create(File targetDir, String groupId, String artifactId) {
     try {
@@ -61,42 +60,62 @@ private void addJavaFiles(File projectDir, String groupId, String artifactId) {
       var targetTestDir = new File(projectDir, "src/test/java/" + packages);
       FileUtils.forceMkdir(targetDir);
       var classFileNamePrefix = artifactClassId(artifactId);
-      JAVA_FILES.forEach(f -> addTemplatedFile(projectDir, f, groupId, artifactId, targetDir,
-          classFileNamePrefix + f));
+      JAVA_FILES.forEach(
+          f ->
+              addTemplatedFile(
+                  projectDir, f, groupId, artifactId, targetDir, classFileNamePrefix + f));
 
       addTemplatedFile(projectDir, "Runner.java", groupId, artifactId, targetDir, null);
-      addTemplatedFile(projectDir, "ConfigMapDependentResource.java", groupId, artifactId,
-          targetDir, null);
-      addTemplatedFile(projectDir, "ReconcilerIntegrationTest.java", groupId,
+      addTemplatedFile(
+          projectDir, "ConfigMapDependentResource.java", groupId, artifactId, targetDir, null);
+      addTemplatedFile(
+          projectDir,
+          "ReconcilerIntegrationTest.java",
+          groupId,
           artifactId,
-          targetTestDir, artifactClassId(artifactId) + "ReconcilerIntegrationTest.java");
+          targetTestDir,
+          artifactClassId(artifactId) + "ReconcilerIntegrationTest.java");
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
-
   }
 
   private void addTemplatedFiles(File projectDir, String groupId, String artifactId) {
     addTemplatedFile(projectDir, "pom.xml", groupId, artifactId);
     addTemplatedFile(projectDir, "k8s/test-resource.yaml", groupId, artifactId);
   }
 
-  private void addTemplatedFile(File projectDir, String fileName, String groupId,
-      String artifactId) {
+  private void addTemplatedFile(
+      File projectDir, String fileName, String groupId, String artifactId) {
     addTemplatedFile(projectDir, fileName, groupId, artifactId, null, null);
   }
 
-  private void addTemplatedFile(File projectDir, String fileName, String groupId, String artifactId,
-      File targetDir, String targetFileName) {
+  private void addTemplatedFile(
+      File projectDir,
+      String fileName,
+      String groupId,
+      String artifactId,
+      File targetDir,
+      String targetFileName) {
     try {
-      var values = Map.of("groupId", groupId, "artifactId", artifactId,
-          "artifactClassId", artifactClassId(artifactId),
-          "josdkVersion", Versions.JOSDK,
-          "fabric8Version", Versions.KUBERNETES_CLIENT);
+      var values =
+          Map.of(
+              "groupId",
+              groupId,
+              "artifactId",
+              artifactId,
+              "artifactClassId",
+              artifactClassId(artifactId),
+              "josdkVersion",
+              Versions.JOSDK,
+              "fabric8Version",
+              Versions.KUBERNETES_CLIENT);
 
       var mustache = mustacheFactory.compile("templates/" + fileName);
-      var targetFile = new File(targetDir == null ? projectDir : targetDir,
-          targetFileName == null ? fileName : targetFileName);
+      var targetFile =
+          new File(
+              targetDir == null ? projectDir : targetDir,
+              targetFileName == null ? fileName : targetFileName);
       FileUtils.forceMkdir(targetFile.getParentFile());
       var writer = new FileWriter(targetFile);
       mustache.execute(writer, values);
@@ -114,8 +133,8 @@ private void addStaticFile(File targetDir, String fileName, String targetFileNam
     addStaticFile(targetDir, fileName, targetFileName, null);
   }
 
-  private void addStaticFile(File targetDir, String fileName, String targetFilename,
-      String subDir) {
+  private void addStaticFile(
+      File targetDir, String fileName, String targetFilename, String subDir) {
     String sourcePath = subDir == null ? "/static/" : "/static/" + subDir;
     String path = sourcePath + fileName;
     try (var is = Bootstrapper.class.getResourceAsStream(path)) {
@@ -127,14 +146,12 @@ private void addStaticFile(File targetDir, String fileName, String targetFilenam
     } catch (IOException e) {
       throw new RuntimeException("File path: " + path, e);
     }
-
   }
 
   public static String artifactClassId(String artifactId) {
     var parts = artifactId.split("-");
-    return Arrays.stream(parts).map(p -> p.substring(0, 1)
-        .toUpperCase() + p.substring(1))
+    return Arrays.stream(parts)
+        .map(p -> p.substring(0, 1).toUpperCase() + p.substring(1))
         .collect(Collectors.joining(""));
   }
-
 }

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

@@ -8,17 +8,15 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 @Mojo(name = "create", requiresProject = false)
-public class BootstrapperMojo
-    extends AbstractMojo {
+public class BootstrapperMojo extends AbstractMojo {
 
   @Parameter(defaultValue = "${projectGroupId}")
   protected String projectGroupId;
 
   @Parameter(defaultValue = "${projectArtifactId}")
   protected String projectArtifactId;
 
-  public void execute()
-      throws MojoExecutionException {
+  public void execute() throws MojoExecutionException {
     String userDir = System.getProperty("user.dir");
     new Bootstrapper().create(new File(userDir), projectGroupId, projectArtifactId);
   }