fix

Signed-off-by: David Kornel <[email protected]>
skodjob · May 7, 2024 · 1d259a1 · 1d259a1
1 parent 71dba68
commit 1d259a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/test/java/io/odh/test/e2e/standard/ModelServingST.java b/src/test/java/io/odh/test/e2e/standard/ModelServingST.java
@@ -90,7 +90,7 @@ public class ModelServingST extends StandardAbstract {
 
     private static final String DS_PROJECT_NAME = "test-model-serving";
 
-    private final OpenShiftClient kubeClient = (OpenShiftClient) KubeResourceManager.getKubeClient().getClient();
+    private final OpenShiftClient kubeClient = KubeResourceManager.getKubeClient().getOpenShiftClient();
 
     @BeforeAll
     static void deployDataScienceCluster() {

diff --git a/src/test/java/io/odh/test/e2e/standard/PipelineServerST.java b/src/test/java/io/odh/test/e2e/standard/PipelineServerST.java
@@ -13,7 +13,6 @@
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;
 import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.LocalPortForward;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.ServiceResource;
@@ -71,7 +70,7 @@ public class PipelineServerST extends StandardAbstract {
     private static final String DS_PROJECT_NAME = "test-pipelines";
 
     private final KubeResourceManager resourceManager = KubeResourceManager.getInstance();
-    private final KubernetesClient client = KubeResourceManager.getKubeClient().getClient();
+    private final OpenShiftClient client = KubeResourceManager.getKubeClient().getOpenShiftClient();
 
     @BeforeAll
     void deployDataScienceCluster() {
@@ -110,7 +109,6 @@ void deployDataScienceCluster() {
     )
     @Test
     void testUserCanCreateRunAndDeleteADSPipelineFromDSProject() throws IOException {
-        OpenShiftClient ocClient = (OpenShiftClient) client;
 
         final String pipelineTestName = "pipeline-test-name";
         final String pipelineTestDesc = "pipeline-test-desc";
@@ -210,7 +208,7 @@ void testUserCanCreateRunAndDeleteADSPipelineFromDSProject() throws IOException
         TestUtils.waitForEndpoints("pipelines", endpoints);
 
         // connect to the api server we just created, route not available unless I enable oauth
-        Resource<Route> route = ocClient.routes()
+        Resource<Route> route = client.routes()
                 .inNamespace(prjTitle).withName("ds-pipeline-pipelines-definition");
 
         // TODO(jdanek) I don't know how to do oauth, so lets forward a port

diff --git a/src/test/java/io/odh/test/e2e/standard/PipelineV2ServerST.java b/src/test/java/io/odh/test/e2e/standard/PipelineV2ServerST.java
@@ -13,7 +13,6 @@
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;
 import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.LocalPortForward;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.ServiceResource;
@@ -90,7 +89,7 @@ public class PipelineV2ServerST extends StandardAbstract {
 
     private static final String DS_PROJECT_NAME = "test-pipelines";
 
-    private final KubernetesClient client = KubeResourceManager.getKubeClient().getClient();
+    private final OpenShiftClient client = KubeResourceManager.getKubeClient().getOpenShiftClient();
 
     @BeforeAll
     void deployDataScienceCluster() {
@@ -179,8 +178,6 @@ void deployDataScienceCluster() {
     )
     @Test
     void testUserCanOperateDSv2PipelineFromDSProject() throws IOException {
-        OpenShiftClient ocClient = (OpenShiftClient) client;
-
         final String pipelineTestName = "pipeline-test-name";
         final String pipelineTestDesc = "pipeline-test-desc";
         final String prjTitle = "pipeline-test";
@@ -285,7 +282,7 @@ void testUserCanOperateDSv2PipelineFromDSProject() throws IOException {
         TestUtils.waitForEndpoints("pipelines", endpoints);
 
         Allure.step("Connect to the API server");
-        Resource<Route> route = ocClient.routes()
+        Resource<Route> route = client.routes()
                 .inNamespace(prjTitle).withName("ds-pipeline-pipelines-definition");
 
         // TODO(jdanek) I still don't know how to do oauth, so let's forward a port