progress

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/SecondaryToPrimaryMapper.java

@@ -6,5 +6,5 @@
 
 @FunctionalInterface
 public interface SecondaryToPrimaryMapper<R> {
-  Set<ResourceID> toPrimaryResourceIDs(R dependentResource);
+  Set<ResourceID> toPrimaryResourceIDs(R resource);
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentCustomMappingAnnotationIT.java

@@ -0,0 +1,4 @@
+package io.javaoperatorsdk.operator;
+
+public class DependentCustomMappingAnnotationIT {
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentcustommappingannotation/CustomMappingConfigMapDependentResource.java

@@ -0,0 +1,42 @@
+package io.javaoperatorsdk.operator.sample.dependentcustommappingannotation;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDNoGCKubernetesDependentResource;
+import io.javaoperatorsdk.operator.processing.event.ResourceID;
+import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
+import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
+
+import java.util.Map;
+import java.util.Set;
+
+public class CustomMappingConfigMapDependentResource
+    extends CRUDNoGCKubernetesDependentResource<ConfigMap, DependentCustomMappingCustomResource>
+        implements SecondaryToPrimaryMapper<ConfigMap> {
+
+  private SecondaryToPrimaryMapper<ConfigMap> mapper = Mappers.fromAnnotation("customNameKey","customNamespaceKey");
+
+  public CustomMappingConfigMapDependentResource() {
+    super(ConfigMap.class);
+  }
+
+  @Override
+  protected ConfigMap desired(DependentCustomMappingCustomResource primary,
+                              Context<DependentCustomMappingCustomResource> context) {
+    return new ConfigMapBuilder()
+        .withMetadata(new ObjectMetaBuilder()
+            .withName(primary.getMetadata().getName())
+            .withNamespace(primary.getMetadata().getNamespace())
+            .build())
+        .withData(Map.of("key", "val"))
+        .build();
+  }
+
+  @Override
+  public Set<ResourceID> toPrimaryResourceIDs(ConfigMap resource) {
+    return mapper.toPrimaryResourceIDs(resource);
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentcustommappingannotation/DependentCustomMappingCustomResource.java

@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.sample.dependentcustommappingannotation;
+
+import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Group("sample.javaoperatorsdk")
+@Version("v1")
+public class DependentCustomMappingCustomResource
+    extends CustomResource<DependentCustomMappingSpec, Void>
+    implements Namespaced {
+
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentcustommappingannotation/DependentCustomMappingReconciler.java

@@ -0,0 +1,23 @@
+package io.javaoperatorsdk.operator.sample.dependentcustommappingannotation;
+
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.api.reconciler.*;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
+import io.javaoperatorsdk.operator.processing.event.source.EventSource;
+
+import java.util.Map;
+
+@ControllerConfiguration(dependents = {@Dependent(type = CustomMappingConfigMapDependentResource.class)})
+public class DependentCustomMappingReconciler
+    implements Reconciler<DependentCustomMappingCustomResource> {
+
+  @Override
+  public UpdateControl<DependentCustomMappingCustomResource> reconcile(
+      DependentCustomMappingCustomResource resource,
+      Context<DependentCustomMappingCustomResource> context) throws Exception {
+
+    return UpdateControl.noUpdate();
+  }
+
+
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentcustommappingannotation/DependentCustomMappingSpec.java

@@ -0,0 +1,15 @@
+package io.javaoperatorsdk.operator.sample.dependentcustommappingannotation;
+
+public class DependentCustomMappingSpec {
+
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public DependentCustomMappingSpec setValue(String value) {
+        this.value = value;
+        return this;
+    }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/primaryindexer/DependentPrimaryIndexerTestReconciler.java

@@ -31,8 +31,8 @@ public ReadOnlyConfigMapDependent() {
     }
 
     @Override
-    public Set<ResourceID> toPrimaryResourceIDs(ConfigMap dependentResource) {
-      return cache.byIndex(CONFIG_MAP_RELATION_INDEXER, dependentResource.getMetadata().getName())
+    public Set<ResourceID> toPrimaryResourceIDs(ConfigMap resource) {
+      return cache.byIndex(CONFIG_MAP_RELATION_INDEXER, resource.getMetadata().getName())
           .stream()
           .map(ResourceID::fromResource)
           .collect(Collectors.toSet());

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

@@ -61,9 +61,9 @@ public Result<Secret> match(Secret actual, MySQLSchema primary, Context<MySQLSch
   }
 
   @Override
-  public Set<ResourceID> toPrimaryResourceIDs(Secret dependentResource) {
-    String name = dependentResource.getMetadata().getName();
+  public Set<ResourceID> toPrimaryResourceIDs(Secret resource) {
+    String name = resource.getMetadata().getName();
     return Set.of(new ResourceID(name.substring(0, name.length() - SECRET_SUFFIX.length()),
-        dependentResource.getMetadata().getNamespace()));
+        resource.getMetadata().getNamespace()));
   }
 }