Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the latest 7.1.0 #774

vinokurig · 2025-02-28T13:36:47Z

What does this PR do?

Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the latest 7.1.0

Screenshot/screencast of this PR

What issues does this PR fix or reference?

How to test this PR?

N/A

PR Checklist

As the author of this Pull Request I made sure that:

Release Notes

Reviewers

Reviewers, please comment how you tested the PR when approving it.

openshift-ci · 2025-02-28T13:36:55Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: vinokurig

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

… latest 7.1.0

ibuziuk · 2025-02-28T14:36:25Z

pom.xml

@@ -59,15 +59,16 @@
        <com.googlecode.gson.version>2.10.1</com.googlecode.gson.version>
        <com.h2database.version>2.2.224</com.h2database.version>
        <com.jcraft.jsch.version>0.1.55</com.jcraft.jsch.version>
-        <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
+        <com.squareup.okhttp3.version>5.0.0-alpha.12</com.squareup.okhttp3.version>


should we really use alpha here? cc: @manusa
maybe we should also consider switching to another client - https://blog.marcnuri.com/kubernetes-client-6-httpclient-how-to

So in version 7 the default client is no longer OkHttp but Vertx:

https://blog.marcnuri.com/fabric8-kubernetes-client-7-0#vertx-as-default-httpclient-implementation

https://github.com/fabric8io/kubernetes-client/blob/main/doc/MIGRATION-v7.md#vertx-httpclient

You no longer need a dependency to OkHttp unless you actually do the opposite that's explained in the referenced blog post.

To be clear, OkHttp and any reference should be removed.

I still need the com.squareup.okhttp3:mockwebserver dependency, otherwise I get the test compilation error:

[INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] /Users/ivinokur/projects/che-server/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/SshKeysConfiguratorTest.java:[62,21] cannot access org.junit.rules.ExternalResource class file for org.junit.rules.ExternalResource not found [INFO] 1 error [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------

The test is failing on kubernetes initialisation step:

che-server/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/SshKeysConfiguratorTest.java

Line 62 in dd873a5

kubernetesServer.before();

According to square/okhttp#7987 (comment) we need the com.squareup.okhttp3:mockwebserver dependency to use the junit 5 module.

@manusa could you please take a look?

You should not be using ExternalResource (it's JUnit4)

Switch to use the @EnableKubernetesMockClient(crud = true)

For some reason you're using a very convoluted way to set up the mock server in your tests.

If you want, I can update this test in a separate PR so you can follow the pattern for any other test doing the same weird setup

@manusa

Switch to use the @EnableKubernetesMockClient(crud = true)

Unfortunately @EnableKubernetesMockClient did not work for me.

If you want, I can update this test in a separate PR so you can follow the pattern for any other test doing the same weird setup

Thank you, that would be much appreciated.

I see you're not using JUnit (neither 4 or 5) but TestNG instead.

I'll make another set of updates that should be v7-compatible.

I created #776

Once merged, you should rebase this PR and replace okhttp3.mockwebserver.MockWebServer with io.fabric8.mockwebserver.MockWebServer

https://github.com/fabric8io/kubernetes-client/blob/main/doc/MIGRATION-v7.md#mockwebserver-okhttp-replacements

----> No OkHttp dependency should remain.

manusa · 2025-02-28T14:59:02Z

core/che-core-metrics-core/pom.xml

        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <artifactId>okhttp-jvm</artifactId>
        </dependency>


#774 (comment)

manusa · 2025-02-28T15:00:40Z

pom.xml

        <com.squareup.okio.version>3.6.0</com.squareup.okio.version>
        <commons-fileupload.version>1.5</commons-fileupload.version>
        <commons-io.version>2.14.0</commons-io.version>
        <commons-lang.version>2.6</commons-lang.version>
        <enforcer.skip>false</enforcer.skip>
        <integration.mysql.db.image>quay.io/eclipse/che--centos--mysql-57-centos7:latest-e08ee4d43b7356607685b69bde6335e27cf20c020f345b6c6c59400183882764</integration.mysql.db.image>
        <integration.postgresql.db.image>quay.io/eclipse/che--centos--postgresql-13-centos7:1-71b24684d64da46f960682cc4216222a7e4ed8b1a31dd5a865b3e71afdea20d2</integration.postgresql.db.image>
-        <io.fabric8.kubernetes-client>6.10.0</io.fabric8.kubernetes-client>
+        <io.fabric8.kubernetes-client.version>7.1.0</io.fabric8.kubernetes-client.version>
+        <io.fabric8.openshift-server-mock.version>6.13.5</io.fabric8.openshift-server-mock.version>


You should remove this.
OpenShift Mock Server is not needed, you should switch to the vanilla Kubernetes Mock Server.
If you have trouble migrating, give me an example file and I'll show you the exact replacements you need to perform.

manusa · 2025-02-28T15:00:54Z

pom.xml

+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-jvm</artifactId>
+                <version>${com.squareup.okhttp3.version}</version>
            </dependency>


#774 (comment)

manusa · 2025-02-28T15:01:10Z

pom.xml

            <dependency>
                <groupId>io.fabric8</groupId>
                <artifactId>openshift-server-mock</artifactId>
-                <version>${io.fabric8.kubernetes-client}</version>
+                <version>${io.fabric8.openshift-server-mock.version}</version>
            </dependency>


https://github.com/eclipse-che/che-server/pull/774/files#r1975558168

… to the latest 7.1.0

openshift-ci · 2025-03-03T12:00:55Z

@vinokurig: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/v14-gitlab-no-pat-oauth-flow	`e8143c5`	link	true	`/test v14-gitlab-no-pat-oauth-flow`
ci/prow/v14-gitlab-no-pat-oauth-flow-raw-devfile-url	`e8143c5`	link	true	`/test v14-gitlab-no-pat-oauth-flow-raw-devfile-url`
ci/prow/v14-bitbucket-no-pat-oauth-flow	`e8143c5`	link	true	`/test v14-bitbucket-no-pat-oauth-flow`
ci/prow/v14-github-no-pat-oauth-flow	`e8143c5`	link	true	`/test v14-github-no-pat-oauth-flow`
ci/prow/v14-gitea-with-pat-setup-flow	`e8143c5`	link	true	`/test v14-gitea-with-pat-setup-flow`
ci/prow/v14-azure-with-pat-setup-flow	`e8143c5`	link	true	`/test v14-azure-with-pat-setup-flow`
ci/prow/v14-azure-no-pat-oauth-flow-raw-devfile-url	`e8143c5`	link	true	`/test v14-azure-no-pat-oauth-flow-raw-devfile-url`
ci/prow/v14-github-no-pat-oauth-flow-raw-devfile-url	`e8143c5`	link	true	`/test v14-github-no-pat-oauth-flow-raw-devfile-url`
ci/prow/v14-github-no-pat-oauth-flow-ssh-url	`e8143c5`	link	true	`/test v14-github-no-pat-oauth-flow-ssh-url`
ci/prow/v14-github-with-pat-setup-flow	`e8143c5`	link	true	`/test v14-github-with-pat-setup-flow`
ci/prow/v14-gitlab-no-pat-oauth-flow-ssh-url	`e8143c5`	link	true	`/test v14-gitlab-no-pat-oauth-flow-ssh-url`
ci/prow/v14-bitbucket-no-pat-oauth-flow-ssh-url	`e8143c5`	link	true	`/test v14-bitbucket-no-pat-oauth-flow-ssh-url`
ci/prow/v14-azure-no-pat-oauth-flow-ssh-url	`e8143c5`	link	true	`/test v14-azure-no-pat-oauth-flow-ssh-url`
ci/prow/v14-azure-no-pat-oauth-flow	`e8143c5`	link	true	`/test v14-azure-no-pat-oauth-flow`
ci/prow/v14-che-smoke-test	`e8143c5`	link	true	`/test v14-che-smoke-test`
ci/prow/v14-gitlab-with-pat-setup-flow	`e8143c5`	link	true	`/test v14-gitlab-with-pat-setup-flow`
ci/prow/v14-gitea-no-pat-oauth-flow	`e8143c5`	link	true	`/test v14-gitea-no-pat-oauth-flow`
ci/prow/v14-bitbucket-no-pat-oauth-flow-raw-devfile-url	`e8143c5`	link	true	`/test v14-bitbucket-no-pat-oauth-flow-raw-devfile-url`
ci/prow/v14-gitlab-with-oauth-setup-flow	`e8143c5`	link	true	`/test v14-gitlab-with-oauth-setup-flow`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

vinokurig requested review from SDawley, ibuziuk and tolusha as code owners February 28, 2025 13:36

vinokurig force-pushed the che-23272 branch 3 times, most recently from 72e34b0 to 55312a2 Compare February 28, 2025 13:48

Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the…

4aaab10

… latest 7.1.0

vinokurig force-pushed the che-23272 branch from 55312a2 to 4aaab10 Compare February 28, 2025 14:08

ibuziuk reviewed Feb 28, 2025

View reviewed changes

manusa reviewed Feb 28, 2025

View reviewed changes

fixup! Update the io.fabric8.kubernetes-client dependency from 6.10.0…

e8143c5

… to the latest 7.1.0

vinokurig force-pushed the che-23272 branch from f8853b9 to e8143c5 Compare March 3, 2025 09:28

manusa mentioned this pull request Mar 4, 2025

Replace deprecated i.f.k.c.s.mock.KubernetesServer with KubernetesMockServer #776

Open

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the latest 7.1.0 #774

Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the latest 7.1.0 #774

vinokurig commented Feb 28, 2025

openshift-ci bot commented Feb 28, 2025

ibuziuk Feb 28, 2025

manusa Feb 28, 2025

vinokurig Mar 3, 2025 •

edited

Loading

manusa Mar 3, 2025

manusa Mar 3, 2025

vinokurig Mar 3, 2025

manusa Mar 4, 2025

manusa Mar 4, 2025

manusa Feb 28, 2025

manusa Feb 28, 2025

vinokurig Mar 3, 2025

manusa Feb 28, 2025

manusa Feb 28, 2025

openshift-ci bot commented Mar 3, 2025

Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the latest 7.1.0 #774

Are you sure you want to change the base?

Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the latest 7.1.0 #774

Conversation

vinokurig commented Feb 28, 2025

What does this PR do?

Screenshot/screencast of this PR

What issues does this PR fix or reference?

How to test this PR?

PR Checklist

Release Notes

Reviewers

openshift-ci bot commented Feb 28, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vinokurig Mar 3, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci bot commented Mar 3, 2025

vinokurig Mar 3, 2025 •

edited

Loading