feat: parameterize http client implementation in ITs (#1839)

Author: metacosm

.github/workflows/integration-tests.yml

@@ -0,0 +1,44 @@
+name: Parameterized Integration Tests
+
+on:
+  workflow_call:
+    inputs:
+      java-version:
+        type: string
+        required: true
+      kube-version:
+        type: string
+        required: true
+      http-client:
+        type: string
+        required: false
+        default: 'okhttp'
+      experimental:
+        type: boolean
+        required: false
+        default: false
+
+jobs:
+  integration_tests:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ inputs.experimental }}
+    timeout-minutes: 20
+    steps:
+      - name: Output test information
+        run: echo "Running ITs with ${{ inputs.http-client }}, ${{ inputs.kube-version }}, ${{ inputs.java-version }}"
+      - uses: actions/checkout@v3
+      - name: Set up Java and Maven
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: ${{ inputs.java-version }}
+          cache: 'maven'
+      - name: Set up Minikube
+        uses: manusa/[email protected]
+        with:
+          minikube version: 'v1.28.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

.github/workflows/pr.yml

@@ -32,28 +32,26 @@ jobs:
         run: ./mvnw ${MAVEN_ARGS} -B test --file pom.xml
 
   integration_tests:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         java: [ 11, 17 ]
         kubernetes: [ 'v1.23.15', 'v1.24.9', 'v1.25.5' ]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Java and Maven
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Set up Minikube
-        uses: manusa/[email protected]
-        with:
-          minikube version: 'v1.28.0'
-          kubernetes version: ${{ matrix.kubernetes }}
-          driver: 'docker'
-          github token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run integration tests
-        run: ./mvnw ${MAVEN_ARGS} -B package -P no-unit-tests --file pom.xml
+    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.25.5'
+      http-client: ${{ matrix.httpclient }}
+      experimental: true
+
   special_integration_tests:
     runs-on: ubuntu-latest
     strategy:

operator-framework/pom.xml

@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-httpclient-okhttp</artifactId>
+      <artifactId>kubernetes-httpclient-${fabric8-httpclient-impl.name}</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

pom.xml

@@ -41,6 +41,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <sonar.organization>java-operator-sdk</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <fabric8-httpclient-impl.name>okhttp</fabric8-httpclient-impl.name>
 
         <junit.version>5.9.1</junit.version>
         <fabric8-client.version>6.5.1</fabric8-client.version>
@@ -219,16 +220,16 @@
               <version>${fabric8-client.version}</version>
             </dependency>
 <!--            We currently only recommend using the legacy okhttp client and the vert.x-based implementation -->
-<!--            <dependency>-->
-<!--              <groupId>io.fabric8</groupId>-->
-<!--              <artifactId>kubernetes-httpclient-jdk</artifactId>-->
-<!--              <version>${fabric8-client.version}</version>-->
-<!--            </dependency>-->
-<!--            <dependency>-->
-<!--              <groupId>io.fabric8</groupId>-->
-<!--              <artifactId>kubernetes-httpclient-jetty</artifactId>-->
-<!--              <version>${fabric8-client.version}</version>-->
-<!--            </dependency>-->
+            <dependency>
+              <groupId>io.fabric8</groupId>
+              <artifactId>kubernetes-httpclient-jdk</artifactId>
+              <version>${fabric8-client.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>io.fabric8</groupId>
+              <artifactId>kubernetes-httpclient-jetty</artifactId>
+              <version>${fabric8-client.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>