fix v2

Signed-off-by: David Kornel <[email protected]>
skodjob · May 3, 2024 · cad585d · cad585d
1 parent 6acc0ad
commit cad585d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/src/main/java/io/odh/test/framework/manager/requirements/AuthorinoOperator.java b/src/main/java/io/odh/test/framework/manager/requirements/AuthorinoOperator.java
@@ -41,7 +41,11 @@ public static void deployOperator() {
                 .endSpec()
                 .build();
 
-        KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        if (KubeResourceManager.getKubeClient().getOpenShiftClient().operatorHub().subscriptions().inNamespace(TestConstants.OPENSHIFT_OPERATORS_NS).withName(SUBSCRIPTION_NAME).get() == null) {
+            KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        } else {
+            KubeResourceManager.getInstance().updateResource(subscription);
+        }
         KubeResourceManager.getInstance().pushToStack(new ResourceItem<>(() -> deleteOperator(subscription), null));
         isOperatorReady();
     }

diff --git a/src/main/java/io/odh/test/framework/manager/requirements/PipelinesOperator.java b/src/main/java/io/odh/test/framework/manager/requirements/PipelinesOperator.java
@@ -42,7 +42,11 @@ public static void deployOperator() {
                 .endSpec()
                 .build();
 
-        KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        if (KubeResourceManager.getKubeClient().getOpenShiftClient().operatorHub().subscriptions().inNamespace(TestConstants.OPENSHIFT_OPERATORS_NS).withName(SUBSCRIPTION_NAME).get() == null) {
+            KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        } else {
+            KubeResourceManager.getInstance().updateResource(subscription);
+        }
         KubeResourceManager.getInstance().pushToStack(new ResourceItem<>(() -> deleteOperator(subscription), null));
         isOperatorReady();
     }

diff --git a/src/main/java/io/odh/test/framework/manager/requirements/ServerlessOperator.java b/src/main/java/io/odh/test/framework/manager/requirements/ServerlessOperator.java
@@ -34,7 +34,9 @@ public static void deployOperator() {
                 .withLabels(Collections.singletonMap(OdhAnnotationsLabels.APP_LABEL_KEY, OdhAnnotationsLabels.APP_LABEL_VALUE))
                 .endMetadata()
                 .build();
-        KubeResourceManager.getInstance().createResourceWithoutWait(ns);
+        if (!KubeResourceManager.getKubeClient().namespaceExists(OPERATOR_NAMESPACE)) {
+            KubeResourceManager.getInstance().createResourceWithoutWait(ns);
+        }
         //Create operator group for the operator
         if (KubeResourceManager.getKubeClient().getOpenShiftClient().operatorHub().operatorGroups()
                 .inNamespace(OPERATOR_NAMESPACE).list().getItems().isEmpty()) {
@@ -67,7 +69,11 @@ public static void deployOperator() {
                 .endSpec()
                 .build();
 
-        KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        if (KubeResourceManager.getKubeClient().getOpenShiftClient().operatorHub().subscriptions().inNamespace(OPERATOR_NAMESPACE).withName(SUBSCRIPTION_NAME).get() == null) {
+            KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        } else {
+            KubeResourceManager.getInstance().updateResource(subscription);
+        }
         KubeResourceManager.getInstance().pushToStack(new ResourceItem<>(() -> deleteOperator(ns), null));
         isOperatorReady();
     }

diff --git a/src/main/java/io/odh/test/framework/manager/requirements/ServiceMeshOperator.java b/src/main/java/io/odh/test/framework/manager/requirements/ServiceMeshOperator.java
@@ -43,7 +43,11 @@ public static void deployOperator() {
                 .endSpec()
                 .build();
 
-        KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        if (KubeResourceManager.getKubeClient().getOpenShiftClient().operatorHub().subscriptions().inNamespace(TestConstants.OPENSHIFT_OPERATORS_NS).withName(SUBSCRIPTION_NAME).get() == null) {
+            KubeResourceManager.getInstance().createResourceWithWait(subscription);
+        } else {
+            KubeResourceManager.getInstance().updateResource(subscription);
+        }
         KubeResourceManager.getInstance().pushToStack(new ResourceItem<>(() -> deleteOperator(subscription), null));
         isOperatorReady();
     }