refactor: use new configuration option on SchemaDependentResource

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

@@ -246,7 +246,7 @@ private void cleanupAfterEventFiltering(ResourceID resourceID) {
   @Override
   @SuppressWarnings("unchecked")
   public KubernetesDependentResourceConfig configFrom(KubernetesDependent kubeDependent,
-      ControllerConfiguration parentConfiguration) {
+      ControllerConfiguration<?> parentConfiguration) {
     var namespaces = parentConfiguration.getNamespaces();
     var configuredNS = false;
     String labelSelector = null;

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaConfig.java

@@ -0,0 +1,23 @@
+package io.javaoperatorsdk.operator.sample.dependent;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface SchemaConfig {
+  int DEFAULT_POLL_PERIOD = 500;
+  int DEFAULT_PORT = 3306;
+
+  int pollPeriod() default DEFAULT_POLL_PERIOD;
+
+  String host();
+
+  String user();
+
+  String password();
+
+  int port() default DEFAULT_PORT;
+}

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java

@@ -9,9 +9,11 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.Secret;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.EventSourceProvider;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.AnnotationDependentResourceConfigurator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
 import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.external.PerResourcePollingDependentResource;
@@ -24,13 +26,18 @@
 import static io.javaoperatorsdk.operator.sample.dependent.SecretDependentResource.MYSQL_SECRET_USERNAME;
 import static java.lang.String.format;
 
+@SchemaConfig(pollPeriod = 700, host = "127.0.0.1",
+    port = SchemaDependentResource.LOCAL_PORT,
+    user = "root", password = "password")
 public class SchemaDependentResource
     extends PerResourcePollingDependentResource<Schema, MySQLSchema>
     implements EventSourceProvider<MySQLSchema>,
     DependentResourceConfigurator<ResourcePollerConfig>,
+    AnnotationDependentResourceConfigurator<SchemaConfig, ResourcePollerConfig>,
     Creator<Schema, MySQLSchema>, Deleter<MySQLSchema> {
 
   public static final String NAME = "schema";
+  public static final int LOCAL_PORT = 3307;
   private static final Logger log = LoggerFactory.getLogger(SchemaDependentResource.class);
 
   private MySQLDbConfig dbConfig;
@@ -43,13 +50,25 @@ public SchemaDependentResource() {
   public Optional<ResourcePollerConfig> configuration() {
     return Optional.of(new ResourcePollerConfig((int) getPollingPeriod(), dbConfig));
   }
-  
+
   @Override
   public void configureWith(ResourcePollerConfig config) {
     this.dbConfig = config.getMySQLDbConfig();
     setPollingPeriod(config.getPollPeriod());
   }
 
+  @Override
+  public ResourcePollerConfig configFrom(SchemaConfig annotation,
+      ControllerConfiguration<?> parentConfiguration) {
+    if (annotation != null) {
+      return new ResourcePollerConfig(annotation.pollPeriod(),
+          new MySQLDbConfig(annotation.host(), "" + annotation.port(),
+              annotation.user(), annotation.password()));
+    }
+    return new ResourcePollerConfig(SchemaConfig.DEFAULT_POLL_PERIOD,
+        MySQLDbConfig.loadFromEnvironmentVars());
+  }
+
   @Override
   public Schema desired(MySQLSchema primary, Context<MySQLSchema> context) {
     return new Schema(primary.getMetadata().getName(), primary.getSpec().getEncoding());
@@ -102,5 +121,4 @@ public Set<Schema> fetchResources(MySQLSchema primaryResource) {
       throw new RuntimeException("Error while trying read Schema", e);
     }
   }
-
 }

sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java

@@ -13,12 +13,11 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.javaoperatorsdk.operator.junit.AbstractOperatorExtension;
 import io.javaoperatorsdk.operator.junit.ClusterDeployedOperatorExtension;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
-import io.javaoperatorsdk.operator.sample.dependent.ResourcePollerConfig;
 import io.javaoperatorsdk.operator.sample.dependent.SchemaDependentResource;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -33,13 +32,12 @@ class MySQLSchemaOperatorE2E {
 
   static final Logger log = LoggerFactory.getLogger(MySQLSchemaOperatorE2E.class);
 
-  static final KubernetesClient client = new DefaultKubernetesClient();
+  static final KubernetesClient client = new KubernetesClientBuilder().build();
 
   static final String MY_SQL_NS = "mysql";
 
   private final static List<HasMetadata> infrastructure = new ArrayList<>();
   public static final String TEST_RESOURCE_NAME = "mydb1";
-  public static final Integer LOCAL_PORT = 3307;
 
   static {
     infrastructure.add(
@@ -63,15 +61,10 @@ boolean isLocal() {
   AbstractOperatorExtension operator =
       isLocal()
           ? LocallyRunOperatorExtension.builder()
-              .withReconciler(
-                  new MySQLSchemaReconciler(),
-                  c -> c.replacingNamedDependentResourceConfig(
-                      SchemaDependentResource.NAME,
-                      new ResourcePollerConfig(
-                          700, new MySQLDbConfig("127.0.0.1", LOCAL_PORT.toString(), "root",
-                              "password"))))
+              .withReconciler(new MySQLSchemaReconciler()) // configuration for schema comes from
+                                                           // SchemaDependentResource annotation
               .withInfrastructure(infrastructure)
-              .withPortForward(MY_SQL_NS, "app", "mysql", 3306, LOCAL_PORT)
+              .withPortForward(MY_SQL_NS, "app", "mysql", 3306, SchemaDependentResource.LOCAL_PORT)
               .build()
           : ClusterDeployedOperatorExtension.builder()
               .withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).get())