gvk support

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/GroupVersionKind.java

@@ -32,6 +32,27 @@ public static GroupVersionKind gvkFor(Class<? extends HasMetadata> resourceClass
         HasMetadata.getVersion(resourceClass), HasMetadata.getKind(resourceClass));
   }
 
+  /**
+   * Parse GVK from a String representation. Expected format is: [group]/[version]/[kind]
+   * <p/>
+   * Sample: "apps/v1/Deployment"
+   * <p/>
+   * or: [version]/[kind]
+   * <p/>
+   * Sample: v1/ConfigMap
+   **/
+  public static GroupVersionKind fromString(String gvk) {
+    String[] parts = gvk.split("/");
+    if (parts.length == 3) {
+      return new GroupVersionKind(parts[0], parts[1], parts[2]);
+    } else if (parts.length == 2) {
+      return new GroupVersionKind(null, parts[0], parts[1]);
+    } else {
+      throw new IllegalArgumentException(
+          "Cannot parse gvk: " + gvk + ". Needs to be in form [group]/[version]/[kind]");
+    }
+  }
+
   public String getGroup() {
     return group;
   }
@@ -72,4 +93,5 @@ public String toString() {
         ", kind='" + kind + '\'' +
         '}';
   }
+
 }

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

@@ -100,4 +100,16 @@
    */
   boolean followControllerNamespacesOnChange() default DEFAULT_FOLLOW_CONTROLLER_NAMESPACES_ON_CHANGE;
 
+  /**
+   * The {@link io.javaoperatorsdk.operator.processing.GroupVersionKind} of the secondary resource
+   * of this dependent resource. Used only if dependent resource is based on
+   * {@link io.fabric8.kubernetes.api.model.GenericKubernetesResource}
+   *
+   * It should be in format: [group]/[version]/[kind]. Thus: apps/v1/Deployment.
+   * <p/>
+   * Note that using this dynamic approach only makes sense if there is no class representation for
+   * the target resource.
+   **/
+  String groupVersionKind() default NO_VALUE_SET;
+
 }

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

@@ -9,6 +9,7 @@
 import io.javaoperatorsdk.operator.api.config.dependent.ConfigurationConverter;
 import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
+import io.javaoperatorsdk.operator.processing.GroupVersionKind;
 import io.javaoperatorsdk.operator.processing.event.source.PrimaryToSecondaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
@@ -47,15 +48,28 @@ public KubernetesDependentResourceConfig<R> configFrom(KubernetesDependent confi
 
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private InformerConfiguration<R> createInformerConfiguration(KubernetesDependent configAnnotation,
       ControllerConfiguration<?> controllerConfig,
       Class<KubernetesDependentResource<R, P>> originatingClass) {
     try {
       var dependentInstance = originatingClass.getConstructor().newInstance();
       var resourceType = dependentInstance.resourceType();
-      var informerConfig =
-          InformerConfiguration.from(resourceType, controllerConfig.getResourceClass());
+
+      InformerConfiguration.InformerConfigurationBuilder informerConfig;
+      if (resourceType.isAssignableFrom(GenericKubernetesDependentResource.class)) {
+        if (configAnnotation.informerConfig() == null ||
+            Constants.NO_VALUE_SET.equals(configAnnotation.informerConfig().groupVersionKind())) {
+          throw new IllegalStateException(
+              "Set groupVersionKind should be set when using GenericKubernetesResource");
+        }
+        informerConfig = InformerConfiguration.from(
+            GroupVersionKind.fromString(configAnnotation.informerConfig().groupVersionKind()),
+            controllerConfig.getResourceClass());
+      } else {
+        informerConfig =
+            InformerConfiguration.from(resourceType, controllerConfig.getResourceClass());
+      }
 
       informerConfig.withSecondaryToPrimaryMapper(
           dependentInstance.getSecondaryToPrimaryMapper().orElse(null));
@@ -113,6 +127,7 @@ private InformerConfiguration<R> createInformerConfiguration(KubernetesDependent
         if (secondaryToPrimaryMapper != null) {
           informerConfig.withSecondaryToPrimaryMapper(secondaryToPrimaryMapper);
         }
+
       }
 
       return informerConfig.build();

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/GroupVersionKindTest.java

@@ -18,4 +18,21 @@ void testInitFromApiVersion() {
     assertThat(gvk.getVersion()).isEqualTo("v1");
   }
 
+  @Test
+  void parseGVK() {
+    var gvk = GroupVersionKind.fromString("apps/v1/Deployment");
+    assertThat(gvk.getGroup()).isEqualTo("apps");
+    assertThat(gvk.getVersion()).isEqualTo("v1");
+    assertThat(gvk.getKind()).isEqualTo("Deployment");
+
+
+    gvk = GroupVersionKind.fromString("v1/ConfigMap");
+    assertThat(gvk.getGroup()).isNull();
+    assertThat(gvk.getVersion()).isEqualTo("v1");
+    assertThat(gvk.getKind()).isEqualTo("ConfigMap");
+
+    assertThrows(IllegalArgumentException.class, () -> GroupVersionKind.fromString("v1#ConfigMap"));
+    assertThrows(IllegalArgumentException.class,
+        () -> GroupVersionKind.fromString("api/beta/v1/ConfigMap"));
+  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentresourcemanaged/ConfigMapGenericKubernetesDependent.java

@@ -11,7 +11,13 @@
 import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.Updater;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.GenericKubernetesDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.InformerConfig;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 
+import static io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesdependentresourcemanaged.ConfigMapGenericKubernetesDependent.KIND;
+import static io.javaoperatorsdk.operator.sample.generickubernetesresource.generickubernetesdependentresourcemanaged.ConfigMapGenericKubernetesDependent.VERSION;
+
+@KubernetesDependent(informerConfig = @InformerConfig(groupVersionKind = VERSION + "/" + KIND))
 public class ConfigMapGenericKubernetesDependent extends
     GenericKubernetesDependentResource<GenericKubernetesDependentManagedCustomResource>
     implements