From ec8e1e865e2da0b1e1944ac60283043594902732 Mon Sep 17 00:00:00 2001 From: csviri Date: Wed, 9 Feb 2022 16:27:10 +0100 Subject: [PATCH 1/2] fix: run e2e tests on next --- .github/workflows/e2e-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 31b89e1b20..774df82b48 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -3,10 +3,11 @@ name: Integration & End to End tests on: pull_request: - branches: [ main ] + branches: [ main, next ] push: branches: - main + - next jobs: sample_operators_tests: From 2d3af5a4f5f9a9dc560053e8cc71e846822f4698 Mon Sep 17 00:00:00 2001 From: csviri Date: Wed, 9 Feb 2022 17:25:06 +0100 Subject: [PATCH 2/2] fix: e2e test adding back finalizer --- .../operator/sample/MySQLSchemaReconciler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaReconciler.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaReconciler.java index ff4fcad131..096f3ed4a7 100644 --- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaReconciler.java +++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaReconciler.java @@ -23,9 +23,11 @@ import io.javaoperatorsdk.operator.sample.MySQLSchemaReconciler.SecretDependentResource; import io.javaoperatorsdk.operator.sample.schema.Schema; +import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER; import static java.lang.String.format; -@ControllerConfiguration( +// todo handle this, should work with finalizer +@ControllerConfiguration(finalizerName = NO_FINALIZER, dependents = { @Dependent(resourceType = Secret.class, type = SecretDependentResource.class), @Dependent(resourceType = Schema.class, type = SchemaDependentResource.class)