FLINK-36332 Add option to select the Fabric8 httpclient implemention #881
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,13 +38,21 @@ under the License. | |
| <!-- required by FlinkConfigManagerTest --> | ||
| --add-opens=java.base/java.util=ALL-UNNAMED | ||
| </surefire.module.config> | ||
| <!-- valid options can be checked at https://central.sonatype.com/search?q=kubernetes-httpclient- currently: okhttp, jdk, jetty, vertx --> | ||
| <fabric8.httpclinent.impl>okhttp</fabric8.httpclinent.impl> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.javaoperatorsdk</groupId> | ||
| <artifactId>operator-framework</artifactId> | ||
| <version>${operator.sdk.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>io.fabric8</groupId> | ||
| <artifactId>kubernetes-httpclient-okhttp</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
|
|
@@ -60,26 +68,17 @@ under the License. | |
| </dependency> | ||
|
|
||
| <dependency> | ||
| <!-- https://github.com/fabric8io/kubernetes-client/blob/main/doc/FAQ.md#what-artifacts-should-my-project-depend-on--> | ||
| <groupId>io.fabric8</groupId> | ||
| <artifactId>kubernetes-httpclient-${fabric8.httpclinent.impl}</artifactId> | ||
| <version>${fabric8.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>com.squareup.okhttp3</groupId> | ||
| <artifactId>okhttp</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
|
|
||
| <!-- Flink --> | ||
| <dependency> | ||
|
|
@@ -174,6 +173,12 @@ under the License. | |
| <artifactId>kubernetes-server-mock</artifactId> | ||
| <version>${fabric8.version}</version> | ||
| <scope>test</scope> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>com.squareup.okhttp3</groupId> | ||
| <artifactId>mockwebserver</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
|
|
@@ -413,6 +418,22 @@ under the License. | |
| </plugins> | ||
| </build> | ||
| </profile> | ||
| <profile> | ||
| <id>depend-on-okhttp4</id> | ||
| <activation> | ||
| <property> | ||
| <name>fabric8.httpclinent.impl</name> | ||
| <value>okhttp</value> | ||
| </property> | ||
| </activation> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.squareup.okhttp3</groupId> | ||
| <artifactId>okhttp</artifactId> | ||
| <version>${okhttp.version}</version> | ||
| </dependency> | ||
|
Comment on lines
+430
to
+434
There was a problem hiding this comment. By default |
||
| </dependencies> | ||
| </profile> | ||
| </profiles> | ||
|
|
||
| </project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should actually move the namespace , and java-version matrix also to the smoke_test and fix-it (remove-it) in the regular e2es.
The http-client, java-version, namespace matrix doesn't need all the different tests, it either works or it doesn't (famous last words).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually the namespace flink/default doesn't really need more than 1 test (regardless of other params...)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree it's a bit strange. What I was intending to do was make the smallest change here and revisit it in a follow up hence the matrix of single values.
Thanks that’s the kind of insight I need for restructuring🧩.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@SamBarker , how would you like to proceed with this? As long as we are adding the matrix changes I suggested in a followup , this is good from my side.
Should we squash it and merge it or would you want to add the restructuring here as a "second" commit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd like to get this merged and follow up with the restructuring.
Squashing seems wise 😆