fix: merge main to next - fixed conflicts

csviri · csviri · commit 78a305b48a6e · 2022-02-09T15:58:08.000+01:00
diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml
@@ -72,6 +72,12 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
             <version>2.13.1</version>
         </dependency>
+        <dependency>
+            <groupId>io.javaoperatorsdk</groupId>
+            <artifactId>operator-framework-junit-5</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java b/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java
@@ -65,8 +65,8 @@ boolean isLocal() {
   @RegisterExtension
   AbstractOperatorExtension operator = isLocal() ? OperatorExtension.builder()
       .withConfigurationService(DefaultConfigurationService.instance())
-      .withReconciler(new MySQLSchemaReconciler(client,
-          new MySQLDbConfig("127.0.0.1", "3306", "root", "password")))
+      .withReconciler(
+          new MySQLSchemaReconciler(new MySQLDbConfig("127.0.0.1", "3306", "root", "password")))
       .withInfrastructure(infrastructure)
       .build()
       : E2EOperatorExtension.builder()
diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
@@ -57,6 +57,12 @@
             <version>4.1.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.javaoperatorsdk</groupId>
+            <artifactId>operator-framework-junit-5</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java b/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java
@@ -44,7 +44,7 @@ boolean isLocal() {
   AbstractOperatorExtension operator = isLocal() ? OperatorExtension.builder()
       .waitForNamespaceDeletion(false)
       .withConfigurationService(DefaultConfigurationService.instance())
-      .withReconciler(new TomcatReconciler(client))
+      .withReconciler(new TomcatReconciler())
       .withReconciler(new WebappReconciler(client))
       .build()
       : E2EOperatorExtension.builder()
